Save work

This commit is contained in:
brantje 2016-09-28 22:15:03 +02:00
parent 8920a36ea7
commit 3394d78d36
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
5 changed files with 32 additions and 13 deletions

View file

@ -34,17 +34,22 @@ angular.module('passmanApp')
url: 'views/partials/forms/edit_credential/otp.html',
color: 'purple'
}];
if($scope.active_vault.vault_settings && $scope.active_vault.vault_settings.pwSettings){
$scope.pwSettings = angular.copy($scope.active_vault.vault_settings.pwSettings);
} else {
$scope.pwSettings = {
'length': 12,
'useUppercase': true,
'useLowercase': true,
'useDigits': true,
'useSpecialChars': true,
'minimumDigitCount': 3,
'avoidAmbiguousCharacters': false,
'requireEveryCharType': true,
'generateOnCreate': true,
};
}
$scope.pwSettings = {
'length': 12,
'useUppercase': true,
'useLowercase': true,
'useDigits': true,
'useSpecialChars': true,
'minimumDigitCount': 3,
'avoidAmbiguousCharacters': false,
'requireEveryCharType': true
};
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
if (!$scope.active_vault) {

View file

@ -33,7 +33,8 @@ angular.module('passmanApp')
'useSpecialChars': true,
'minimumDigitCount': 3,
'avoidAmbiguousCharacters': false,
'requireEveryCharType': true
'requireEveryCharType': true,
'generateOnCreate': true,
}
};
@ -46,7 +47,7 @@ angular.module('passmanApp')
_vault.vault_settings = angular.copy($scope.vault_settings);
_vault.vault_settings = window.btoa(JSON.stringify(_vault.vault_settings));
VaultService.updateVault(_vault).then(function () {
console.log('done');
VaultService.setActiveVault(_vault);
});
};

View file

@ -28,6 +28,14 @@ angular.module('passmanApp')
getActiveVault: function(vault){
return _activeVault;
},
getVaultSetting: function(key, default_value){
if(!_activeVault.vault_settings){
return default_value
} else {
return _activeVault.vault_settings[key] | default_value;
}
},
createVault: function (vaultName) {
var queryUrl = OC.generateUrl('apps/passman/api/v2/vaults');
return $http.post(queryUrl, { vault_name: vaultName }).then(function (response) {

View file

@ -63,7 +63,7 @@ angular.module('views/partials/forms/settings/import.html', []).run(['$templateC
angular.module('views/partials/forms/settings/password_settings.html', []).run(['$templateCache', function($templateCache) {
'use strict';
$templateCache.put('views/partials/forms/settings/password_settings.html',
'<div class="password_settings"><div class="col-xs-12 col-sm-5 col-lg-4"><label><span class="label">Password length</span><br><input type="number" ng-model="vault_settings.pwSettings.length" min="1"></label><label><span class="label">Minimum amount of digits</span><br><input type="number" ng-model="vault_settings.pwSettings.minimumDigitCount" min="0"></label></div><div class="col-xs-12 col-sm-6 col-lg-6"><label><input type="checkbox" ng-model="vault_settings.pwSettings.useUppercase"> <span class="label sm">Use uppercase letters</span></label><label><input ng-model="vault_settings.pwSettings.useLowercase" type="checkbox" id="lower"> <span class="label sm">Use lowercase letters</span></label><label><input ng-model="vault_settings.pwSettings.useDigits" type="checkbox" id="digits"> <span class="label sm">Use numbers</span></label><label><input type="checkbox" id="special" ng-model="vault_settings.pwSettings.useSpecialChars"> <span class="label sm">Use special characters</span></label><label><input type="checkbox" id="ambig" ng-model="vault_settings.pwSettings.avoidAmbiguousCharacters"> <span class="label sm">Avoid ambiguous characters</span></label><label><input type="checkbox" ng-model="vault_settings.pwSettings.requireEveryCharType" id="reqevery"> <span class="label sm">Require every character type</span></label></div></div><div class="row"><div class="col-xs-12"><button class="button" ng-click="saveVaultSettings()">Save</button></div></div>');
'<div class="password_settings"><div class="col-xs-12 col-sm-5 col-lg-4"><label><span class="label">Password length</span><br><input type="number" ng-model="vault_settings.pwSettings.length" min="1"></label><label><span class="label">Minimum amount of digits</span><br><input type="number" ng-model="vault_settings.pwSettings.minimumDigitCount" min="0"></label><label><span class="label">Generate password on creation</span><br><input type="checkbox" ng-model="vault_settings.pwSettings.generateOnCreate" min="0"></label></div><div class="col-xs-12 col-sm-6 col-lg-6"><label><input type="checkbox" ng-model="vault_settings.pwSettings.useUppercase"> <span class="label sm">Use uppercase letters</span></label><label><input ng-model="vault_settings.pwSettings.useLowercase" type="checkbox" id="lower"> <span class="label sm">Use lowercase letters</span></label><label><input ng-model="vault_settings.pwSettings.useDigits" type="checkbox" id="digits"> <span class="label sm">Use numbers</span></label><label><input type="checkbox" id="special" ng-model="vault_settings.pwSettings.useSpecialChars"> <span class="label sm">Use special characters</span></label><label><input type="checkbox" id="ambig" ng-model="vault_settings.pwSettings.avoidAmbiguousCharacters"> <span class="label sm">Avoid ambiguous characters</span></label><label><input type="checkbox" ng-model="vault_settings.pwSettings.requireEveryCharType" id="reqevery"> <span class="label sm">Require every character type</span></label></div></div><div class="row"><div class="col-xs-12"><button class="button" ng-click="saveVaultSettings()">Save</button></div></div>');
}]);
angular.module('views/partials/forms/settings/sharing.html', []).run(['$templateCache', function($templateCache) {

View file

@ -10,6 +10,11 @@
<input type="number" ng-model="vault_settings.pwSettings.minimumDigitCount" min="0">
</label>
<label>
<span class="label">Generate password on creation</span><br />
<input type="checkbox" ng-model="vault_settings.pwSettings.generateOnCreate" min="0">
</label>
</div>
<div class="col-xs-12 col-sm-6 col-lg-6">
<label>