From b90d6eb0c328e38b5ee0d25a491f176f28caa4a6 Mon Sep 17 00:00:00 2001 From: brantje Date: Mon, 3 Oct 2016 17:38:45 +0200 Subject: [PATCH] Fix shared_key after unsharing --- controller/credentialcontroller.php | 3 +-- lib/Db/CredentialMapper.php | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php index 9e376b78..583e3a9d 100644 --- a/controller/credentialcontroller.php +++ b/controller/credentialcontroller.php @@ -116,10 +116,9 @@ class CredentialController extends ApiController { 'delete_time' => $delete_time, 'hidden' => $hidden, 'otp' => $otp, - 'shared_key' => ($shared_key) ? $shared_key : null, + 'shared_key' => (!empty($shared_key)) ? $shared_key : '', ); - $storedCredential = $this->credentialService->getCredentialById($credential_id, $this->userId); $link = ''; // @TODO create direct link to credential diff --git a/lib/Db/CredentialMapper.php b/lib/Db/CredentialMapper.php index 8fe720a7..86acf0fe 100644 --- a/lib/Db/CredentialMapper.php +++ b/lib/Db/CredentialMapper.php @@ -85,7 +85,7 @@ class CredentialMapper extends Mapper { $credential->setCustomFields($raw_credential['custom_fields']); $credential->setOtp($raw_credential['otp']); $credential->setHidden($raw_credential['hidden']); - $credential->setSharedKey($raw_credential['is_shared']); + $credential->setSharedKey($raw_credential['shared_key']); return parent::insert($credential); } @@ -119,6 +119,7 @@ class CredentialMapper extends Mapper { $credential->setHidden($raw_credential['hidden']); $credential->setDeleteTime($raw_credential['delete_time']); $credential->setSharedKey($raw_credential['shared_key']); + var_dump($credential); return parent::update($credential); }