From bec9252bc95e990b9b8e49d75344b282a382a5da Mon Sep 17 00:00:00 2001 From: Marcos Zuriaga Date: Mon, 3 Oct 2016 21:43:57 +0200 Subject: [PATCH] Fix owner's shared key being gone when bob updates credential --- controller/credentialcontroller.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php index 745ca349..d88aa144 100644 --- a/controller/credentialcontroller.php +++ b/controller/credentialcontroller.php @@ -127,14 +127,17 @@ class CredentialController extends ApiController { 'delete_time' => $delete_time, 'hidden' => $hidden, 'otp' => $otp, - 'shared_key' => ($shared_key === null) ? null : $storedCredential->getSharedKey(), + 'shared_key' => $shared_key, ); if ($storedCredential->getUserId() !== $this->userId){ $acl = $this->sharingService->getCredentialAclForUser($this->userId, $storedCredential->getGuid()); - if (!$acl->hasPermission(SharingACL::WRITE)){ + if ($acl->hasPermission(SharingACL::WRITE)) { + $credential['shared_key'] = $storedCredential->getSharedKey(); + } + else { return new DataResponse(['msg' => 'Not authorized'], Http::STATUS_UNAUTHORIZED); } }