send check master key to win because it have still stayed in state

Author: trae-op

package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-gp",
   "private": true,
-  "version": "0.2.15",
+  "version": "0.2.16",
   "type": "module",
   "main": "dist-main/app.js",
   "author": "traeop",

src/main/app/window.ts

@@ -9,7 +9,7 @@ import { AuthService } from "../auth/service.js";
 import { ControlUpdateWindowsPlatformService } from "../updater/services/windows/control-update.js";
 import { TrayService } from "../tray/service.js";
 import { destroyWindows } from "../@core/control-window/destroy.js";
-import { ipcWebContentsSend, isDev } from "../$shared/utils.js";
+import { ipcMainOn, ipcWebContentsSend, isDev } from "../$shared/utils.js";
 import { menu } from "../config.js";
 
 @WindowManager<TWindows["main"]>({
@@ -48,6 +48,7 @@ export class AppWindow implements TWindowManager {
     this.buildMenu(window);
     this.buildTray(window);
     this.checkAuthenticated(window);
+    this.ipcCheckSync(window);
     this.authService.setCheckAccessInterval(window);
 
     const userId = getElectronStorage("userId");
@@ -58,14 +59,25 @@ export class AppWindow implements TWindowManager {
     }
   }
 
-  private async checkAuthenticated(window: BrowserWindow) {
-    const result = await this.authService.checkAuthenticated(window);
-    ipcWebContentsSend("authSocialNetwork", window.webContents, {
-      isAuthenticated:
-        result !== undefined && result.isAuthenticated !== undefined,
+  private ipcCheckSync(window: BrowserWindow): void {
+    ipcMainOn("sync", (event) => {
+      const result = this.authService.checkAuthenticated(window);
+
+      event.reply("sync", {
+        isAuthenticated: result !== undefined && result.isAuthenticated,
+      });
     });
   }
 
+  private async checkAuthenticated(window: BrowserWindow) {
+    const result = this.authService.checkAuthenticated(window);
+    if (result !== undefined && result.isAuthenticated !== undefined) {
+      ipcWebContentsSend("authSocialNetwork", window.webContents, {
+        isAuthenticated: result.isAuthenticated,
+      });
+    }
+  }
+
   private buildTray(window: BrowserWindow): void {
     this.trayService.buildTray(
       this.trayService.trayMenu.map((item) => {

src/main/auth/service.ts

@@ -6,6 +6,7 @@ import { RestApiService } from "../rest-api/service.js";
 import {
   deleteFromElectronStorage,
   getElectronStorage,
+  deleteStore,
 } from "../$shared/store.js";
 import { ipcWebContentsSend } from "../$shared/utils.js";
 import { getWindow as getWindows } from "../@core/control-window/receive.js";
@@ -47,9 +48,9 @@ export class AuthService {
     return response.data;
   }
 
-  async checkAuthenticated(
+  checkAuthenticated(
     window: BrowserWindow
-  ): Promise<{ isAuthenticated: boolean } | undefined> {
+  ): { isAuthenticated: boolean } | undefined {
     const cacheAccess = this.cacheAccess();
     if (cacheAccess !== undefined) {
       ipcWebContentsSend("sync", window.webContents, {
@@ -69,19 +70,9 @@ export class AuthService {
       });
 
       const response = await this.access();
-      if (response !== undefined) {
-        ipcWebContentsSend("sync", window.webContents, {
-          isAuthenticated: response.ok,
-        });
-
-        return {
-          isAuthenticated: true,
-        };
-      } else {
-        ipcWebContentsSend("sync", window.webContents, {
-          isAuthenticated: true,
-        });
-      }
+      ipcWebContentsSend("sync", window.webContents, {
+        isAuthenticated: (response !== undefined && response.ok) || true,
+      });
 
       const authToken = getElectronStorage("authToken");
       if (authToken === undefined) {
@@ -112,6 +103,7 @@ export class AuthService {
     deleteFromElectronStorage("authToken");
     deleteFromElectronStorage("response");
     deleteFromElectronStorage("userId");
+    deleteStore("masterKey");
     deleteFromElectronStorage("twoFactorSecret");
     ipcWebContentsSend("authSocialNetwork", window.webContents, {
       isAuthenticated: false,

src/main/master-key/ipc.ts

@@ -29,7 +29,7 @@ export class MasterKeyIpc {
       this.masterKeyWindow = await masterKeyWindow.create();
     });
 
-    this.ipcGetMasterKey();
+    this.ipcCheckMasterKey();
     this.ipcPostMasterKey();
     this.ipcDeleteMasterKey();
     this.ipcCopyMasterKey();
@@ -98,7 +98,7 @@ export class MasterKeyIpc {
     });
   }
 
-  private ipcGetMasterKey(): void {
+  private ipcCheckMasterKey(): void {
     ipcMainOn("checkMasterKey", (event) => {
       const masterKey = getStore("masterKey");
 

src/main/master-key/window.ts

@@ -1,6 +1,8 @@
 import { BrowserWindow } from "electron";
 import { WindowManager } from "../@core/decorators/window-manager.js";
 import { TWindowManager } from "../@core/types/window-manager.js";
+import { ipcWebContentsSend } from "../$shared/utils.js";
+import { getStore } from "../$shared/store.js";
 
 @WindowManager<TWindows["masterKey"]>({
   hash: "window:master-key",
@@ -16,9 +18,20 @@ import { TWindowManager } from "../@core/types/window-manager.js";
   },
 })
 export class MasterKeyWindow implements TWindowManager {
+  isSync = false;
   constructor() {}
 
-  onDidFinishLoad(window: BrowserWindow): void {
-    // window.webContents.openDevTools();
+  onDidFinishLoad(): void {
+    this.isSync = true;
+  }
+
+  onShow(window: BrowserWindow): void {
+    if (this.isSync) {
+      const masterKey = getStore("masterKey");
+
+      ipcWebContentsSend("masterKey", window.webContents, {
+        isMasterKey: Boolean(masterKey),
+      });
+    }
   }
 }

src/main/preload.cts

@@ -56,6 +56,9 @@ electron.contextBridge.exposeInMainWorld("electron", {
     checkUser: () => {
       ipcSend("checkUser");
     },
+    sync: () => {
+      ipcSend("sync");
+    },
     windowAuthSocialNetwork: (payload) => {
       ipcSend("authSocialNetwork", payload);
     },

src/main/two-factor/ipc.ts

@@ -88,9 +88,6 @@ export class TwoFactorIpc {
       ipcWebContentsSend("authSocialNetwork", mainWindow.webContents, {
         isAuthenticated: true,
       });
-      ipcWebContentsSend("sync", mainWindow.webContents, {
-        isAuthenticated: true,
-      });
       this.authService.setCheckAccessInterval(mainWindow);
     }
   }

src/renderer/ui-business/MasterKey/hooks/useIpc.ts

@@ -5,12 +5,12 @@ export const useIpc = () => {
   const { setMasterKey } = useControlContextActions();
 
   useEffect(() => {
-    window.electron.receive.subscribeMasterKey(({ isMasterKey }) => {
-      setMasterKey(isMasterKey);
-    });
+    window.electron.send.checkMasterKey();
   }, []);
 
   useEffect(() => {
-    window.electron.send.checkMasterKey();
+    window.electron.receive.subscribeMasterKey(({ isMasterKey }) => {
+      setMasterKey(isMasterKey);
+    });
   }, []);
 };

src/renderer/ui-business/Sync/hooks/useIpc.ts

@@ -5,10 +5,26 @@ export const useIpc = () => {
   const { setUser, setAuthenticated, setResources } =
     useControlContextActions();
 
+  useEffect(() => {
+    window.electron.send.sync();
+  }, []);
+
   useEffect(() => {
     const unSub = window.electron.receive.subscribeSync(
       ({ isAuthenticated, isResources, isUser }) => {
-        setAuthenticated(isAuthenticated);
+        setAuthenticated((prevValue) => {
+          if (prevValue === undefined) {
+            return isAuthenticated;
+          }
+
+          if (prevValue !== undefined && isAuthenticated === undefined) {
+            return prevValue;
+          }
+
+          if (isAuthenticated !== undefined && prevValue !== undefined) {
+            return isAuthenticated;
+          }
+        });
         setUser((prevValue) => {
           if (prevValue === undefined) {
             return isUser;

src/renderer/windows/home/components/Home.tsx

@@ -1,6 +1,5 @@
 import { lazy, Suspense } from "react";
 import Box from "@mui/material/Box";
-import { Provider as ProviderUser } from "@ui-business/User";
 import {
   useIpc as useIpcMasterKey,
   Provider as ProviderMasterKey,
@@ -18,19 +17,17 @@ const Home = () => {
 
   return (
     <ProviderSync>
-      <ProviderUser>
-        <Suspense fallback={<LoadingSpinner />}>
-          <LazyTopPanel isMasterKey={isMasterKey} />
-        </Suspense>
+      <Suspense fallback={<LoadingSpinner />}>
+        <LazyTopPanel isMasterKey={isMasterKey} />
+      </Suspense>
 
-        <ProviderMasterKey>
-          <Box sx={{ mt: 6, width: "100%" }}>
-            <Suspense fallback={<LoadingSpinner />}>
-              <LazyResources isMasterKey={isMasterKey} />
-            </Suspense>
-          </Box>
-        </ProviderMasterKey>
-      </ProviderUser>
+      <ProviderMasterKey>
+        <Box sx={{ mt: 6, width: "100%" }}>
+          <Suspense fallback={<LoadingSpinner />}>
+            <LazyResources isMasterKey={isMasterKey} />
+          </Suspense>
+        </Box>
+      </ProviderMasterKey>
     </ProviderSync>
   );
 };