From fba0e73ddb95f078f8aa3aebbdbcabdc87602b7b Mon Sep 17 00:00:00 2001
From: nazaninreihani <nazanin.reyh@gmail.com>
Date: Wed, 17 Jul 2019 11:59:20 -0400
Subject: [PATCH 1/2] Fix sending not shown in authorize as token

---
 www/js/share/services/app-state.service.js | 1 +
 www/js/share/services/websocket.service.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/www/js/share/services/app-state.service.js b/www/js/share/services/app-state.service.js
index 771ba94182..bb91213c70 100644
--- a/www/js/share/services/app-state.service.js
+++ b/www/js/share/services/app-state.service.js
@@ -48,6 +48,7 @@ angular.module("binary").factory("appStateService", () => {
     factory.upgradeableLandingCompanies = [];
     factory.loginFinished = false;
     factory.isMaltainvest = false;
+    factory.authorizeToken = "";
 
     return factory;
 });
diff --git a/www/js/share/services/websocket.service.js b/www/js/share/services/websocket.service.js
index 66a212e641..2ea0fcbbd0 100644
--- a/www/js/share/services/websocket.service.js
+++ b/www/js/share/services/websocket.service.js
@@ -195,6 +195,11 @@ angular
 
             const websocketService = {};
             websocketService.authenticate = function(_token, extraParams) {
+                if (_token && _token !== "<not shown>") {
+                    appStateService.authorizeToken = _token;
+                } else {
+                    _token = appStateService.authorizeToken;
+                }
                 extraParams = null || extraParams;
                 appStateService.isLoggedin = false;
 
@@ -588,6 +593,7 @@ angular
                     switch (messageType) {
                         case "authorize":
                             if (message.authorize) {
+                                message.echo_req.authorize = appStateService.authorizeToken;
                                 message.authorize.token = message.echo_req.authorize;
                                 window._trackJs.userId = message.authorize.loginid;
                                 appStateService.isLoggedin = true;

From 863929ec00e637d8d752f76941c0e1aa958a0fd8 Mon Sep 17 00:00:00 2001
From: nazaninreihani <nazanin.reyh@gmail.com>
Date: Wed, 17 Jul 2019 12:10:03 -0400
Subject: [PATCH 2/2] remove saved token after logout

---
 www/js/share/services/websocket.service.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/js/share/services/websocket.service.js b/www/js/share/services/websocket.service.js
index 2ea0fcbbd0..b423606574 100644
--- a/www/js/share/services/websocket.service.js
+++ b/www/js/share/services/websocket.service.js
@@ -222,6 +222,7 @@ angular
                 appStateService.isChangedAccount = false;
                 appStateService.isPopupOpen = false;
                 appStateService.isLoggedin = false;
+                appStateService.authorizeToken = '';
                 sessionStorage.removeItem("start");
                 sessionStorage.removeItem("_interval");
                 sessionStorage.removeItem("realityCheckStart");