From 476f02f2c450c82e268e8ee133cb747eb5d005ed Mon Sep 17 00:00:00 2001 From: Khalid Ibrahim Date: Fri, 7 Jun 2019 18:35:44 +0800 Subject: [PATCH 1/4] Updated package: fstream --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbfc0ce41b..2bef6934a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3341,9 +3341,9 @@ "dev": true }, "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -5709,7 +5709,7 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "^1.0.0", + "fstream": "^1.0.12", "glob": "^7.0.3", "graceful-fs": "^4.1.2", "mkdirp": "^0.5.0", From 9f066c1667ac404bb88e9c50a30793d0b7703363 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Wed, 19 Jun 2019 10:38:04 +0800 Subject: [PATCH 2/4] check prompt authenticated --- src/accountstatus/accountstatus.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/accountstatus/accountstatus.es6 b/src/accountstatus/accountstatus.es6 index c354b9325f..b585667904 100644 --- a/src/accountstatus/accountstatus.es6 +++ b/src/accountstatus/accountstatus.es6 @@ -45,7 +45,7 @@ class AccountStatus { this.is_mf = /^maltainvest$/gi.test(response.authorize.landing_company_name); this.is_cr = /^svg|costarica$/gi.test(response.authorize.landing_company_name); this.has_mt5_account = mt5_account.mt5_login_list.length > 0; - this.is_authenticated = !account_status.get_account_status.prompt_client_to_authenticate; + this.is_authenticated = parseInt(account_status.get_account_status.prompt_client_to_authenticate); // Check whether the user has accepted the T&C. if (website_status && website_status.website_status && get_settings && get_settings.get_settings) { this.tc_accepted = website_status.website_status.terms_conditions_version === get_settings.get_settings.client_tnc_status; From 2a380528379207532128a3f1d0eb9e8da2f94d5c Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Wed, 19 Jun 2019 10:39:02 +0800 Subject: [PATCH 3/4] add falsy --- src/accountstatus/accountstatus.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/accountstatus/accountstatus.es6 b/src/accountstatus/accountstatus.es6 index b585667904..bcaf47756c 100644 --- a/src/accountstatus/accountstatus.es6 +++ b/src/accountstatus/accountstatus.es6 @@ -45,7 +45,7 @@ class AccountStatus { this.is_mf = /^maltainvest$/gi.test(response.authorize.landing_company_name); this.is_cr = /^svg|costarica$/gi.test(response.authorize.landing_company_name); this.has_mt5_account = mt5_account.mt5_login_list.length > 0; - this.is_authenticated = parseInt(account_status.get_account_status.prompt_client_to_authenticate); + this.is_authenticated = !parseInt(account_status.get_account_status.prompt_client_to_authenticate); // Check whether the user has accepted the T&C. if (website_status && website_status.website_status && get_settings && get_settings.get_settings) { this.tc_accepted = website_status.website_status.terms_conditions_version === get_settings.get_settings.client_tnc_status; From eda1be1b94dec15cfcb3315145fe37d78df112b5 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Wed, 19 Jun 2019 12:04:30 +0800 Subject: [PATCH 4/4] change to + --- src/accountstatus/accountstatus.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/accountstatus/accountstatus.es6 b/src/accountstatus/accountstatus.es6 index bcaf47756c..ba73883050 100644 --- a/src/accountstatus/accountstatus.es6 +++ b/src/accountstatus/accountstatus.es6 @@ -45,7 +45,7 @@ class AccountStatus { this.is_mf = /^maltainvest$/gi.test(response.authorize.landing_company_name); this.is_cr = /^svg|costarica$/gi.test(response.authorize.landing_company_name); this.has_mt5_account = mt5_account.mt5_login_list.length > 0; - this.is_authenticated = !parseInt(account_status.get_account_status.prompt_client_to_authenticate); + this.is_authenticated = !+account_status.get_account_status.prompt_client_to_authenticate; // Check whether the user has accepted the T&C. if (website_status && website_status.website_status && get_settings && get_settings.get_settings) { this.tc_accepted = website_status.website_status.terms_conditions_version === get_settings.get_settings.client_tnc_status;