Skip to content
Snippets Groups Projects
Commit 0453f5fc authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Login: Fix default Scrypt params

parent 7b808aa6
No related branches found
No related tags found
No related merge requests found
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
"default": { "default": {
"cacheTimeMs": 300000, "cacheTimeMs": 300000,
"fallbackLanguage": "en", "fallbackLanguage": "en",
"rememberMe": false, "rememberMe": true,
"showUDHistory": false, "showUDHistory": false,
"timeout": 300000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"logoutIlde": 600, "keepAuthIlde": 600,
"useLocalStorage": true, "useLocalStorage": true,
"useRelative": false, "useRelative": false,
"expertMode": false, "expertMode": false,
...@@ -54,12 +54,12 @@ ...@@ -54,12 +54,12 @@
"default_fr": { "default_fr": {
"cacheTimeMs": 300000, "cacheTimeMs": 300000,
"fallbackLanguage": "fr", "fallbackLanguage": "fr",
"rememberMe": false, "rememberMe": true,
"showUDHistory": false, "showUDHistory": false,
"timeout": 300000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
"logoutIlde": 600, "keepAuthIlde": 600,
"useLocalStorage": true, "useLocalStorage": true,
"useRelative": false, "useRelative": false,
"expertMode": false, "expertMode": false,
...@@ -105,8 +105,7 @@ ...@@ -105,8 +105,7 @@
"g1-test": { "g1-test": {
"cacheTimeMs": 300000, "cacheTimeMs": 300000,
"fallbackLanguage": "en", "fallbackLanguage": "en",
"rememberMe": false, "rememberMe": true,
"showUDHistory": false,
"timeout": 300000, "timeout": 300000,
"timeWarningExpireMembership": 5184000, "timeWarningExpireMembership": 5184000,
"timeWarningExpire": 7776000, "timeWarningExpire": 7776000,
......
...@@ -248,7 +248,8 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils, ...@@ -248,7 +248,8 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
// Scrypt (advanced or not) // Scrypt (advanced or not)
if (method == 'SCRYPT_DEFAULT' || method == 'SCRYPT_ADVANCED') { if (method == 'SCRYPT_DEFAULT' || method == 'SCRYPT_ADVANCED') {
$scope.changeScrypt($scope.scryptParamsValues[1]/*=default scrypt params*/); var defaultScrypt = _.findWhere($scope.scryptParamsValues, {id: 'DEFAULT'});
$scope.changeScrypt(defaultScrypt);
$scope.autoComputePubkey = $scope.autoComputePubkey && (method == 'SCRYPT_DEFAULT'); $scope.autoComputePubkey = $scope.autoComputePubkey && (method == 'SCRYPT_DEFAULT');
} }
else { else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment