From d9d8d4fa6e32d09abb6d3a1677f8bd0a5be19149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E6=B7=B1?= <yuns.xie@qq.com>
Date: Sun, 28 Feb 2021 18:52:26 +0800
Subject: [PATCH] fix: redirect with deploy on non-root path (#8141)

---
 src/models/login.ts | 3 +++
 src/typings.d.ts    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/models/login.ts b/src/models/login.ts
index b08880d5..8d16ec4e 100644
--- a/src/models/login.ts
+++ b/src/models/login.ts
@@ -49,6 +49,9 @@ const Model: LoginModelType = {
           const redirectUrlParams = new URL(redirect);
           if (redirectUrlParams.origin === urlParams.origin) {
             redirect = redirect.substr(urlParams.origin.length);
+            if (window.routerBase !== '/') {
+              redirect = redirect.replace(window.routerBase, '/');
+            }
             if (redirect.match(/^\/.*#/)) {
               redirect = redirect.substr(redirect.indexOf('#') + 1);
             }
diff --git a/src/typings.d.ts b/src/typings.d.ts
index 7fcfaf28..410ec8d3 100644
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@@ -33,6 +33,7 @@ interface Window {
     fieldsObject: GAFieldsObject | string,
   ) => void;
   reloadAuthorized: () => void;
+  routerBase: string;
 }
 
 declare let ga: () => void;
-- 
GitLab