Browse Source

Now ENABLE_LOGIN_FORM=False disabling only email form.
LDAP form will be showed instead.
Also added "name" property to inputs for Chrome autocompletion.

alexey_rechkalov 5 months ago
parent
commit
b9e637ee2b
1 changed files with 7 additions and 4 deletions
  1. 7 4
      src/routes/auth/+page.svelte

+ 7 - 4
src/routes/auth/+page.svelte

@@ -203,7 +203,7 @@
 								{/if}
 								{/if}
 							</div>
 							</div>
 
 
-							{#if $config?.features.enable_login_form}
+							{#if $config?.features.enable_login_form || $config?.features.enable_ldap}
 								<div class="flex flex-col mt-4">
 								<div class="flex flex-col mt-4">
 									{#if mode === 'signup'}
 									{#if mode === 'signup'}
 										<div class="mb-2">
 										<div class="mb-2">
@@ -227,6 +227,7 @@
 												type="text"
 												type="text"
 												class="my-0.5 w-full text-sm outline-none bg-transparent"
 												class="my-0.5 w-full text-sm outline-none bg-transparent"
 												autocomplete="username"
 												autocomplete="username"
+												name="username"
 												placeholder={$i18n.t('Enter Your Username')}
 												placeholder={$i18n.t('Enter Your Username')}
 												required
 												required
 											/>
 											/>
@@ -239,6 +240,7 @@
 												type="email"
 												type="email"
 												class="my-0.5 w-full text-sm outline-none bg-transparent"
 												class="my-0.5 w-full text-sm outline-none bg-transparent"
 												autocomplete="email"
 												autocomplete="email"
+												name="email"
 												placeholder={$i18n.t('Enter Your Email')}
 												placeholder={$i18n.t('Enter Your Email')}
 												required
 												required
 											/>
 											/>
@@ -254,13 +256,14 @@
 											class="my-0.5 w-full text-sm outline-none bg-transparent"
 											class="my-0.5 w-full text-sm outline-none bg-transparent"
 											placeholder={$i18n.t('Enter Your Password')}
 											placeholder={$i18n.t('Enter Your Password')}
 											autocomplete="current-password"
 											autocomplete="current-password"
+											name="current-password"
 											required
 											required
 										/>
 										/>
 									</div>
 									</div>
 								</div>
 								</div>
 							{/if}
 							{/if}
 							<div class="mt-5">
 							<div class="mt-5">
-								{#if $config?.features.enable_login_form}
+								{#if $config?.features.enable_login_form || $config?.features.enable_ldap}
 									{#if mode === 'ldap'}
 									{#if mode === 'ldap'}
 										<button
 										<button
 											class="bg-gray-700/5 hover:bg-gray-700/10 dark:bg-gray-100/5 dark:hover:bg-gray-100/10 dark:text-gray-300 dark:hover:text-white transition w-full rounded-full font-medium text-sm py-2.5"
 											class="bg-gray-700/5 hover:bg-gray-700/10 dark:bg-gray-100/5 dark:hover:bg-gray-100/10 dark:text-gray-300 dark:hover:text-white transition w-full rounded-full font-medium text-sm py-2.5"
@@ -309,7 +312,7 @@
 						{#if Object.keys($config?.oauth?.providers ?? {}).length > 0}
 						{#if Object.keys($config?.oauth?.providers ?? {}).length > 0}
 							<div class="inline-flex items-center justify-center w-full">
 							<div class="inline-flex items-center justify-center w-full">
 								<hr class="w-32 h-px my-4 border-0 dark:bg-gray-100/10 bg-gray-700/10" />
 								<hr class="w-32 h-px my-4 border-0 dark:bg-gray-100/10 bg-gray-700/10" />
-								{#if $config?.features.enable_login_form}
+								{#if $config?.features.enable_login_form || $config?.features.enable_ldap}
 									<span
 									<span
 										class="px-3 text-sm font-medium text-gray-900 dark:text-white bg-transparent"
 										class="px-3 text-sm font-medium text-gray-900 dark:text-white bg-transparent"
 										>{$i18n.t('or')}</span
 										>{$i18n.t('or')}</span
@@ -401,7 +404,7 @@
 							</div>
 							</div>
 						{/if}
 						{/if}
 
 
-						{#if $config?.features.enable_ldap}
+						{#if $config?.features.enable_ldap && $config?.features.enable_login_form}
 							<div class="mt-2">
 							<div class="mt-2">
 								<button
 								<button
 									class="flex justify-center items-center text-xs w-full text-center underline"
 									class="flex justify-center items-center text-xs w-full text-center underline"