From dd14fa7b52ff4a68a678b1ded42483a5f4f8bf64 Mon Sep 17 00:00:00 2001 From: haitaoo Date: Tue, 9 May 2023 17:41:11 +0800 Subject: [PATCH] fix(navigateToLogin): `navigateToLogin` only jumps to the internal login page --- ui/src/utils/floppyNavigation.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/src/utils/floppyNavigation.ts b/ui/src/utils/floppyNavigation.ts index fe3f38ee..438958b4 100644 --- a/ui/src/utils/floppyNavigation.ts +++ b/ui/src/utils/floppyNavigation.ts @@ -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); };