Remove required authEndpoint input

rancher · Jun 24, 2024 · 0937ca5 · 0937ca5
1 parent d95869d
commit 0937ca5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/shell/edit/auth/oidc.vue b/shell/edit/auth/oidc.vue
@@ -81,7 +81,7 @@ export default {
 
         return !!(clientId && clientSecret && url && realm && isValidScope);
       } else {
-        const { rancherUrl, issuer, authEndpoint } = this.model;
+        const { rancherUrl, issuer } = this.model;
 
         return !!(clientId && clientSecret && rancherUrl && issuer && isValidScope);
       }
@@ -115,9 +115,9 @@ export default {
     },
 
     editConfig(neu, old) {
-      // Cover use case where user edits existing oidc (oidcUrls aren't persisted, so if we have issuer & authEndpoint set custom endpoints to true)
+      // Cover use case where user edits existing oidc (oidcUrls aren't persisted, so if we have issuer set custom endpoints to true)
       if (!old && neu) {
-        this.customEndpoint.value = (!this.oidcUrls.url && !this.oidcUrls.authEndpoint) && (!!this.model.issuer && !!this.model.authEndpoint);
+        this.customEndpoint.value = !this.oidcUrls.url && !!this.model.issuer;
       }
     }
   },
@@ -131,7 +131,6 @@ export default {
       const realmsPath = this.model.id === 'keycloakoidc' ? 'auth/realms' : 'realms';
 
       this.model.issuer = `${ url }/${ realmsPath }/${ this.oidcUrls.realm || '' }`;
-      this.model.authEndpoint = '';
     },
 
     updateScope() {

diff --git a/shell/store/auth.js b/shell/store/auth.js
@@ -297,30 +297,23 @@ export const actions = {
       if (!!driver?.actions?.testAndEnable) {
         const finalRedirectUrl = returnTo({ config: provider }, this);
 
-        console.log('### testAndEnable finalRedirectUrl: ', provider, finalRedirectUrl);
-
         const res = await driver.doAction('testAndEnable', { finalRedirectUrl });
 
         const { idpRedirectUrl } = res;
 
         return openAuthPopup(idpRedirectUrl, provider);
       } else {
       // github, google, azuread, oidc
-        console.log('## test body: ', JSON.parse(JSON.stringify(body)));
         const res = await driver.doAction('configureTest', body);
         const { redirectUrl } = res;
 
-        console.log('### test res: ', res);
-
         const url = await dispatch('redirectTo', {
           provider,
           redirectUrl,
           test:     true,
           redirect: false
         });
 
-        console.log('### test url', url);
-
         return openAuthPopup(url, provider);
       }
     } catch (err) {