Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 17:07:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix: login return_url doesn't work with custom server paths (#21588)

Browse source 
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
This commit is contained in:
Alexander Matyushentsev 2025-01-21 09:22:50 -08:00 committed by GitHub
parent 55aab6efb6
commit eed70eed6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/src/app/app.tsx
View file

@ -235,7 +235,7 @@ export class App extends React.Component<
}
public getChildContext() {
return {history, apis: {popup: this.popupManager, notifications: this.notificationsManager, navigation: this.navigationManager}};
return {history, apis: {popup: this.popupManager, notifications: this.notificationsManager, navigation: this.navigationManager, baseHref: base}};
}
private async subscribeUnauthorized() {

7
ui/src/app/login/components/login.tsx
View file

@ -135,7 +135,12 @@ 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);
let redirectURL = url.pathname + url.search;
// return url already contains baseHref, so we need to remove it
if (this.appContext.apis.baseHref != '/' && redirectURL.startsWith(this.appContext.apis.baseHref)) {
redirectURL = redirectURL.substring(this.appContext.apis.baseHref.length);
}
this.appContext.apis.navigation.goto(redirectURL);
} else {
this.appContext.apis.navigation.goto('/applications');
}