Merge pull request #3598 from binary-hamedanchi/mohammad/login_virtual_account

jy-deriv · web-flow · commit 1a8fbcd0cb02 · 2018-03-14T16:48:01.000+08:00
mohammad/login_virtual_account
diff --git a/src/javascript/app/base/header.js b/src/javascript/app/base/header.js
@@ -20,7 +20,7 @@ const findParent          = require('../../_common/utility').findParent;
 
 const Header = (() => {
     const onLoad = () => {
-        showOrHideLoginForm();
+        populateAccountsList();
         bindClick();
         if (!Login.isLoginPages()) {
             checkClientsCountry();
@@ -67,12 +67,12 @@ const Header = (() => {
         Client.sendLogoutRequest();
     };
 
-    const showOrHideLoginForm = () => {
+    const populateAccountsList = () => {
         if (!Client.isLoggedIn()) return;
         BinarySocket.wait('authorize').then(() => {
             const loginid_select = document.createElement('div');
             Client.getAllLoginids().forEach((loginid) => {
-                if (!Client.get('is_disabled', loginid)) {
+                if (!Client.get('is_disabled', loginid) && Client.get('token', loginid)) {
                     const account_title  = Client.getAccountTitle(loginid);
                     const is_real        = /real/i.test(account_title);
                     const currency       = Client.get('currency', loginid);
@@ -328,8 +328,7 @@ const Header = (() => {
 
     return {
         onLoad,
-
-        showOrHideLoginForm,
+        populateAccountsList,
         upgradeMessageVisibility,
         metatraderMenuItemVisibility,
         displayNotification,
diff --git a/src/javascript/app/base/logged_in.js b/src/javascript/app/base/logged_in.js
@@ -65,14 +65,11 @@ const LoggedInHandler = (() => {
         // Clear all accounts before entering the loop
         Client.clearAllAccounts();
 
-        let is_loginid_set = false;
         account_list.forEach((account) => {
             Object.keys(account).forEach((param) => {
                 if (param === 'loginid') {
-                    if (!is_loginid_set && !account.is_virtual &&
-                        !account.is_disabled) {
+                    if (!Client.get('loginid') && !account.is_virtual && !account.is_disabled) {
                         Client.set(param, account[param]);
-                        is_loginid_set = true;
                     }
                 } else {
                     const param_to_set = map_names[param] || param;
@@ -82,12 +79,6 @@ const LoggedInHandler = (() => {
             });
         });
 
-        // if didn't find any login ID that matched the above condition, set the first one at the end of the loop
-        if (!is_loginid_set) {
-            Client.set('loginid', params.acct1 || account_list[0].loginid);
-            is_loginid_set = true;
-        }
-
         let i = 1;
         while (params[`acct${i}`]) {
             const loginid = params[`acct${i}`];
@@ -98,6 +89,12 @@ const LoggedInHandler = (() => {
             i++;
         }
 
+        // if didn't find any login ID that matched the above condition
+        // or the selected one doesn't have a token, set the first one
+        if (!Client.get('loginid') || !Client.get('token')) {
+            Client.set('loginid', params.acct1 || account_list[0].loginid);
+        }
+
         if (Client.isLoggedIn()) {
             GTM.setLoginFlag();
             Client.set('session_start', parseInt(moment().valueOf() / 1000));
diff --git a/src/javascript/app/pages/user/set_currency.js b/src/javascript/app/pages/user/set_currency.js
@@ -91,7 +91,7 @@ const SetCurrency = (() => {
                             if (redirect_url) {
                                 window.location.href = redirect_url; // load without pjax
                             } else {
-                                Header.showOrHideLoginForm(); // update account title
+                                Header.populateAccountsList(); // update account title
                                 $('.select_currency').setVisibility(0);
                                 $('#has_currency').setVisibility(1);
                             }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ const SetCurrency = (() => {`
`91`	`91`	`if (redirect_url) {`
`92`	`92`	`window.location.href = redirect_url; // load without pjax`
`93`	`93`	`} else {`
`94`		`- Header.showOrHideLoginForm(); // update account title`
	`94`	`+ Header.populateAccountsList(); // update account title`
`95`	`95`	`$('.select_currency').setVisibility(0);`
`96`	`96`	`$('#has_currency').setVisibility(1);`
`97`	`97`	`}`