diff options
author | Marius David Wieschollek <passwords.public@mdns.eu> | 2020-01-12 00:56:25 +0300 |
---|---|---|
committer | Marius David Wieschollek <passwords.public@mdns.eu> | 2020-01-12 00:56:25 +0300 |
commit | bec6dbc75068688fc9f4d1d02c975f394c529832 (patch) | |
tree | f19c705804f068717b9b6e67c11cf3f98d3b951a | |
parent | 45c91fd7a3114920e2c3a6ef3f80fb8aae70cf4e (diff) |
Improve error handling
Signed-off-by: Marius David Wieschollek <passwords.public@mdns.eu>
-rw-r--r-- | package-lock.json | 6 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/Repositories/FolderRepository.js | 6 | ||||
-rw-r--r-- | src/Repositories/PasswordRepository.js | 12 | ||||
-rw-r--r-- | src/Repositories/TagRepository.js | 6 |
5 files changed, 20 insertions, 12 deletions
diff --git a/package-lock.json b/package-lock.json index 05c10be..7d922a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" }, "libsodium": { "version": "0.7.6", diff --git a/package.json b/package.json index 69dd5f5..1812812 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "url": "https://git.mdns.eu/nextcloud/passwords-client.git" }, "dependencies": { - "eventemitter3": "^3.1.2", + "eventemitter3": "^4.0.0", "libsodium-wrappers": "^0.7.6", "url-parse": "^1.4.7", "uuidv4": "^4.0.0" diff --git a/src/Repositories/FolderRepository.js b/src/Repositories/FolderRepository.js index 73071bc..a06d362 100644 --- a/src/Repositories/FolderRepository.js +++ b/src/Repositories/FolderRepository.js @@ -87,7 +87,11 @@ export default class FolderRepository { let result = []; for(let data of folders) { - result.push(await this._dataToModel(data)); + try { + result.push(await this._dataToModel(data)); + } catch(e) { + console.error(e, data); + } } this._cache.set('folders.list', true); diff --git a/src/Repositories/PasswordRepository.js b/src/Repositories/PasswordRepository.js index 004e31a..f0a34fa 100644 --- a/src/Repositories/PasswordRepository.js +++ b/src/Repositories/PasswordRepository.js @@ -87,7 +87,11 @@ export default class PasswordRepository { let result = []; for(let data of passwords) { - result.push(await this._dataToModel(data)); + try { + result.push(await this._dataToModel(data)); + } catch(e) { + console.error(e, data); + } } this._cache.set('passwords.list', true); @@ -102,11 +106,7 @@ export default class PasswordRepository { */ async _dataToModel(data) { if(data.cseType === 'CSEv1r1') { - try { - data = await this._api.getCseV1Encryption().decrypt(data, 'password'); - } catch(e) { - console.error(e, data); - } + data = await this._api.getCseV1Encryption().decrypt(data, 'password'); } let password = this._api.getClass('model.password', this._api, data); diff --git a/src/Repositories/TagRepository.js b/src/Repositories/TagRepository.js index 98902b8..4b3df4d 100644 --- a/src/Repositories/TagRepository.js +++ b/src/Repositories/TagRepository.js @@ -87,7 +87,11 @@ export default class TagRepository { let result = []; for(let data of tags) { - result.push(await this._dataToModel(data)); + try { + result.push(await this._dataToModel(data)); + } catch(e) { + console.error(e, data); + } } this._cache.set('tags.list', true); |