Merge pull request #11767 from aalves08/11766-saml-slo-fix

Fix -> Vue3: SAML SLO support - feature is broken
rancher · Sep 3, 2024 · 7a89118 · 7a89118
2 parents dd71125 + 647eb93
commit 7a89118
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/pkg/rancher-components/src/components/Form/TextArea/TextAreaAutoGrow.vue b/pkg/rancher-components/src/components/Form/TextArea/TextAreaAutoGrow.vue
@@ -172,6 +172,7 @@ export default defineComponent({
 <template>
   <textarea
     ref="ta"
+    :value="value"
     :data-testid="$attrs['data-testid'] ? $attrs['data-testid'] : 'text-area-auto-grow'"
     :disabled="isDisabled"
     :style="style"

diff --git a/shell/components/nav/Header.vue b/shell/components/nav/Header.vue
@@ -735,8 +735,18 @@ export default {
                     <a :href="href">{{ t('nav.userMenu.accountAndKeys', {}, true) }}</a>
                   </li>
                 </router-link>
+                <!-- SLO modal -->
+                <li
+                  v-if="authEnabled && shouldShowSloLogoutModal"
+                  class="user-menu-item no-link"
+                  @click="showSloModal"
+                  @keypress.enter="showSloModal"
+                >
+                  <span>{{ t('nav.userMenu.logOut') }}</span>
+                </li>
+                <!-- logout -->
                 <router-link
-                  v-if="authEnabled"
+                  v-else-if="authEnabled"
                   v-slot="{ href, navigate }"
                   custom
                   :to="generateLogoutRoute"
@@ -1139,6 +1149,7 @@ export default {
       display: flex;
       justify-content: space-between;
       padding: 10px;
+      color: var(--link);
     }
 
     div.menu-separator {

diff --git a/shell/edit/auth/saml.vue b/shell/edit/auth/saml.vue
@@ -125,19 +125,24 @@ export default {
       switch (neu) {
       case SLO_OPTION_VALUES.rancher:
         this.model.logoutAllEnabled = false;
-        this.$set(this.model, 'logoutAllForced', false);
+        this.model.logoutAllForced = false;
         break;
       case SLO_OPTION_VALUES.all:
-        this.$set(this.model, 'logoutAllEnabled', true);
-        this.$set(this.model, 'logoutAllForced', true);
+        this.model.logoutAllEnabled = true;
+        this.model.logoutAllForced = true;
         break;
       case SLO_OPTION_VALUES.both:
-        this.$set(this.model, 'logoutAllEnabled', true);
-        this.$set(this.model, 'logoutAllForced', false);
+        this.model.logoutAllEnabled = true;
+        this.model.logoutAllForced = false;
         break;
       }
     }
-  }
+  },
+  methods: {
+    onSelected(val, key) {
+      this.model[key] = val;
+    }
+  },
 };
 </script>
 
@@ -309,7 +314,7 @@ export default {
               class="role-tertiary add mt-5"
               :label="t('generic.readFromFile')"
               :mode="mode"
-              @selected="$set(model, 'spKey', $event)"
+              @selected="onSelected($event, 'spKey')"
             />
           </div>
           <div class="col span-4">
@@ -325,7 +330,7 @@ export default {
               class="role-tertiary add mt-5"
               :label="t('generic.readFromFile')"
               :mode="mode"
-              @selected="$set(model, 'spCert', $event)"
+              @selected="onSelected($event, 'spCert')"
             />
           </div>
           <div class="col span-4">
@@ -341,7 +346,7 @@ export default {
               class="role-tertiary add mt-5"
               :label="t('generic.readFromFile')"
               :mode="mode"
-              @selected="$set(model, 'idpMetadataContent', $event)"
+              @selected="onSelected($event, 'idpMetadataContent')"
             />
           </div>
         </div>
@@ -359,7 +364,7 @@ export default {
           <div class="row">
             <div class="col span-4">
               <RadioGroup
-                v-model="sloType"
+                v-model:value="sloType"
                 :mode="mode"
                 :options="sloOptions"
                 :disabled="!model.logoutAllSupported"