merged /getUserDocumentIds into /getCurrentUser to avoid extra server round trip

1 files changed, 18 insertions, 21 deletions

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 017fb6061..f8fc2b531 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -917,7 +917,7 @@ export class CurrentUserUtils {
     public static async loadCurrentUser() {
         return rp.get(Utils.prepend("/getCurrentUser")).then(async response => {
             if (response) {
-                const result: { id: string, email: string, cacheDocumentIds: string, resolvedPorts: string } = JSON.parse(response);
+                const result: { userDocumentId: string, sharingDocumentId: string, linkDatabaseId: string,  email: string, cacheDocumentIds: string, resolvedPorts: string } = JSON.parse(response);
                 Doc.CurrentUserEmail = result.email;
                 resolvedPorts = result.resolvedPorts as any;
                 DocServer.init(window.location.protocol, window.location.hostname, resolvedPorts.socket, result.email);
@@ -936,27 +936,24 @@ export class CurrentUserUtils {
         });
     }
 
-    public static async loadUserDocument(id: string) {
-        await rp.get(Utils.prepend("/getUserDocumentIds")).then(ids => {
-            const { userDocumentId, sharingDocumentId, linkDatabaseId } = JSON.parse(ids);
-            if (userDocumentId) {
-                return DocServer.GetRefField(userDocumentId).then(async field => {
-                    Docs.newAccount = !(field instanceof Doc);
-                    await Docs.Prototypes.initialize();
-                    const userDoc = Docs.newAccount ? new Doc(userDocumentId, true) : field as Doc;
-                    this.updateUserDocument(Doc.SetUserDoc(userDoc), sharingDocumentId, linkDatabaseId);
-                    if (Docs.newAccount) {
-                        if (Doc.CurrentUserEmail === "guest") {
-                            DashboardView.createNewDashboard(undefined, "guest dashboard");
-                        } else {
-                            userDoc.activePage = "home";
-                        }
-                    }
-                    return userDoc;
-                });
-            } else {
-                throw new Error("There should be a user id! Why does Dash think there isn't one?");
+    public static async loadUserDocument(info:{
+        userDocumentId: string;
+        sharingDocumentId: string;
+        linkDatabaseId: string;
+    }) {
+        return DocServer.GetRefField(info.userDocumentId).then(async field => {
+            Docs.newAccount = !(field instanceof Doc);
+            await Docs.Prototypes.initialize();
+            const userDoc = Docs.newAccount ? new Doc(info.userDocumentId, true) : field as Doc;
+            this.updateUserDocument(Doc.SetUserDoc(userDoc), info.sharingDocumentId, info.linkDatabaseId);
+            if (Docs.newAccount) {
+                if (Doc.CurrentUserEmail === "guest") {
+                    DashboardView.createNewDashboard(undefined, "guest dashboard");
+                } else {
+                    userDoc.activePage = "home";
+                }
             }
+            return userDoc;
         });
     }