fix(ui):ArgoCD Login Link Displays Layouts Before Login Page by aali309 · Pull Request #25463 · argoproj/argo-cd

aali309 · 2025-12-01T17:47:35Z

When the ArgoCD login link is launched, the initial view does not directly display the login page. Instead, it shows various layouts, ArgoCD versions, and tabs before finally loading the login page. This behaviour may lead to confusion for users expecting an immediate login prompt.

Checklist:

bunnyshell · 2025-12-01T17:47:43Z

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

🚀 /bns:deploy to deploy the environment

ui/src/app/shared/components/protected-route/protected-route.tsx

anandf

Thanks @aali309 for this PR. Provided few minor comments.

aali309 · 2025-12-02T23:42:48Z

Thanks @aali309 for this PR. Provided few minor comments.

Thnx @anandf

anandf

LGTM

ui/src/app/shared/components/protected-route/protected-route.tsx

keithchong · 2026-01-14T19:49:19Z

ui/src/app/app.tsx

-        if (iss && iss !== 'argocd') {
-            return ((authSettings.dexConfig && authSettings.dexConfig.connectors) || []).length > 0 || authSettings.oidcConfig;
+        // Combine both async calls into one Promise.all for better performance
+        const [userInfo, authSettings] = await Promise.all([services.users.get(), services.authService.settings()]);


This change is not part of the actual fix, right (on its own that is)? Also there seems to be duplicate code here and in the new protected-route component, it can apply the same logic?

reverted this and extracted the code into shared function that both files can reuse.

keithchong · 2026-04-07T15:14:17Z

ui/src/app/shared/components/protected-route/protected-route.tsx

+        // Check SSO configuration if user is not logged in
+        const hasSSO = isSSOConfigured(userInfo, authSettings);
+
+        return {loggedIn: false, isSSO: hasSSO};


If SSO is not configured, then should we be returning loggedIn as false?

Yes. If they’re not logged in, we always use loggedIn: false. isSSO only picks SSO redirect vs the normal login page. It doesn’t mean they’re logged in. So when SSO isn’t set up, we still return loggedIn: false and isSSO: false.

keithchong · 2026-04-07T15:34:55Z

ui/src/app/login/components/login.tsx

            appContext.navigation.goto('.', {sso_error: null});
+
            await services.users.login(username, password);
-            setLoginInProgress(false);


Should we ensure setLogInProgress is set to false below, in a finally ?

keithchong · 2026-04-07T16:30:57Z

ui/src/app/login/components/login.tsx

-        } catch (e) {
-            setLoginError(e.response.body.error);
+
+            window.location.replace(basehref + redirectPath);


Could you use appContext.navigation.goto here instead?

Signed-off-by: Atif Ali <atali@redhat.com>

…uses Signed-off-by: Atif Ali <atali@redhat.com>

keithchong · 2026-04-07T19:07:03Z

ui/src/app/shared/components/protected-route/protected-route.tsx

+                return (
+                    <DataLoader input={cacheKey} load={checkAuthState}>
+                        {({loggedIn, isSSO}) => {
+                            if (loggedIn) {


Regarding my comment at line 31, or maybe the change should be here instead.

If SSO is not enabled, then loggedIn is false, so we always present the login page. Should it be instead, if and only if SSO is enabled, then we prompt to log in if loggedIn is false?

I think this would be wrong? Because even if SSO is not enabled, users still must see /login i.e (local accounts).
The flow currently is:
When loggedIn is false, we always send users to a login flow. isSSO only chooses how: if SSO is set up for the redirect path we use /auth/login, otherwise we Redirect to /login. Local-only installs still need the /login page, so we can’t gate “prompt for login” on SSO being enabled only.

i.e we should not be skipping login because SSO is not enabled.

aali309 force-pushed the loginUI branch from 2e9f248 to 19dad2a Compare December 1, 2025 20:07

aali309 marked this pull request as ready for review December 1, 2025 20:07

aali309 requested a review from a team as a code owner December 1, 2025 20:07

anandf reviewed Dec 2, 2025

View reviewed changes

ui/src/app/shared/components/protected-route/protected-route.tsx Outdated Show resolved Hide resolved

anandf reviewed Dec 2, 2025

View reviewed changes

ui/src/app/shared/components/protected-route/protected-route.tsx Outdated Show resolved Hide resolved

anandf reviewed Dec 2, 2025

View reviewed changes

ui/src/app/shared/components/protected-route/protected-route.tsx Show resolved Hide resolved

anandf reviewed Dec 2, 2025

View reviewed changes

aali309 force-pushed the loginUI branch 2 times, most recently from 0495ce5 to e0aae7c Compare December 2, 2025 23:41

aali309 requested a review from anandf December 2, 2025 23:42

aali309 force-pushed the loginUI branch from e0aae7c to 83abba2 Compare December 4, 2025 00:26

anandf approved these changes Dec 11, 2025

View reviewed changes

aali309 force-pushed the loginUI branch from 83abba2 to 41e5616 Compare December 11, 2025 19:03

keithchong requested changes Jan 14, 2026

View reviewed changes

aali309 force-pushed the loginUI branch 2 times, most recently from 642c3c4 to fd880f6 Compare January 15, 2026 22:22

aali309 force-pushed the loginUI branch from be3779e to dcc8e65 Compare January 27, 2026 21:15

aali309 force-pushed the loginUI branch 2 times, most recently from 7452ce5 to 05da4de Compare March 30, 2026 15:57

aali309 force-pushed the loginUI branch from 05da4de to b5fee89 Compare April 7, 2026 12:40

keithchong requested changes Apr 7, 2026

View reviewed changes

keithchong reviewed Apr 7, 2026

View reviewed changes

keithchong requested changes Apr 7, 2026

View reviewed changes

aali309 force-pushed the loginUI branch from 93cfe66 to ff38836 Compare April 7, 2026 16:16

keithchong requested changes Apr 7, 2026

View reviewed changes

aali309 added 3 commits April 7, 2026 14:45

fix(ui):ArgoCD Login Link Displays Layouts Before Login Page

8f649df

Signed-off-by: Atif Ali <atali@redhat.com>

added unit test && combine async calls && fix error handling

06fb393

Signed-off-by: Atif Ali <atali@redhat.com>

cleanup

1430c3f

Signed-off-by: Atif Ali <atali@redhat.com>

aali309 added 4 commits April 7, 2026 14:46

apply Keiths's review comments

27b60d3

Signed-off-by: Atif Ali <atali@redhat.com>

resolve test failure

85ac432

Signed-off-by: Atif Ali <atali@redhat.com>

set setLoginInProgress to false in finally

35143b9

Signed-off-by: Atif Ali <atali@redhat.com>

update URL through the same React Router history the rest of the app …

7ad7ae7

…uses Signed-off-by: Atif Ali <atali@redhat.com>

aali309 force-pushed the loginUI branch from 30fc5c4 to 7ad7ae7 Compare April 7, 2026 18:46

keithchong requested changes Apr 7, 2026

View reviewed changes

Conversation

aali309 commented Dec 1, 2025

Uh oh!

bunnyshell bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

❌ Preview Environment deleted from Bunnyshell

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anandf left a comment

Choose a reason for hiding this comment

Uh oh!

aali309 commented Dec 2, 2025

Uh oh!

anandf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

keithchong Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

bunnyshell bot commented Dec 1, 2025 •

edited

Loading

keithchong Jan 14, 2026 •

edited

Loading