p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(navigateToLogin): `navigateToLogin` only jumps to the internal login page

This commit is contained in:
haitaoo 2023-05-09 17:41:11 +08:00
parent adc75083b2
commit dd14fa7b52
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/utils/floppyNavigation.ts
View File

@ -60,11 +60,9 @@ const navigate = (to: string | number, config: NavigateConfig = {}) => {
/**
* 1. Blocking redirection of two login pages
* 2. Auto storage login redirect
* Note: The or judgement cannot be missing here, both jumps will be used
*/
if (to === RouteAlias.login || to === getLoginUrl()) {
if (equalToCurrentHref(to)) {
return;
}
storageLoginRedirect();
}
@ -88,10 +86,11 @@ const navigate = (to: string | number, config: NavigateConfig = {}) => {
};
/**
* auto navigate to login page with redirect info
* auto navigate to login page
* Note: Only the internal login page is jumped here, `userAgent` login is handled on the internal login page.
*/
const navigateToLogin = (config?: NavigateConfig) => {
const loginUrl = getLoginUrl();
const loginUrl = RouteAlias.login;
navigate(loginUrl, config);
};