stricter check on LDAP configuration accessability

Author: DaanHoogland

ui/src/store/modules/user.js

@@ -477,6 +477,9 @@ const user = {
           commit('SET_NAME', result.firstname + ' ' + result.lastname)
           commit('SET_AVATAR', result.icon?.base64image || '')
           store.dispatch('SetCsLatestVersion', result.rolename)
+          store.dispatch('UpdateConfiguration').catch(error => {
+            reject(error)
+          })
         }).catch(error => {
           reject(error)
         })
@@ -490,13 +493,6 @@ const user = {
         }).catch(ignored => {
         })
 
-        getAPI('listLdapConfigurations').then(response => {
-          const ldapEnable = (response.ldapconfigurationresponse.count > 0)
-          commit('SET_LDAP', ldapEnable)
-        }).catch(error => {
-          reject(error)
-        })
-
         getAPI('cloudianIsEnabled').then(response => {
           const cloudian = response.cloudianisenabledresponse.cloudianisenabled || {}
           commit('SET_CLOUDIAN', cloudian)
@@ -626,13 +622,15 @@ const user = {
       })
     },
     UpdateConfiguration ({ commit }) {
-      return new Promise((resolve, reject) => {
-        getAPI('listLdapConfigurations').then(response => {
-          const ldapEnable = (response.ldapconfigurationresponse.count > 0)
-          commit('SET_LDAP', ldapEnable)
-        }).catch(error => {
-          reject(error)
-        })
+      // Root admins see LDAP as enabled if any configuration exists; everyone else
+      // only when a global configuration or one linked to their own domain exists
+      const userInfo = store.getters.userInfo
+      const queries = userInfo.roletype === 'Admin'
+        ? [{ listall: true }]
+        : [{}, { domainid: userInfo.domainid }]
+      return Promise.all(queries.map(params => getAPI('listLdapConfigurations', params))).then(responses => {
+        const ldapEnable = responses.some(response => response.ldapconfigurationresponse.count > 0)
+        commit('SET_LDAP', ldapEnable)
       })
     },
     SetDomainStore ({ commit }, domainStore) {