nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-08 12:36:20 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix some bugs

Browse source
This commit is contained in:
brantje 2016-10-05 22:34:34 +02:00
parent 130e296b1e
commit 53c55d5fd6
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controller/credentialcontroller.php
View file

@ -107,7 +107,7 @@ class CredentialController extends ApiController {
$credential_id, $custom_fields, $delete_time, $credential_id, $custom_fields, $delete_time,
$description, $email, $expire_time, $favicon, $files, $guid, $description, $email, $expire_time, $favicon, $files, $guid,
$hidden, $label, $otp, $password, $renew_interval, $hidden, $label, $otp, $password, $renew_interval,
$tags, $url, $username, $vault_id, $revision_created, $shared_key, $acl, $unshare_action) { $tags, $url, $username, $vault_id, $revision_created, $shared_key, $acl, $unshare_action, $set_share_key) {
$storedCredential = $this->credentialService->getCredentialById($credential_id, $this->userId); $storedCredential = $this->credentialService->getCredentialById($credential_id, $this->userId);
@ -133,7 +133,6 @@ class CredentialController extends ApiController {
'delete_time' => $delete_time, 'delete_time' => $delete_time,
'hidden' => $hidden, 'hidden' => $hidden,
'otp' => $otp, 'otp' => $otp,
'shared_key' => ($storedCredential->getSharedKey() === null) ? $shared_key : $storedCredential->getSharedKey(),
); );
@ -218,10 +217,11 @@ class CredentialController extends ApiController {
$link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION); $link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION);
} }
} }
if($storedCredential->getSharedKey() === null){ if($set_share_key == true){
$storedCredential->setSharedKey($shared_key); $storedCredential->setSharedKey($shared_key);
$credential['shared_key'] = $shared_key;
} }
if($unshare_action){ if($unshare_action == true){
$storedCredential->setSharedKey(''); $storedCredential->setSharedKey('');
$credential['shared_key'] = ''; $credential['shared_key'] = '';
} }

1
js/app/controllers/share.js
View file

@ -291,6 +291,7 @@ angular.module('passmanApp')
ShareService.generateSharedKey(20).then(function (key) { ShareService.generateSharedKey(20).then(function (key) {
var encryptedSharedCredential = ShareService.encryptSharedCredential($scope.storedCredential, key); var encryptedSharedCredential = ShareService.encryptSharedCredential($scope.storedCredential, key);
encryptedSharedCredential.set_share_key = true;
CredentialService.updateCredential(encryptedSharedCredential, true).then(function (sharedCredential) { CredentialService.updateCredential(encryptedSharedCredential, true).then(function (sharedCredential) {
$scope.storedCredential = ShareService.decryptSharedCredential(sharedCredential, key); $scope.storedCredential = ShareService.decryptSharedCredential(sharedCredential, key);
}); });

9
js/app/services/shareservice.js
View file

@ -74,15 +74,6 @@ angular.module('passmanApp')
}) })
}, },
getSharedCredentialRevisions: function (credential) {
var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/'+ credential.guid +'/revisions');
return $http.get(queryUrl).then(function (response) {
if (response.data) {
return response.data;
}
});
},
createPublicSharedCredential: function (shareObj) { createPublicSharedCredential: function (shareObj) {
var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/public'); var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/public');
return $http.post(queryUrl, shareObj).then(function (response) { return $http.post(queryUrl, shareObj).then(function (response) {