From ea7e77cb4e78bfd3c2c27a519a7b2273663c64a4 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 7 Apr 2021 10:46:06 -0600 Subject: [PATCH] Bug Fix: OIDC with hcp flag (#11283) * add conditional * add changelog --- changelog/11283.txt | 3 +++ ui/app/components/auth-jwt.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelog/11283.txt diff --git a/changelog/11283.txt b/changelog/11283.txt new file mode 100644 index 000000000..14b33bff8 --- /dev/null +++ b/changelog/11283.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: Fix footer URL linking to the correct version changelog. +``` diff --git a/ui/app/components/auth-jwt.js b/ui/app/components/auth-jwt.js index d036fc9f3..0dd15a90e 100644 --- a/ui/app/components/auth-jwt.js +++ b/ui/app/components/auth-jwt.js @@ -16,6 +16,7 @@ export { ERROR_WINDOW_CLOSED, ERROR_MISSING_PARAMS, ERROR_JWT_LOGIN }; export default Component.extend({ store: service(), + featureFlagService: service('featureFlag'), selectedAuthPath: null, selectedAuthType: null, roleName: null, @@ -131,7 +132,7 @@ export default Component.extend({ // The namespace can be either be passed as a query paramter, or be embedded // in the state param in the format `,ns=`. So if // `namespace` is empty, check for namespace in state as well. - if (namespace === '') { + if (namespace === '' || this.featureFlagService.managedNamespaceRoot) { let i = state.indexOf(',ns='); if (i >= 0) { // ",ns=" is 4 characters