Skip to content

fix: restore LDAP wizard progression and initial user filters #64205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvanhorn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: restore LDAP wizard progression and initial user filters #64205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 49 additions & 18 deletions apps/user_ldap/src/components/SettingsTabs/UsersTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ const props = defineProps<{ configId: string }>()
const ldapConfigsStore = useLDAPConfigsStore()
const { ldapConfigs } = storeToRefs(ldapConfigsStore)
const ldapConfigProxy = computed(() => ldapConfigsStore.getConfigProxy(props.configId, {
ldapUserFilterObjectclass: reloadFilters,
ldapUserFilterGroups: reloadFilters,
ldapUserFilterObjectclass: () => reloadFilters(),
ldapUserFilterGroups: () => reloadFilters(),
}))

const usersCount = ref<number | undefined>(undefined)
Expand All @@ -98,29 +98,60 @@ onBeforeMount(init)
* Initialize user filter options
*/
async function init() {
const response1 = await callWizard('determineUserObjectClasses', props.configId)
userObjectClasses.value = response1.options?.ldap_userfilter_objectclass ?? []
// Not using ldapConfig to avoid triggering the save logic.
ldapConfigs.value[props.configId]!.ldapUserFilterObjectclass = (response1.changes?.ldap_userfilter_objectclass as string[] | undefined)?.join(';') ?? ''

const response2 = await callWizard('determineGroupsForUsers', props.configId)
userGroups.value = response2.options?.ldap_userfilter_groups ?? []
// Not using ldapConfig to avoid triggering the save logic.
ldapConfigs.value[props.configId]!.ldapUserFilterGroups = (response2.changes?.ldap_userfilter_groups as string[] | undefined)?.join(';') ?? ''
try {
const response1 = await callWizard('determineUserObjectClasses', props.configId)
userObjectClasses.value = response1.options?.ldap_userfilter_objectclass ?? []
const objectClasses = normalizeSelection(response1.changes?.ldap_userfilter_objectclass)
if (objectClasses !== undefined) {
// Wizard discoveries are already persisted on the server.
ldapConfigs.value[props.configId]!.ldapUserFilterObjectclass = objectClasses
}

await reloadFilters(true)

const response2 = await callWizard('determineGroupsForUsers', props.configId)
userGroups.value = response2.options?.ldap_userfilter_groups ?? []
const groups = normalizeSelection(response2.changes?.ldap_userfilter_groups)
if (groups !== undefined) {
ldapConfigs.value[props.configId]!.ldapUserFilterGroups = groups
}
} catch {
// callWizard displays the error; keep discoveries from completed steps.
}
}

/**
* Normalize wizard selections without replacing missing changes.
*
* @param value - Selection returned by the wizard
*/
function normalizeSelection(value: unknown): string | undefined {
if (typeof value === 'string') {
return value
}
if (Array.isArray(value) && value.every((item) => typeof item === 'string')) {
return value.join(';')
}
}

/**
* Reload filters
*
* @param initialOnly - Preserve existing filters during initialization
*/
async function reloadFilters() {
async function reloadFilters(initialOnly = false) {
if (ldapConfigProxy.value.ldapUserFilterMode === '0') {
const response1 = await callWizard('getUserListFilter', props.configId)
// Not using ldapConfig to avoid triggering the save logic.
ldapConfigs.value[props.configId]!.ldapUserFilter = (response1.changes?.ldap_userlist_filter as string | undefined) ?? ''
if (!initialOnly || ldapConfigProxy.value.ldapUserFilter === '') {
const response1 = await callWizard('getUserListFilter', props.configId)
// Not using ldapConfig to avoid triggering the save logic.
ldapConfigs.value[props.configId]!.ldapUserFilter = (response1.changes?.ldap_userlist_filter as string | undefined) ?? ''
}

const response2 = await callWizard('getUserLoginFilter', props.configId)
// Not using ldapConfig to avoid triggering the save logic.
ldapConfigs.value[props.configId]!.ldapLoginFilter = (response2.changes?.ldap_login_filter as string | undefined) ?? ''
if (ldapConfigProxy.value.ldapLoginFilterMode === '0' && (!initialOnly || ldapConfigProxy.value.ldapLoginFilter === '')) {
const response2 = await callWizard('getUserLoginFilter', props.configId)
// Not using ldapConfig to avoid triggering the save logic.
ldapConfigs.value[props.configId]!.ldapLoginFilter = (response2.changes?.ldap_login_filter as string | undefined) ?? ''
}
}
}

Expand Down
16 changes: 14 additions & 2 deletions apps/user_ldap/src/views/LDAPSettingsApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,16 @@
<ExpertTab v-else-if="selectedTab === 'expert'" :configId="selectedConfigId" />
<AdvancedTab v-else-if="selectedTab === 'advanced'" :configId="selectedConfigId" />

<WizardControls class="ldap-wizard__controls" :configId="selectedConfigId" />
<div class="ldap-wizard__actions">
<WizardControls :configId="selectedConfigId" />
<NcButton
v-if="selectedTab === 'server'"
type="button"
:disabled="!selectedConfigHasServerInfo"
@click="selectedTab = 'users'">
{{ t('user_ldap', 'Continue') }}
</NcButton>
</div>
</div>

<div class="ldap-wizard__clear-mapping">
Expand Down Expand Up @@ -177,7 +186,10 @@ async function requestClearMapping(subject: 'user' | 'group') {
padding: 0 16px 16px 16px;
}

&__controls {
&__actions {
display: flex;
align-items: center;
gap: 16px;
margin-top: 16px;
}

Expand Down