Merge pull request #56574 from nextcloud/artonge/fix/readd_attributes_checkboxes

fix(user_ldap): Re-introduce easy login attributes checkboxes

Author: artonge

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"

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) ?? ''
 	}
 }
 

dist/user_ldap-settings-admin.css

@@ -1,4 +1,4 @@
 /* extracted by css-entry-points-plugin */
-@import './user_ldap-user_ldap-settings-admin-BSius8Dv.chunk.css';
+@import './user_ldap-user_ldap-settings-admin-1lfli3rS.chunk.css';
 @import './NcSettingsSection-BfK7eHNT-BFoYkIs3.chunk.css';
 @import './Plus-BhZ0LWiU.chunk.css';