From 843151c0dce27f3dce8b4e8034441a977567789d Mon Sep 17 00:00:00 2001 From: Manoj Kumar Date: Wed, 13 May 2026 11:31:36 +0530 Subject: [PATCH 1/4] avoid rejecting user login if listLdapConfiguration is not allowed --- ui/src/store/modules/user.js | 5 ++--- ui/src/views/AutogenView.vue | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js index 21cd603e378c..563f93ec9aa3 100644 --- a/ui/src/store/modules/user.js +++ b/ui/src/store/modules/user.js @@ -422,8 +422,7 @@ const user = { api('listLdapConfigurations').then(response => { const ldapEnable = (response.ldapconfigurationresponse.count > 0) commit('SET_LDAP', ldapEnable) - }).catch(error => { - reject(error) + }).catch(ignored => { }) api('cloudianIsEnabled').then(response => { @@ -551,7 +550,7 @@ const user = { } }) }, - UpdateConfiguration ({ commit }) { + UpdateLdapConfigurationFlag ({ commit }) { return new Promise((resolve, reject) => { api('listLdapConfigurations').then(response => { const ldapEnable = (response.ldapconfigurationresponse.count > 0) diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 325df769deef..d2d388897397 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -1600,7 +1600,7 @@ export default { } } if (['addLdapConfiguration', 'deleteLdapConfiguration'].includes(action.api)) { - this.$store.dispatch('UpdateConfiguration') + this.$store.dispatch('UpdateLdapConfigurationFlag') } if (jobId) { eventBus.emit('update-resource-state', { selectedItems: this.selectedItems, resource, state: 'InProgress', jobid: jobId }) 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 2/4] 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 From a9fecd6d0886de1c49b8cfa4eaac2ebf96c835ad Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Thu, 14 May 2026 17:49:07 +0200 Subject: [PATCH 3/4] Update ui/src/store/modules/user.js Co-authored-by: Suresh Kumar Anaparti --- ui/src/store/modules/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js index 85266c504013..2b79b0c60554 100644 --- a/ui/src/store/modules/user.js +++ b/ui/src/store/modules/user.js @@ -554,7 +554,7 @@ const user = { UpdateLdapConfigurationFlag ({ commit }) { return new Promise((resolve, reject) => { api('listLdapConfigurations').then(response => { - const ldapEnable = ((response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count) || 0) > 0 + const ldapEnable = (response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count > 0) commit('SET_LDAP', ldapEnable) resolve(ldapEnable) }).catch(error => { From 4181f746ebfa7e20464252256c64483c3aa25869 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Thu, 14 May 2026 17:49:24 +0200 Subject: [PATCH 4/4] Update ui/src/store/modules/user.js Co-authored-by: Suresh Kumar Anaparti --- ui/src/store/modules/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js index 2b79b0c60554..0cb4cf97c81c 100644 --- a/ui/src/store/modules/user.js +++ b/ui/src/store/modules/user.js @@ -420,7 +420,7 @@ const user = { }) api('listLdapConfigurations').then(response => { - const ldapEnable = ((response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count) || 0) > 0 + const ldapEnable = (response && response.ldapconfigurationresponse && response.ldapconfigurationresponse.count > 0) commit('SET_LDAP', ldapEnable) }).catch(ignored => { commit('SET_LDAP', false)