From ea54f685435cca88edf0923bf96eed269322523b Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Fri, 21 Nov 2025 18:05:29 +0100
Subject: [PATCH 1/2] fix(user_ldap): Re-introduce easy login attributes
 checkboxes

Fix https://github.com/nextcloud/server/issues/55805

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 .../src/components/SettingsTabs/LoginTab.vue       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apps/user_ldap/src/components/SettingsTabs/LoginTab.vue b/apps/user_ldap/src/components/SettingsTabs/LoginTab.vue
index d8742ed40ae85..67e0714fbf4c4 100644
--- a/apps/user_ldap/src/components/SettingsTabs/LoginTab.vue
+++ b/apps/user_ldap/src/components/SettingsTabs/LoginTab.vue
@@ -8,6 +8,20 @@
 			{{ t('user_ldap', 'When logging in, {instanceName} will find the user based on the following attributes:', { instanceName }) }}
 		</legend>
 
+		<NcCheckboxRadioSwitch
+			:model-value="ldapConfigProxy.ldapLoginFilterUsername === '1'"
+			:description="t('user_ldap', 'Allows login against the LDAP/AD username, which is either \'uid\' or \'sAMAccountName\' and will be detected.')"
+			@update:model-value="ldapConfigProxy.ldapLoginFilterUsername = $event ? '1' : '0'">
+			{{ t('user_ldap', 'LDAP/AD Username:') }}
+		</NcCheckboxRadioSwitch>
+
+		<NcCheckboxRadioSwitch
+			:model-value="ldapConfigProxy.ldapLoginFilterEmail === '1'"
+			:description="t('user_ldap', 'Allows login against an email attribute. \'mail\' and \'mailPrimaryAddress\' allowed.')"
+			@update:model-value="ldapConfigProxy.ldapLoginFilterEmail = $event ? '1' : '0'">
+			{{ t('user_ldap', 'LDAP/AD Email Address:') }}
+		</NcCheckboxRadioSwitch>
+
 		<div class="ldap-wizard__login__line ldap-wizard__login__login-attributes">
 			<NcSelect
 				v-model="ldapLoginFilterAttributes"

From fbd3de96684e1d070bf7c0cb087ff78adfd7b097 Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Fri, 21 Nov 2025 18:16:47 +0100
Subject: [PATCH 2/2] fix(user_ldap): Use correct property to update login
 filter

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 apps/user_ldap/src/components/SettingsTabs/UsersTab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/src/components/SettingsTabs/UsersTab.vue b/apps/user_ldap/src/components/SettingsTabs/UsersTab.vue
index db195b438b5e6..ff5e818f94af3 100644
--- a/apps/user_ldap/src/components/SettingsTabs/UsersTab.vue
+++ b/apps/user_ldap/src/components/SettingsTabs/UsersTab.vue
@@ -120,7 +120,7 @@ async function reloadFilters() {
 
 		const response2 = await callWizard('getUserLoginFilter', props.configId)
 		// Not using ldapConfig to avoid triggering the save logic.
-		ldapConfigs.value[props.configId]!.ldapLoginFilter = (response2.changes?.ldap_userlogin_filter as string | undefined) ?? ''
+		ldapConfigs.value[props.configId]!.ldapLoginFilter = (response2.changes?.ldap_login_filter as string | undefined) ?? ''
 	}
 }