fix: resolve deeplink login issue (#881)

ayangweb · web-flow · commit 50b26e2d9e3a · 2025-08-22T09:40:53.000+08:00
* fix: resolve deeplink login issue

* docs: update changelog

* refactor: update
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
@@ -28,6 +28,7 @@ Information about release notes of Coco App is provided here.
 - fix: web component login state #857
 - fix: shortcut key not opening extension store #877
 - fix: set up hotkey on main thread or Windows will complain #879
+- fix: resolve deeplink login issue #881
 
 ### ✈️ Improvements
 
diff --git a/src/components/Cloud/Cloud.tsx b/src/components/Cloud/Cloud.tsx
@@ -1,4 +1,6 @@
 import { useEffect, useRef, useState, useCallback } from "react";
+import { isEqual } from "lodash-es";
+import { usePrevious } from "ahooks";
 
 import { DataSourcesList } from "./DataSourcesList";
 import { Sidebar } from "./Sidebar";
@@ -7,9 +9,9 @@ import { useAppStore } from "@/stores/appStore";
 import { useConnectStore } from "@/stores/connectStore";
 import ServiceInfo from "./ServiceInfo";
 import ServiceAuth from "./ServiceAuth";
-import platformAdapter from "@/utils/platformAdapter";
 import type { Server } from "@/types/server";
 import { useServers } from "@/hooks/useServers";
+import platformAdapter from "@/utils/platformAdapter";
 
 export default function Cloud() {
   const SidebarRef = useRef<{ refreshData: () => void }>(null);
@@ -24,13 +26,16 @@ export default function Cloud() {
     serverList,
     setServerList,
   } = useConnectStore();
+  const prevServerList = usePrevious(serverList);
 
   const [refreshLoading, setRefreshLoading] = useState(false);
 
   const { addServer, refreshServerList } = useServers();
 
   // fetch the servers
   useEffect(() => {
+    if (isEqual(prevServerList, serverList)) return;
+
     fetchServers();
   }, [serverList]);
 
@@ -40,32 +45,37 @@ export default function Cloud() {
   }, [cloudSelectService?.id]);
 
   const fetchServers = useCallback(async () => {
-    let res = serverList;
+    let { serverList } = useConnectStore.getState();
+
     if (errors.length > 0) {
-      res = res.map((item: Server) => {
+      serverList = serverList.map((item: Server) => {
         if (item.id === cloudSelectService?.id) {
-          item.health = {
-            services: item.health?.services || {},
-            status: item.health?.status || "red",
+          return {
+            ...item,
+            health: {
+              services: item.health?.services || {},
+              status: item.health?.status || "red",
+            },
           };
         }
         return item;
       });
     }
-    setServerList(res);
 
-    if (res.length > 0) {
-      const matched = res.find((server: any) => {
+    setServerList(serverList);
+
+    if (serverList.length > 0) {
+      const matched = serverList.find((server: any) => {
         return server.id === cloudSelectService?.id;
       });
 
       if (matched) {
         setCloudSelectService(matched);
       } else {
-        setCloudSelectService(res[res.length - 1]);
+        setCloudSelectService(serverList[serverList.length - 1]);
       }
     }
-  }, [serverList, errors, cloudSelectService]);
+  }, [errors, cloudSelectService]);
 
   const refreshClick = useCallback(
     async (id: string, callback?: () => void) => {
diff --git a/src/components/Cloud/ServiceAuth.tsx b/src/components/Cloud/ServiceAuth.tsx
@@ -42,7 +42,7 @@ const ServiceAuth = memo(
       // Generate the login URL with the current appUid
       const url = `${cloudSelectService?.auth_provider?.sso?.url}/?provider=${cloudSelectService?.id}&product=coco&request_id=${requestID}`;
 
-      console.log("Open SSO link, requestID:", ssoRequestID, url);
+      console.log("Open SSO link, requestID:", url);
 
       // Open the URL in a browser
       OpenURLWithBrowser(url);
diff --git a/src/hooks/useDeepLinkManager.ts b/src/hooks/useDeepLinkManager.ts
@@ -20,48 +20,44 @@ export interface DeepLinkHandler {
 
 export function useDeepLinkManager() {
   const addError = useAppStore((state) => state.addError);
-  const ssoRequestID = useAppStore((state) => state.ssoRequestID);
-  const cloudSelectService = useConnectStore(
-    (state) => state.cloudSelectService
-  );
   const { t } = useTranslation();
 
   // handle oauth callback
-  const handleOAuthCallback = useCallback(
-    async (url: URL) => {
-      try {
-        const reqId = url.searchParams.get("request_id");
-        const code = url.searchParams.get("code");
-
-        if (reqId !== ssoRequestID) {
-          console.log("Request ID not matched, skip");
-          addError("Request ID not matched, skip");
-          return;
-        }
+  const handleOAuthCallback = useCallback(async (url: URL) => {
+    try {
+      const reqId = url.searchParams.get("request_id");
+      const code = url.searchParams.get("code");
 
-        const serverId = cloudSelectService?.id;
-        if (!code || !serverId) {
-          addError("No authorization code received");
-          return;
-        }
+      const { ssoRequestID } = useAppStore.getState();
+      const { cloudSelectService } = useConnectStore.getState();
 
-        console.log("Handling OAuth callback:", { code, serverId });
-        await platformAdapter.commands("handle_sso_callback", {
-          serverId: serverId,
-          requestId: ssoRequestID,
-          code: code,
-        });
+      if (reqId !== ssoRequestID) {
+        console.log("Request ID not matched, skip");
+        addError("Request ID not matched, skip");
+        return;
+      }
 
-        // trigger oauth success event
-        platformAdapter.emitEvent("oauth_success", { serverId });
-        getCurrentWindow().setFocus();
-      } catch (err) {
-        console.error("Failed to parse OAuth callback URL:", err);
-        addError("Invalid OAuth callback URL format: " + err);
+      const serverId = cloudSelectService?.id;
+      if (!code || !serverId) {
+        addError("No authorization code received");
+        return;
       }
-    },
-    [ssoRequestID, cloudSelectService, addError]
-  );
+
+      console.log("Handling OAuth callback:", { code, serverId });
+      await platformAdapter.commands("handle_sso_callback", {
+        serverId: serverId,
+        requestId: ssoRequestID,
+        code: code,
+      });
+
+      // trigger oauth success event
+      platformAdapter.emitEvent("oauth_success", { serverId });
+      getCurrentWindow().setFocus();
+    } catch (err) {
+      console.error("Failed to parse OAuth callback URL:", err);
+      addError("Invalid OAuth callback URL format: " + err);
+    }
+  }, []);
 
   // handle install extension from store
   const handleInstallExtension = useCallback(async (url: URL) => {
