Merge branch 'changeVaultPassFix'

This commit is contained in:
brantje 2016-12-28 15:42:55 +01:00
commit 6df4636a4d
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
2 changed files with 33 additions and 8 deletions

View file

@ -1,6 +1,20 @@
owncloud-passman (0.0.1) ## [Unreleased]
* **Security**: Security description here ### Updated
* **Backwards incompatible change**: Changes in the API - Updated to passman 2.0.0
* **New dependency**: New dependencies such as a new ownCloud or PHP version
* **Bugfix**: Bugfix description ## 2.0.0 2016-12-31
* **Enhancement**: New feature description ### Added
- Password sharing
- Vaults
- Change vault passwords
- Unit tests
### Changed
- Passman API overhaul
- Rewrite of code base
- New passman repo at https://github.com/nextcloud/passman
### Fixed
- A lot of small bug fixes
### Removed
- Old passman API

View file

@ -203,6 +203,8 @@
$scope.error = $translate.instant('password.no.match'); $scope.error = $translate.instant('password.no.match');
return; return;
} }
SettingsService.setSetting('defaultVault', null);
SettingsService.setSetting('defaultVaultPass', null);
VaultService.getVault($scope.active_vault).then(function (vault) { VaultService.getVault($scope.active_vault).then(function (vault) {
var _selected_credentials = []; var _selected_credentials = [];
if (vault.credentials.length === 0) { if (vault.credentials.length === 0) {
@ -210,8 +212,17 @@
} }
for (var i = 0; i < vault.credentials.length; i++) { for (var i = 0; i < vault.credentials.length; i++) {
var _credential = vault.credentials[i]; var _credential = vault.credentials[i];
if (_credential.shared_key === null || _credential.shared_key === '') { if (_credential.shared_key === null || _credential.shared_key === '' || !_credential.hasOwnProperty('acl')) {
_selected_credentials.push(_credential); var _success;
try{
CredentialService.decryptCredential(_credential, VaultService.getActiveVault().vaultKey);
_success = true;
} catch (e){
_success = false;
}
if(_success) {
_selected_credentials.push(_credential);
}
} }
} }
$scope.change_pw = { $scope.change_pw = {