From 14bb11daf913c9ab1c81e5599128213080896ce3 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Sat, 8 Jul 2017 00:39:46 +0200
Subject: [PATCH] [fix] Fix join wizard
---
www/js/controllers/join-controllers.js | 8 +++++++-
www/js/controllers/login-controllers.js | 3 ++-
www/templates/login/modal_login.html | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/www/js/controllers/join-controllers.js b/www/js/controllers/join-controllers.js
index 0a936b90a..36d78f0f8 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 c89aea0fa..93b751728 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 a1fe0a1f6..f07c4a9a7 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)">
--
GitLab