Merge branch 'master' into UI_Update_Eric_Ma

1 files changed, 14 insertions, 2 deletions

diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index c3dadd821..8b7994eac 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -5,7 +5,8 @@ import { msToTime } from '../ActionUtilities';
 import * as bcrypt from 'bcrypt-nodejs';
 import { Opt } from '../../fields/Doc';
 import { WebSocket } from '../websocket';
-import { DashStats } from '../DashStats';
+import { resolvedPorts } from '../server_Initialization';
+import { DashVersion } from '../../fields/DocSymbols';
 
 export const timeMap: { [id: string]: number } = {};
 interface ActivityUnit {
@@ -68,7 +69,18 @@ export default class UserManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: '/getCurrentUser',
-            secureHandler: ({ res, user: { _id, email, cacheDocumentIds } }) => res.send(JSON.stringify({ id: _id, email, cacheDocumentIds })),
+            secureHandler: ({ res, user }) =>
+                res.send(
+                    JSON.stringify({
+                        version: DashVersion,
+                        userDocumentId: user.userDocumentId,
+                        linkDatabaseId: user.linkDatabaseId,
+                        sharingDocumentId: user.sharingDocumentId,
+                        email: user.email,
+                        cacheDocumentIds: user.cacheDocumentIds,
+                        resolvedPorts,
+                    })
+                ),
             publicHandler: ({ res }) => res.send(JSON.stringify({ id: '__guest__', email: 'guest' })),
         });