Switch context for generic oidc provider to the genericOIDCConfig type (

rancher#11326)
rak-phillip · Jul 2, 2024 · bd70d4c · bd70d4c
1 parent ccc602c
commit bd70d4c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
@@ -572,7 +572,7 @@ authConfig:
         title: Are you sure? This update is irreversible.
         body: '<p><b>You may need to make some additional changes</b>. Please ensure the Azure AD app has the Directory.Read.All <b>Application</b> permission added to Microsoft Graph.<br> If any endpoints were customized while configuring Azure AD authentication in Rancher, they will not be automatically updated. </p>'
   oidc:
-    oidc: Configure an OIDC account
+    genericoidc: Configure an OIDC account
     keycloakoidc: Configure a Keycloak OIDC account
     rancherUrl: Rancher URL
     clientId: Client ID
@@ -6582,7 +6582,7 @@ model:
       okta: Okta
       freeipa: FreeIPA
       googleoauth: Google
-      oidc: Generic OIDC
+      genericoidc: Generic OIDC
       keycloakoidc: Keycloak
 
   cluster:

diff --git a/shell/config/product/auth.js b/shell/config/product/auth.js
@@ -174,7 +174,7 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/googleoauth`, 'auth/googleoauth');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/azuread`, 'auth/azuread');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
-  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/oidc`, 'auth/oidc');
+  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
 
   basicType([
     'config',

diff --git a/shell/edit/auth/__tests__/oidc.test.ts b/shell/edit/auth/__tests__/oidc.test.ts
@@ -19,14 +19,14 @@ const validScope = 'openid profile email';
 
 const mockModel = {
   enabled:      false,
-  id:           'oidc',
+  id:           'genericoidc',
   rancherUrl:   validRancherUrl,
   issuer:       validIssuer,
   authEndpoint: validAuthEndpoint,
   scope:        validScope,
   clientId:     validClientId,
   clientSecret: validClientSecret,
-  type:         'oidcConfig',
+  type:         'genericOIDCConfig',
 };
 
 const mockedAuthConfigMixin = {

diff --git a/shell/mixins/auth-config.js b/shell/mixins/auth-config.js
@@ -273,7 +273,7 @@ export default {
 
         // KeyCloakOIDCConfig --> OIDCConfig
         set(this.model, 'rancherUrl', `${ serverUrl }/verify-auth`);
-        set(this.model, 'scope', BASE_SCOPES.oidc[0]);
+        set(this.model, 'scope', this.model.id === 'keycloakoidc' ? BASE_SCOPES.keycloakoidc[0] : BASE_SCOPES.genericoidc[0]);
         break;
       }
 

diff --git a/shell/models/management.cattle.io.authconfig.js b/shell/models/management.cattle.io.authconfig.js
@@ -15,10 +15,10 @@ export const configType = {
   local:           '',
   github:          'oauth',
   keycloakoidc:    'oidc',
-  oidc:            'oidc',
+  genericoidc:     'oidc',
 };
 
-const imageOverrides = { keycloakoidc: 'keycloak', oidc: 'openid' };
+const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };
 
 export default class AuthConfig extends SteveModel {
   get _availableActions() {

diff --git a/shell/store/auth.js b/shell/store/auth.js
@@ -13,7 +13,7 @@ export const BASE_SCOPES = {
   googleoauth:  ['openid profile email'],
   azuread:      [],
   keycloakoidc: ['openid profile email'],
-  oidc:         ['openid profile email'],
+  genericoidc:  ['openid profile email'],
 };
 
 const KEY = 'rc_nonce';

diff --git a/shell/utils/auth.js b/shell/utils/auth.js
@@ -71,7 +71,7 @@ export const authProvidersInfo = async(store) => {
   const nonLocal = rows.filter((x) => x.name !== 'local');
   const enabled = nonLocal.filter((x) => x.enabled === true );
 
-  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'genericoidc');
+  const supportedNonLocal = nonLocal.filter((x) => x.id !== 'oidc');
 
   const enabledLocation = enabled.length === 1 ? {
     name:   'c-cluster-auth-config-id',