Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-17 21:12:09 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #1310 from scm-manager/bugfix/login-redirect

Browse Source 
add from query parameter to login link
This commit is contained in:
Sebastian Sdorra
2020-09-01 10:34:06 +02:00
committed by GitHub
parent 1ecf33f65f 97f0ebe6d7
commit 693d2f58b2
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-ui/ui-components/src/navigation/PrimaryNavigation.tsx
View File

@@ -26,8 +26,10 @@ import { WithTranslation, withTranslation } from "react-i18next";
import PrimaryNavigationLink from "./PrimaryNavigationLink";
import { Links } from "@scm-manager/ui-types";
import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
import {withContextPath} from "../urls";
import { withRouter, RouteComponentProps } from "react-router-dom";
type Props = WithTranslation & {
type Props = RouteComponentProps & WithTranslation & {
links: Links;
};
@@ -64,11 +66,17 @@ class PrimaryNavigation extends React.Component<Props> {
};
appendLogin = (navigationItems: ReactNode[], append: Appender) => {
const { t, links } = this.props;
const { t, links, location } = this.props;
const from = location.pathname;
const loginPath = "/login";
const to = `${loginPath}?from=${encodeURIComponent(from)}`;
const props = {
links,
label: t("primary-navigation.login")
label: t("primary-navigation.login"),
loginUrl: withContextPath(loginPath),
from
};
if (binder.hasExtension("primary-navigation.login", props)) {
@@ -76,7 +84,7 @@ class PrimaryNavigation extends React.Component<Props> {
<ExtensionPoint key="primary-navigation.login" name="primary-navigation.login" props={props} />
);
} else {
append("/login", "/login", "primary-navigation.login", "login");
append(to, "/login", "primary-navigation.login", "login");
}
};
@@ -128,4 +136,4 @@ class PrimaryNavigation extends React.Component<Props> {
}
}
export default withTranslation("commons")(PrimaryNavigation);
export default withTranslation("commons")(withRouter(PrimaryNavigation));