mirror of
https://github.com/nextcloud/passman.git
synced 2025-10-10 13:36:55 +08:00
Load shared credentials after complete vault decryption
This commit is contained in:
parent
497198371e
commit
7d75266dc5
1 changed files with 15 additions and 10 deletions
|
@ -30,6 +30,18 @@ angular.module('passmanApp')
|
||||||
|
|
||||||
$scope.show_spinner = true;
|
$scope.show_spinner = true;
|
||||||
|
|
||||||
|
var getSharedCredentials = function() {
|
||||||
|
ShareService.getCredendialsSharedWithUs($scope.active_vault.guid).then(function (shared_credentials) {
|
||||||
|
for (var c = 0; c < shared_credentials.length; c++) {
|
||||||
|
var _shared_credential = shared_credentials[c];
|
||||||
|
console.log(_shared_credential)
|
||||||
|
var decrypted_key = EncryptService.decryptString(_shared_credential.shared_key);
|
||||||
|
_shared_credential = ShareService.decryptSharedCredential(_shared_credential.credential_data, decrypted_key);
|
||||||
|
console.log(_shared_credential);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
var fetchCredentials = function () {
|
var fetchCredentials = function () {
|
||||||
VaultService.getVault($scope.active_vault).then(function (vault) {
|
VaultService.getVault($scope.active_vault).then(function (vault) {
|
||||||
var vaultKey = angular.copy($scope.active_vault.vaultKey);
|
var vaultKey = angular.copy($scope.active_vault.vaultKey);
|
||||||
|
@ -59,6 +71,7 @@ angular.module('passmanApp')
|
||||||
TagService.addTags($scope.active_vault.credentials[i].tags);
|
TagService.addTags($scope.active_vault.credentials[i].tags);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
getSharedCredentials();
|
||||||
$scope.show_spinner = false;
|
$scope.show_spinner = false;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -98,21 +111,13 @@ angular.module('passmanApp')
|
||||||
}
|
}
|
||||||
if(active_share_requests === false){
|
if(active_share_requests === false){
|
||||||
jQuery('.ui-dialog').remove();
|
jQuery('.ui-dialog').remove();
|
||||||
|
getSharedCredentials();
|
||||||
}
|
}
|
||||||
console.log(result)
|
console.log(result)
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log($scope.active_vault)
|
|
||||||
ShareService.getCredendialsSharedWithUs($scope.active_vault.guid).then(function(shared_credentials){
|
|
||||||
for(var c = 0; c < shared_credentials.length; c++){
|
|
||||||
var _shared_credential = shared_credentials[c];
|
|
||||||
console.log(_shared_credential)
|
|
||||||
var decrypted_key = EncryptService.decryptString(_shared_credential.shared_key);
|
|
||||||
_shared_credential = ShareService.decryptSharedCredential(_shared_credential.credential_data, decrypted_key);
|
|
||||||
console.log(_shared_credential);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
$scope.addCredential = function () {
|
$scope.addCredential = function () {
|
||||||
|
|
Loading…
Add table
Reference in a new issue