nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2024-09-20 23:06:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #75 from nextcloud/fixVaultPreferences

Browse source 
Fix pwSettings not loading
This commit is contained in:
Sander 2016-10-08 15:57:10 +02:00 committed by GitHub
parent 386465cd51 21420db06a
commit ded7aa2aed
2 changed files with 51 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
js/app/controllers/edit_credential.js
View file

@ -16,15 +16,21 @@
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) { if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
if (!$scope.active_vault) { if (!$scope.active_vault) {
$location.path('/'); $location.path('/');
return;
} }
} else { } else {
if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) { if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) {
var _vault = angular.copy(SettingsService.getSetting('defaultVault')); var _vault = angular.copy(SettingsService.getSetting('defaultVault'));
VaultService.getVault(_vault).then(function (vault) { _vault.vaultKey = SettingsService.getSetting('defaultVaultPass');
vault.vaultKey = angular.copy(SettingsService.getSetting('defaultVaultPass')); VaultService.setActiveVault(_vault);
VaultService.setActiveVault(vault); $scope.active_vault = _vault;
$scope.active_vault = vault; }
}
VaultService.getVault($scope.active_vault).then(function (vault) {
vault.vaultKey = SettingsService.getSetting('defaultVaultPass');
delete vault.credentials;
VaultService.setActiveVault(vault);
$scope.pwSettings = VaultService.getVaultSetting('pwSettings', $scope.pwSettings = VaultService.getVaultSetting('pwSettings',
{ {
'length': 12, 'length': 12,
@ -38,8 +44,6 @@
'generateOnCreate': true 'generateOnCreate': true
}); });
}); });
}
}
$scope.tabs = [{ $scope.tabs = [{
title: 'General', title: 'General',

29
js/app/controllers/settings.js
View file

@ -18,17 +18,25 @@
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) { if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
if (!$scope.active_vault) { if (!$scope.active_vault) {
$location.path('/'); $location.path('/');
return;
} }
} else { } else {
if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) { if (SettingsService.getSetting('defaultVault') && SettingsService.getSetting('defaultVaultPass')) {
var _vault = angular.copy(SettingsService.getSetting('defaultVault')); var _vault = angular.copy(SettingsService.getSetting('defaultVault'));
VaultService.getVault(_vault).then(function (vault) { _vault.vaultKey = SettingsService.getSetting('defaultVaultPass');
VaultService.setActiveVault(_vault);
$scope.active_vault = _vault;
}
}
VaultService.getVault($scope.active_vault).then(function (vault) {
vault.vaultKey = SettingsService.getSetting('defaultVaultPass'); vault.vaultKey = SettingsService.getSetting('defaultVaultPass');
delete vault.credentials;
VaultService.setActiveVault(vault); VaultService.setActiveVault(vault);
$scope.active_vault = vault; console.log(vault);
$scope.$parent.selectedVault = true; $scope.vault_settings = vault.vault_settings;
$scope.vault_settings.pwSettings = VaultService.getVaultSetting('pwSettings', if(!$scope.vault_settings.hasOwnProperty('pwSettings')){
{ $scope.vault_settings.pwSettings = {
'length': 12, 'length': 12,
'useUppercase': true, 'useUppercase': true,
'useLowercase': true, 'useLowercase': true,
@ -38,11 +46,12 @@
'avoidAmbiguousCharacters': false, 'avoidAmbiguousCharacters': false,
'requireEveryCharType': true, 'requireEveryCharType': true,
'generateOnCreate': true 'generateOnCreate': true
}); };
$scope.new_vault_name = angular.copy($scope.active_vault.name);
});
}
} }
});
var http = location.protocol, slashes = http.concat("//"), host = slashes.concat(window.location.hostname), complete = host + location.pathname; var http = location.protocol, slashes = http.concat("//"), host = slashes.concat(window.location.hostname), complete = host + location.pathname;
$scope.bookmarklet = $sce.trustAsHtml("<a class=\"button\" href=\"javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=c(document.title),d=a.open('" + complete + "bookmarklet?url='+c(b.location)+'&title='+e,'bkmk_popup','left='+((a.screenX||a.screenLeft)+10)+',top='+((a.screenY||a.screenTop)+10)+',height=750px,width=475px,resizable=0,alwaysRaised=1');a.setTimeout(function(){d.focus()},300);})();\">Save in passman</a>"); $scope.bookmarklet = $sce.trustAsHtml("<a class=\"button\" href=\"javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=c(document.title),d=a.open('" + complete + "bookmarklet?url='+c(b.location)+'&title='+e,'bkmk_popup','left='+((a.screenX||a.screenLeft)+10)+',top='+((a.screenY||a.screenTop)+10)+',height=750px,width=475px,resizable=0,alwaysRaised=1');a.setTimeout(function(){d.focus()},300);})();\">Save in passman</a>");
@ -52,7 +61,7 @@
_vault.name = $scope.new_vault_name; _vault.name = $scope.new_vault_name;
_vault.vault_settings = angular.copy($scope.vault_settings); _vault.vault_settings = angular.copy($scope.vault_settings);
VaultService.updateVault(_vault).then(function () { VaultService.updateVault(_vault).then(function () {
VaultService.setActiveVault(_vault); //VaultService.setActiveVault(_vault);
$scope.active_vault.name = angular.copy(_vault.name); $scope.active_vault.name = angular.copy(_vault.name);
NotificationService.showNotification('Settings saved', 5000); NotificationService.showNotification('Settings saved', 5000);
}); });