Skip to content

UI: Fixes issue where backup tab was selected if they included default type#30805

Merged
hellobontempo merged 2 commits intomainfrom
VAULT-36713/render-default-view-if-backup-types-include-default
Jun 2, 2025
Merged

UI: Fixes issue where backup tab was selected if they included default type#30805
hellobontempo merged 2 commits intomainfrom
VAULT-36713/render-default-view-if-backup-types-include-default

Conversation

@hellobontempo
Copy link
Copy Markdown
Contributor

@hellobontempo hellobontempo commented Jun 2, 2025

Description

No changelog because follow-on to #30700

Fixes a bug where the form rendered the alternate view (backup tabs) if backup_auth_types included default_auth_type.

#  see `token` is a backup and the default. 

vault write sys/config/ui/login/default-auth/root-rule \
 default_auth_type=token \
 backup_auth_types=userpass \
 backup_auth_types=oidc \
 backup_auth_types=token \
 disable_inheritance=false \
 namespace=""

Now the form properly renders the default (initial) view and does not pre-toggle the form.

initial view before fix

Screenshot 2025-06-02 at 9 53 26 AM

initial view after fix

Screenshot 2025-06-02 at 9 53 01 AM

TODO only if you're a HashiCorp employee

  • Backport Labels: If this fix needs to be backported, use the appropriate backport/ label that matches the desired release branch. Note that in the CE repo, the latest release branch will look like backport/x.x.x, but older release branches will be backport/ent/x.x.x+ent.
    • LTS: If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@hellobontempo hellobontempo added this to the 1.20.0-rc milestone Jun 2, 2025
@hellobontempo hellobontempo requested a review from a team as a code owner June 2, 2025 16:53
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jun 2, 2025
// In rare cases, pre-toggle the form to the fallback dropdown if the selected method is not in the alternate view.
// This could happen if tabs render for visible mounts and the "with" query param references a type that isn't a tab.
// Or auth type is preset from canceled MFA or local storage and is not in the default view.
const showAlternate = (authIsNotDefaultTab && hasAlternateView) || authIsAlternateTab;
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

essentially the fix was to update this conditional to:

(authIsNotDefaultTab && hasAlternateView) || (authIsAlternateTab && authIsNotDefaultTab);

So I consolidated and simplified the logic by pulling out authIsNotDefaultTab

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jun 2, 2025

Build Results:
All builds succeeded! ✅

.dom(GENERAL.emptyStateMessage)
.hasText(
'Login rules can be used to select default and back up login methods and customize which methods display in the web UI login form. Available to be created via the CLI or HTTP API.'
'Login settings can be used to customize which methods display in the web UI login form by setting a default and back up login methods. Available to be created via the CLI or HTTP API.'
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jun 2, 2025

CI Results:
All Go tests succeeded! ✅

@hellobontempo hellobontempo changed the title UI: Fixes issue where backup tab was selected if backups include default … UI: Fixes issue where backup tab was selected when backups included default type Jun 2, 2025
@hellobontempo hellobontempo changed the title UI: Fixes issue where backup tab was selected when backups included default type UI: Fixes issue where backup tab was selected if they included default type Jun 2, 2025
@hellobontempo
Copy link
Copy Markdown
Contributor Author

Screenshot 2025-06-02 at 10 08 47 AM

@hellobontempo hellobontempo merged commit dc0e85b into main Jun 2, 2025
32 of 33 checks passed
@hellobontempo hellobontempo deleted the VAULT-36713/render-default-view-if-backup-types-include-default branch June 2, 2025 17:29
drivera258 pushed a commit that referenced this pull request Jun 4, 2025
…t type (#30805)

* Fixes issue where backup tab was selected if backups include default type

* fix enterprise empty state assertion
drivera258 pushed a commit that referenced this pull request Jun 11, 2025
…t type (#30805)

* Fixes issue where backup tab was selected if backups include default type

* fix enterprise empty state assertion
Erfankam pushed a commit to Erfankam/vault that referenced this pull request Sep 1, 2025
…t type (hashicorp#30805)

* Fixes issue where backup tab was selected if backups include default type

* fix enterprise empty state assertion
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants