From d9b85efc15e8e5c2d71b41495c9060c66f624edd Mon Sep 17 00:00:00 2001
From: andrijapanicsb <45762285+andrijapanicsb@users.noreply.github.com>
Date: Thu, 14 May 2026 14:57:23 +0200
Subject: [PATCH] Harden LDAP config discovery during login

---
 ui/src/store/modules/user.js | 12 +++++++-----
 ui/src/utils/request.js      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index 563f93ec9aa3..85266c504013 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -219,7 +219,7 @@ const user = {
           commit('SET_PROJECT', {})
           commit('SET_HEADER_NOTICES', [])
           commit('SET_FEATURES', {})
-          commit('SET_LDAP', {})
+          commit('SET_LDAP', false)
           commit('SET_CLOUDIAN', {})
           commit('SET_DOMAIN_STORE', {})
           commit('SET_LOGOUT_FLAG', false)
@@ -268,7 +268,7 @@ const user = {
           commit('SET_PROJECT', {})
           commit('SET_HEADER_NOTICES', [])
           commit('SET_FEATURES', {})
-          commit('SET_LDAP', {})
+          commit('SET_LDAP', false)
           commit('SET_CLOUDIAN', {})
           commit('SET_DOMAIN_STORE', {})
           commit('SET_LOGOUT_FLAG', false)
@@ -420,9 +420,10 @@ const user = {
         })
 
         api('listLdapConfigurations').then(response => {
-          const ldapEnable = (response.ldapconfigurationresponse.count > 0)
+          const ldapEnable = ((response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count) || 0) > 0
           commit('SET_LDAP', ldapEnable)
         }).catch(ignored => {
+          commit('SET_LDAP', false)
         })
 
         api('cloudianIsEnabled').then(response => {
@@ -447,7 +448,7 @@ const user = {
         commit('SET_PROJECT', {})
         commit('SET_HEADER_NOTICES', [])
         commit('SET_FEATURES', {})
-        commit('SET_LDAP', {})
+        commit('SET_LDAP', false)
         commit('SET_CLOUDIAN', {})
         commit('RESET_THEME')
         commit('SET_DOMAIN_STORE', {})
@@ -553,8 +554,9 @@ const user = {
     UpdateLdapConfigurationFlag ({ commit }) {
       return new Promise((resolve, reject) => {
         api('listLdapConfigurations').then(response => {
-          const ldapEnable = (response.ldapconfigurationresponse.count > 0)
+          const ldapEnable = ((response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count) || 0) > 0
           commit('SET_LDAP', ldapEnable)
+          resolve(ldapEnable)
         }).catch(error => {
           reject(error)
         })
diff --git a/ui/src/utils/request.js b/ui/src/utils/request.js
index 7c757691f2b3..30d81af753e1 100644
--- a/ui/src/utils/request.js
+++ b/ui/src/utils/request.js
@@ -51,7 +51,7 @@ const err = (error) => {
       })
     }
     if (response.status === 401) {
-      if (response.config && response.config.params && ['forgotPassword', 'listIdps', 'cloudianIsEnabled'].includes(response.config.params.command)) {
+      if (response.config && response.config.params && ['forgotPassword', 'listIdps', 'cloudianIsEnabled', 'listLdapConfigurations'].includes(response.config.params.command)) {
         return
       }
       const originalPath = router.currentRoute.value.fullPath