nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2026-01-05 23:27:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Dislay of shared item (if user owns it) works

Browse source
This commit is contained in:
brantje 2016-10-02 21:17:17 +02:00
parent d6c85bffcc
commit 497198371e
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
js/app/controllers/credential.js
View file

@ -39,7 +39,13 @@ angular.module('passmanApp')
var _credentials = [];
for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
try {
$scope.active_vault.credentials[i] = CredentialService.decryptCredential(angular.copy(vault.credentials[i]));
if(!$scope.active_vault.credentials[i].shared_key) {
$scope.active_vault.credentials[i] = CredentialService.decryptCredential(angular.copy(vault.credentials[i]));
} else {
var enc_key = EncryptService.decryptString(vault.credentials[i].shared_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;
} catch (e) {
NotificationService.showNotification('An error happend during decryption', 5000);
@ -49,9 +55,8 @@ angular.module('passmanApp')
$location.path('/')
}
if ($scope.active_vault.credentials[i]) {
if ($scope.active_vault.credentials[i].tags) {
TagService.addTags($scope.active_vault.credentials[i].tags);
}
}
$scope.show_spinner = false;

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

@ -133,7 +133,7 @@ angular.module('passmanApp')
console.log(key);
var encryptedSharedCredential = ShareService.encryptSharedCredential($scope.storedCredential, key);
CredentialService.updateCredential(encryptedSharedCredential);
CredentialService.updateCredential(encryptedSharedCredential, true);
var list = $scope.share_settings.credentialSharedWithUserAndGroup;
console.log(list);

15
js/app/services/credentialservice.js
View file

@ -60,13 +60,18 @@ angular.module('passmanApp')
getEncryptedFields: function () {
return _encryptedFields;
},
updateCredential: function (credential) {
updateCredential: function (credential, skipEncyption) {
var _credential = angular.copy(credential);
for (var i = 0; i < _encryptedFields.length; i++) {
var field = _encryptedFields[i];
var fieldValue = angular.copy(credential[field]);
_credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue));
if(!skipEncyption){
for (var i = 0; i < _encryptedFields.length; i++) {
var field = _encryptedFields[i];
var fieldValue = angular.copy(credential[field]);
_credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue));
}
} else {
console.log('Skipping encryption')
}
_credential.expire_time = new Date( angular.copy(credential.expire_time) ).getTime() / 1000;
var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + credential.credential_id);