diff options
| author | fnuesse <felix.nuesse@t-online.de> | 2019-01-08 23:23:27 +0300 |
|---|---|---|
| committer | fnuesse <felix.nuesse@t-online.de> | 2019-01-08 23:23:27 +0300 |
| commit | deee11f454548d22d11fc90f0eab09d52bb1f7a3 (patch) | |
| tree | 1af235dd1afba076a09c8521de6d6959aa099058 /js/app | |
| parent | 5733031bcd1fc94b8cbe03bd82b0d989fac542dd (diff) | |
Added compromised state to database
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/controllers/credential.js | 3 | ||||
| -rw-r--r-- | js/app/services/credentialservice.js | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 0ad511aa..be6f41fc 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -105,6 +105,9 @@ } angular.merge($scope.active_vault.credentials, _credentials); $scope.show_spinner = false; + + console.log($scope.active_vault.credentials) + $rootScope.$broadcast('credentials_loaded'); $rootScope.vaultCache[$scope.active_vault.guid] = angular.copy($scope.active_vault); if(!vault.private_sharing_key){ diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js index 4c5d5f3b..b2859cfa 100644 --- a/js/app/services/credentialservice.js +++ b/js/app/services/credentialservice.js @@ -55,9 +55,10 @@ 'files': [], 'custom_fields': [], 'otp': {}, + 'compromised': false, 'hidden': false }; - var _encryptedFields = ['description', 'username', 'password', 'files', 'custom_fields', 'otp', 'email', 'tags', 'url']; + var _encryptedFields = ['description', 'username', 'password', 'files', 'custom_fields', 'otp', 'email', 'tags', 'url', 'compromised']; return { @@ -140,8 +141,14 @@ var fieldValue = angular.copy(credential[field]); var field_decrypted_value; try { - field_decrypted_value = EncryptService.decryptString(fieldValue, key); + if(fieldValue!==null){ + field_decrypted_value = EncryptService.decryptString(fieldValue, key); + }else{ + field_decrypted_value=null; + } } catch (e) { + console.log(fieldValue) + console.log(e) throw e; } try { |