From 06b84f98d1dbeda457a5d4f99cd3f61c28ba3792 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 29 Oct 2014 21:17:31 -0400
Subject: [PATCH] add server id to dto's

---
 .../thirdparty/apiclient/connectionmanager.js | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index b9673050c0..5abbcbd213 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -392,10 +392,9 @@
 
         self.logout = function () {
 
-            var i, length;
             var promises = [];
 
-            for (i = 0, length = apiClients.length; i < length; i++) {
+            for (var i = 0, length = apiClients.length; i < length; i++) {
 
                 var apiClient = apiClients[i];
 
@@ -404,16 +403,21 @@
                 }
             }
 
-            var done = function () {
+            return $.when(promises).done(function () {
 
                 var credentials = credentialProvider.credentials();
 
-                for (i = 0, length = credentials.servers.length; i < length; i++) {
-                    credentials.servers[i].UserId = null;
-                    credentials.servers[i].AccessToken = null;
-                    credentials.servers[i].ExchangeToken = null;
+                var servers = credentials.servers.filter(function (u) {
+                    return u.UserLinkType != "Guest";
+                });
+
+                for (var j = 0, numServers = servers.length; j < numServers; j++) {
+                    servers[j].UserId = null;
+                    servers[j].AccessToken = null;
+                    servers[j].ExchangeToken = null;
                 }
 
+                credentials.servers = servers;
                 credentials.ConnectAccessToken = null;
                 credentials.ConnectUserId = null;
 
@@ -422,9 +426,7 @@
                 connectUser = null;
 
                 $(self).trigger('signedout');
-            };
-
-            return $.when(promises).done(done);
+            });
         };
 
         self.connectUserId = function () {
@@ -458,7 +460,8 @@
                         Id: i.SystemId,
                         Name: i.Name,
                         RemoteAddress: i.Url,
-                        LocalAddress: null
+                        LocalAddress: i.LocalAddress,
+                        UserLinkType: (i.UserType || '').toLowerCase() == "guest" ? "Guest" : "LinkedUser"
                     };
                 });