From 3c0f0481655db7d111a7f53bbd59c653301de984 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 23 Feb 2015 13:55:38 -0500 Subject: [PATCH] added connection manager events --- .../thirdparty/apiclient/connectionmanager.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js index aacaeb53bb..ede8c34ee7 100644 --- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js +++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js @@ -454,7 +454,8 @@ self.isLoggedIntoConnect = function () { - return self.connectToken() && self.connectUserId(); + // Make sure it returns true or false + return (self.connectToken() && self.connectUserId()) == true; }; self.logout = function () { @@ -466,7 +467,7 @@ var apiClient = apiClients[i]; if (apiClient.accessToken()) { - promises.push(apiClient.logout()); + promises.push(logoutOfServer(apiClient)); } } @@ -506,6 +507,20 @@ }); }; + function logoutOfServer(apiClient) { + + var serverInfo = apiClient.serverInfo(); + + var logoutInfo = { + serverId: serverInfo.Id + }; + + return apiClient.logout().always(function () { + + Events.trigger(self, 'localusersignedout', [logoutInfo]); + }); + } + function getConnectServers(credentials) { logger.log('Begin getConnectServers');