Merge pull request #48 from k2maan/launchpad/#44

Fixed: SAML redirection error in case of unconfigured OMS (checkLoginOptions not available on the instance) (#44)
hotwax · Sep 13, 2023 · d1bd240 · d1bd240
2 parents dfa1761 + 7f57034
commit d1bd240
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/views/Login.vue b/src/views/Login.vue
@@ -206,22 +206,25 @@ export default defineComponent({
 
       // run SAML login flow if login options are configured for the OMS
       await this.fetchLoginOptions()
-      if (this.loginOption.loginAuthType !== 'BASIC') {
+
+      // checking loginOption.length to know if fetchLoginOptions API returned data
+      // as toggleOmsInput is called twice without this check, from fetchLoginOptions and
+      // through setOms (here) again
+      if (Object.keys(this.loginOption).length && this.loginOption.loginAuthType !== 'BASIC') {
         window.location.href = `${this.loginOption.loginAuthUrl}?relaystate=${window.location.origin}/login` // passing launchpad/login URL
       } else {
         this.toggleOmsInput()
       }
     },
     async fetchLoginOptions() {
+      this.loginOption = {}
       try {
         const resp = await UserService.checkLoginOptions()
         if (!hasError(resp)) {
           this.loginOption = resp.data
         }
       } catch (error) {
         console.error(error)
-        // Fallback TODO Remove this
-        this.toggleOmsInput()
       }
     },
     async login() {