fix: minio login 页关闭

src/screens/LoginPage/LoginPage.tsx

@@ -41,7 +41,8 @@ import MainError from "../Console/Common/MainError/MainError";
 import { encodeFileName } from "../../common/utils";
 import { LockIcon, LoginMinIOLogo, UsersIcon } from "../../icons";
 import { spacingUtils } from "../Console/Common/FormComponents/common/styleLibrary";
-import message from '../../utils/message';
+import message from "../../utils/message";
+import { toLoginPage } from "../../utils/toLogin";
 
 const styles = (theme: Theme) =>
   createStyles({
@@ -356,6 +357,8 @@ const Login = ({
       });
   };
 
+  toLoginPage({ replace: true, callbackUrl: false });
+
   useEffect(() => {
     if (loadingFetchConfiguration) {
       api
@@ -524,25 +527,25 @@ const Login = ({
           {loadingFetchConfiguration ? (
             <CircularProgress className={classes.loadingLoginStrategy} />
           ) : (
-              <React.Fragment>
-                <div>
-                  <p>An error has occurred, the backend cannot be reached.</p>
-                </div>
-                <div>
-                  <Button
-                    onClick={() => {
-                      fetchConfiguration();
-                    }}
-                    endIcon={<RefreshIcon />}
-                    color={"primary"}
-                    variant="outlined"
-                    className={classes.retryButton}
-                  >
-                    Retry
+            <React.Fragment>
+              <div>
+                <p>An error has occurred, the backend cannot be reached.</p>
+              </div>
+              <div>
+                <Button
+                  onClick={() => {
+                    fetchConfiguration();
+                  }}
+                  endIcon={<RefreshIcon />}
+                  color={"primary"}
+                  variant="outlined"
+                  className={classes.retryButton}
+                >
+                  Retry
                 </Button>
-                </div>
-              </React.Fragment>
-            )}
+              </div>
+            </React.Fragment>
+          )}
         </div>
       );
   }

src/utils/toLogin.ts

+interface ToLoginPageOptions {
+  callbackUrl?: boolean | string;
+  replace?: boolean;
+}
 /** 跳转到登录页 */
-export const toLoginPage = (callbackUrl: boolean | string = true): void => {
+export const toLoginPage = (options?: ToLoginPageOptions): void => {
+  let { callbackUrl = true, replace = false } = options || {};
   if (typeof callbackUrl === "boolean" && callbackUrl) {
     // 如果是 true 就是用当前 url 作为登录成功后回调地址
     callbackUrl = encodeURIComponent(window.location.href);
   }
 
   const queryStr = callbackUrl ? `?callbackUrl=${callbackUrl}` : "";
+  let url = `/saturn/login${queryStr}`;
 
   if (process.env.NODE_ENV === "production") {
     let loginUrl = `https://xxyy.co/#/login${queryStr}`;
@@ -13,8 +19,11 @@ export const toLoginPage = (callbackUrl: boolean | string = true): void => {
     if (window.location.host.endsWith(".kube.ucas")) {
       loginUrl = `https://test-www.kube.ucas/login${queryStr}`;
     }
-    window.location.href = loginUrl;
+    url = loginUrl;
+  }
+  if (replace) {
+    window.location.replace(url);
   } else {
-    window.location.href = `/saturn/login${queryStr}`;
+    window.location.href = url;
   }
 };