From 9baca63c661cb8e37a3dcb7b49e2e801e947b2c8 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 7 Jul 2017 21:43:45 +0200
Subject: [PATCH] [fix] Login: Fix default Scrypt params
---
www/js/controllers/login-controllers.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/www/js/controllers/login-controllers.js b/www/js/controllers/login-controllers.js
index 4191d639c..42a00b976 100644
--- a/www/js/controllers/login-controllers.js
+++ b/www/js/controllers/login-controllers.js
@@ -43,10 +43,13 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
// Init method
$scope.formData.method = csSettings.data.login && csSettings.data.login.method || 'SCRYPT_DEFAULT';
+ var params = csSettings.data.login && csSettings.data.login.params;
if ($scope.isAuth && $scope.formData.method == 'PUBKEY') {
$scope.formData.method = 'SCRYPT_DEFAULT';
+ params = undefined; // will use default
+
}
- $scope.changeMethod($scope.formData.method);
+ $scope.changeMethod($scope.formData.method, params);
// Ink effect
UIUtils.ink({selector: '.modal-login .ink'});
@@ -238,7 +241,7 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
return Modals.showHelp(parameters);
};
- $scope.changeMethod = function(method){
+ $scope.changeMethod = function(method, params){
$scope.hideMethodsPopover();
if (method == $scope.formData.method) return; // same method
@@ -248,8 +251,8 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils,
// Scrypt (advanced or not)
if (method == 'SCRYPT_DEFAULT' || method == 'SCRYPT_ADVANCED') {
- var defaultScrypt = _.findWhere($scope.scryptParamsValues, {id: 'DEFAULT'});
- $scope.changeScrypt(defaultScrypt);
+ var scrypt = params || _.findWhere($scope.scryptParamsValues, {id: 'DEFAULT'});
+ $scope.changeScrypt(scrypt);
$scope.autoComputePubkey = $scope.autoComputePubkey && (method == 'SCRYPT_DEFAULT');
}
else {
--
GitLab