fix: github login

src/common/component/GithubLoginButton.tsx

@@ -18,9 +18,15 @@ const GithubLoginButton: FC<Props> = ({ type = "login", source = "webapp", clien
       if (key == 'widget' && !!newValue) {
         console.log("github logged in");
         localStorage.removeItem("widget");
-        const parentWindow = window.parent;
+        if (window.location !== window.parent.location) {
-        if (parentWindow) {
+          // in iframe
-          parentWindow.postMessage("RELOAD_WITH_OPEN", '*');
+          const parentWindow = window.parent;
+          if (parentWindow) {
+            parentWindow.postMessage("RELOAD_WITH_OPEN", '*');
+          }
+        } else {
+          // 刷新页面
+          location.reload();
         }
       }
     };

src/common/component/GoogleLoginButton.tsx

@@ -1,4 +1,4 @@
-import { FC, useEffect, useState } from "react";
+import { FC, Suspense, useEffect, useState } from "react";
 import { GoogleLogin, GoogleOAuthProvider } from "@react-oauth/google";
 import toast from "react-hot-toast";
 import { KEY_LOCAL_MAGIC_TOKEN } from "../../app/config";
@@ -39,7 +39,6 @@ const GoogleLoginInner: FC<Props> = ({ type = "login", loaded, loadError }) => {
           toast.error("Something Error");
           break;
       }
-      return;
     }
   }, [error]);
 
@@ -74,17 +73,19 @@ const GoogleLoginButton: FC<Props> = ({ type = "login", clientId }) => {
   const [hasError, setHasError] = useState(false);
   if (!clientId) return null;
   return (
-    <GoogleOAuthProvider
+    <Suspense fallback={<span>loading...</span>}>
-      onScriptLoadError={() => {
+      <GoogleOAuthProvider
-        setHasError(true);
+        onScriptLoadError={() => {
-      }}
+          setHasError(true);
-      onScriptLoadSuccess={() => {
+        }}
-        setScriptLoaded(true);
+        onScriptLoadSuccess={() => {
-      }}
+          setScriptLoaded(true);
-      clientId={clientId}
+        }}
-    >
+        clientId={clientId}
-      <GoogleLoginInner type={type} loaded={scriptLoaded} loadError={hasError} />
+      >
-    </GoogleOAuthProvider>
+        <GoogleLoginInner type={type} loaded={scriptLoaded} loadError={hasError} />
+      </GoogleOAuthProvider>
+    </Suspense>
   );
 };