From 74bd996f7a8181823b69d3272c05f8dde19b26d7 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 8 Jan 2024 14:54:00 +1100
Subject: [PATCH] Enable login by any attribute - defaults to uid. Implements
 #253

---
 app/Http/Controllers/Auth/LoginController.php       | 12 +++++++++++-
 app/helpers.php                                     | 13 +++++++++++++
 composer.json                                       |  3 +++
 config/ldap.php                                     |  1 +
 .../themes/architect/views/auth/login.blade.php     |  6 +++---
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 app/helpers.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 90a4c4f..6f334ce 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -45,7 +45,7 @@ class LoginController extends Controller
 	protected function credentials(Request $request): array
 	{
 		return [
-			'mail' => $request->get('email'),
+			login_attr_name() => $request->get(login_attr_name()),
 			'password' => $request->get('password'),
 		];
 	}
@@ -91,4 +91,14 @@ class LoginController extends Controller
 
 		return view('architect::auth.login')->with('login_note',$login_note);
 	}
+
+	/**
+	 * Get the login username to be used by the controller.
+	 *
+	 * @return string
+	 */
+	public function username()
+	{
+		return login_attr_name();
+	}
 }
diff --git a/app/helpers.php b/app/helpers.php
new file mode 100644
index 0000000..2dd92a0
--- /dev/null
+++ b/app/helpers.php
@@ -0,0 +1,13 @@
+<?php
+
+use Illuminate\Support\Arr;
+
+function login_attr_description(): string
+{
+	return Arr::get(config('ldap.login.attr'),login_attr_name());
+}
+
+function login_attr_name(): string
+{
+	return key(config('ldap.login.attr'));
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index e16d0ba..67236b0 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,9 @@
         "phpunit/phpunit": "^10.0"
     },
     "autoload": {
+        "files": [
+            "app/helpers.php"
+        ],
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
diff --git a/config/ldap.php b/config/ldap.php
index c0d0e38..01ae633 100644
--- a/config/ldap.php
+++ b/config/ldap.php
@@ -109,6 +109,7 @@ return [
 	 * setup.
 	 */
 	'login' => [
+		'attr' => [env('LDAP_LOGIN_ATTR','uid') => env('LDAP_LOGIN_ATTR_DESC','User ID')],	// Attribute used to find user for login
 		'objectclass' => explode(',',env('LDAP_LOGIN_OBJECTCLASS', 'posixAccount')),		// Objectclass that users must contain to login
 	],
 
diff --git a/resources/themes/architect/views/auth/login.blade.php b/resources/themes/architect/views/auth/login.blade.php
index e642977..fbbc3f6 100644
--- a/resources/themes/architect/views/auth/login.blade.php
+++ b/resources/themes/architect/views/auth/login.blade.php
@@ -35,10 +35,10 @@
 
 										<div class="form-row">
 											<div class="col-md-12 mt-3">
-												<label class="mb-1">Email</label>
-												<input name="email" id="user" placeholder="" type="email" class="form-control" required="">
+												<label class="mb-1">{{ login_attr_description() }}</label>
+												<input name="{{ login_attr_name() }}" id="user" placeholder="" type="@if(in_array(login_attr_name(),['mail','email'])) email @else text @endif" class="form-control" required="">
 												<div class="invalid-feedback">
-													@lang('Please enter your email')
+													@lang('Please enter your '.strtolower(login_attr_description()))
 												</div>
 											</div>