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;