diff --git a/www/js/controllers/join-controllers.js b/www/js/controllers/join-controllers.js index 0a936b90adda4db0ed863438540dbe3aca6ba1de..36d78f0f818dd3d4b1b1f26917da6fe251709a69 100644 --- a/www/js/controllers/join-controllers.js +++ b/www/js/controllers/join-controllers.js @@ -318,7 +318,13 @@ function JoinModalController($scope, $state, $interval, $timeout, UIUtils, Crypt UIUtils.loading.show(); - return csWallet.login({auth: true, expectedPubkey: $scope.formData.pubkey, isNew: true}) + return csWallet.login({ + auth: true, + isNew: true, + method: 'SCRYPT_DEFAULT', + expectedPubkey: $scope.formData.pubkey, + showMethods: false + }) .then(function() { if ($scope.accountType === "member") { $scope.closeModal(); diff --git a/www/js/controllers/login-controllers.js b/www/js/controllers/login-controllers.js index c89aea0faf32293c52e9889ef9aaa313ea752692..93b751728321664732a74744bbd58307f5fbec1c 100644 --- a/www/js/controllers/login-controllers.js +++ b/www/js/controllers/login-controllers.js @@ -19,6 +19,7 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils, $scope.pubkeyPattern = '^' + BMA.constants.regexp.PUBKEY + '$'; $scope.isAuth = parameters.auth; + $scope.showMethods = angular.isDefined(parameters.showMethods) ? parameters.showMethods : true; $scope.expectedPubkey = parameters.expectedPubkey; $scope.scryptParamsValues = _.keys(CryptoUtils.constants.SCRYPT_PARAMS) @@ -40,7 +41,7 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, CryptoUtils, $scope.formData.keepAuth = ($scope.formData.keepAuthIdle == csSettings.constants.KEEP_AUTH_IDLE_SESSION); // Init method - var method = csSettings.data.login && csSettings.data.login.method || 'SCRYPT_DEFAULT'; + var method = parameters.method || csSettings.data.login && csSettings.data.login.method || 'SCRYPT_DEFAULT'; var params = csSettings.data.login && csSettings.data.login.params; if ($scope.isAuth && method == 'PUBKEY') { method = 'SCRYPT_DEFAULT'; // PUBKEY not enable if auth need diff --git a/www/templates/login/modal_login.html b/www/templates/login/modal_login.html index a1fe0a1f6e594e216e76aac62a23918befd9589a..f07c4a9a7a92919a5063f4539e2ba49617f0fb56 100644 --- a/www/templates/login/modal_login.html +++ b/www/templates/login/modal_login.html @@ -22,7 +22,7 @@ ng-init="setForm(loginForm)" ng-switch on="formData.method"> - <div class="item hidden-xs no-padding"> + <div class="item hidden-xs no-padding" ng-if="showMethods"> <div class="pull-right"> <a class="button button-text button-small-padding icon-right ink" ng-click="showMethodsPopover($event)">