From e755a7331df725fd0f94a0eb546d358df3508efa Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Wed, 14 Feb 2024 09:45:21 +0800 Subject: [PATCH] Fix renderLink() --- web/src/Setting.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/web/src/Setting.js b/web/src/Setting.js index 48d78369..74842d15 100644 --- a/web/src/Setting.js +++ b/web/src/Setting.js @@ -1164,7 +1164,7 @@ export function getLoginLink(application) { let url; if (application === null) { url = null; - } else if (!isPasswordEnabled(application) && window.location.pathname.includes("/auto-signup/oauth/authorize")) { + } else if (window.location.pathname.includes("/auto-signup/oauth/authorize")) { url = window.location.href.replace("/auto-signup/oauth/authorize", "/login/oauth/authorize"); } else if (authConfig.appName === application.name) { url = "/login"; @@ -1176,11 +1176,6 @@ export function getLoginLink(application) { return url; } -export function renderLoginLink(application, text) { - const url = getLoginLink(application); - return renderLink(url, text, null); -} - export function redirectToLoginPage(application, history) { const loginLink = getLoginLink(application); if (loginLink.startsWith("http://") || loginLink.startsWith("https://")) { @@ -1205,7 +1200,7 @@ function renderLink(url, text, onClick) { ); } else if (url.startsWith("http")) { return ( - { + { if (onClick !== null) { onClick(); } @@ -1220,7 +1215,7 @@ export function renderSignupLink(application, text) { let url; if (application === null) { url = null; - } else if (!isPasswordEnabled(application) && window.location.pathname.includes("/login/oauth/authorize")) { + } else if (window.location.pathname.includes("/login/oauth/authorize")) { url = window.location.href.replace("/login/oauth/authorize", "/auto-signup/oauth/authorize"); } else if (authConfig.appName === application.name) { url = "/signup";