fix(ui): fix login redirect failed when basehref is set

Signed-off-by: henry.liu <[email protected]>

ui/src/app/app.tsx

@@ -22,10 +22,10 @@ import {AuthSettings} from './shared/models';
 import {PKCEVerification} from './login/components/pkce-verify';
 import {getPKCERedirectURI, pkceLogin} from './login/components/utils';
 import {SystemLevelExtension} from './shared/services/extensions-service';
+import {getBase} from './utils';
 
 services.viewPreferences.init();
-const bases = document.getElementsByTagName('base');
-const base = bases.length > 0 ? bases[0].getAttribute('href') || '/' : '/';
+const base = getBase();
 export const history = createBrowserHistory({basename: base});
 requests.setBaseHRef(base);
 

ui/src/app/login/components/login.tsx

@@ -8,6 +8,7 @@ import {AppContext} from '../../shared/context';
 import {AuthSettings} from '../../shared/models';
 import {services} from '../../shared/services';
 import {getPKCERedirectURI, pkceLogin} from './utils';
+import {getBase} from '../../utils';
 
 require('./login.scss');
 
@@ -135,7 +136,8 @@ export class Login extends React.Component<RouteComponentProps<{}>, State> {
             this.setState({loginInProgress: false});
             if (returnURL) {
                 const url = new URL(returnURL);
-                this.appContext.apis.navigation.goto(url.pathname + url.search);
+                const base = getBase();
+                this.appContext.apis.navigation.goto(url.pathname.slice(base.length - 1) + url.search);
             } else {
                 this.appContext.apis.navigation.goto('/applications');
             }

ui/src/app/utils.ts

@@ -0,0 +1,5 @@
+export const getBase = () => {
+    const bases = document.getElementsByTagName('base');
+
+    return bases.length > 0 ? bases[0].getAttribute('href') || '/' : '/';
+};