From 3a0e96f9ebcbb58a23bdc819e2cdab1c221e614c Mon Sep 17 00:00:00 2001
From: tiddlygit-test <linonetwo012@gmail.com>
Date: Sat, 24 Jul 2021 19:10:49 +0800
Subject: [PATCH] refactor: move authInfo check to initializeWorkspaceView

---
 src/services/view/index.ts           | 13 -------------
 src/services/workspacesView/index.ts | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/services/view/index.ts b/src/services/view/index.ts
index 372a7f2d..f8bc45e0 100644
--- a/src/services/view/index.ts
+++ b/src/services/view/index.ts
@@ -197,19 +197,6 @@ export class View implements IViewService {
     const { rememberLastPageVisited, shareWorkspaceBrowsingData, spellcheck, spellcheckLanguages } = await this.preferenceService.getPreferences();
     // configure session, proxy & ad blocker
     const partitionId = shareWorkspaceBrowsingData ? 'persist:shared' : `persist:${workspace.id}`;
-    if (workspace.storageService !== SupportedStorageServices.local) {
-      const userInfo = this.authService.getStorageServiceUserInfo(workspace.storageService);
-      if (userInfo === undefined) {
-        // user not login into Github or something else
-        void dialog.showMessageBox(browserWindow, {
-          title: i18n.t('Dialog.StorageServiceUserInfoNoFound'),
-          message: i18n.t('Dialog.StorageServiceUserInfoNoFoundDetail'),
-          buttons: ['OK'],
-          cancelId: 0,
-          defaultId: 0,
-        });
-      }
-    }
     // prepare configs for start a BrowserView that loads wiki's web content
     // session
     const sessionOfView = session.fromPartition(partitionId);
diff --git a/src/services/workspacesView/index.ts b/src/services/workspacesView/index.ts
index f9c49eb8..38ef9e5e 100644
--- a/src/services/workspacesView/index.ts
+++ b/src/services/workspacesView/index.ts
@@ -59,6 +59,19 @@ export class WorkspaceView implements IWorkspaceViewService {
     if (mainWindow === undefined) {
       throw new Error(i18n.t(`Error.MainWindowMissing`));
     }
+    if (workspace.storageService !== SupportedStorageServices.local) {
+      const userInfo = this.authService.getStorageServiceUserInfo(workspace.storageService);
+      if (userInfo === undefined) {
+        // user not login into Github or something else
+        void dialog.showMessageBox(mainWindow, {
+          title: i18n.t('Dialog.StorageServiceUserInfoNoFound'),
+          message: i18n.t('Dialog.StorageServiceUserInfoNoFoundDetail'),
+          buttons: ['OK'],
+          cancelId: 0,
+          defaultId: 0,
+        });
+      }
+    }
     await this.wikiService.wikiStartup(workspace);
 
     const userInfo = await this.authService.getStorageServiceUserInfo(workspace.storageService);