From 653fd9bace9d1b4ee38ef0b90c1061ee7c9ca27c Mon Sep 17 00:00:00 2001 From: brantje Date: Mon, 3 Oct 2016 21:42:16 +0200 Subject: [PATCH] Delete prop --- controller/credentialcontroller.php | 2 +- js/app/controllers/credential.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php index 1a87e18b..745ca349 100644 --- a/controller/credentialcontroller.php +++ b/controller/credentialcontroller.php @@ -130,7 +130,7 @@ class CredentialController extends ApiController { 'shared_key' => ($shared_key === null) ? null : $storedCredential->getSharedKey(), ); - + if ($storedCredential->getUserId() !== $this->userId){ $acl = $this->sharingService->getCredentialAclForUser($this->userId, $storedCredential->getGuid()); diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 5e04d3d7..45ca916c 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -36,6 +36,7 @@ angular.module('passmanApp') for (var c = 0; c < shared_credentials.length; c++) { var _shared_credential = shared_credentials[c]; var decrypted_key = EncryptService.decryptString(_shared_credential.shared_key); + console.log(decrypted_key) try { var _shared_credential_data = ShareService.decryptSharedCredential(_shared_credential.credential_data, decrypted_key); } catch (e){ @@ -67,6 +68,7 @@ angular.module('passmanApp') } else { var enc_key = EncryptService.decryptString(vault.credentials[i].shared_key); + console.log(enc_key) $scope.active_vault.credentials[i] = ShareService.decryptSharedCredential(angular.copy(vault.credentials[i]), enc_key); } $scope.active_vault.credentials[i].tags_raw = $scope.active_vault.credentials[i].tags;