Swap out adldap2/adldap2 for directorytree/ldaprecord-laravel

app/Http/Controllers/APIController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
+use LdapRecord\Query\Collection;
 
 use App\Classes\LDAP\Server;
 
@@ -31,6 +31,10 @@ class APIController extends Controller
 			});
 	}
 
+	/**
+	 * @param Request $request
+	 * @return Collection
+	 */
 	public function query(Request $request): Collection
 	{
 		$levels = $request->query('depth',1);
@@ -41,14 +45,12 @@ class APIController extends Controller
 			->query($dn)
 			->transform(function($item) {
 				return [
-					'title'=>$item->getDistinguishedName(),
-					'item'=>Crypt::encryptString($item->getDistinguishedName()),
+					'title'=>$item->getDn(),
+					'item'=>Crypt::encryptString($item->getDn()),
 					'icon'=>'fa-fw fas fa-sitemap',
 					'lazy'=>TRUE,
-					'tooltip'=>$item->getDistinguishedName(),
+					'tooltip'=>$item->getDn(),
 				];
 			});
-
-		Log::debug(sprintf('%s: Query [%s] - Levels [%d]: %s',__METHOD__,$dn,$levels,serialize($x)));
 	}
 }

app/Http/Controllers/Auth/LoginController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth;
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -38,6 +39,14 @@ class LoginController extends Controller
         $this->middleware('guest')->except('logout');
     }
 
+	protected function credentials(Request $request): array
+	{
+		return [
+			'mail' => $request->get('email'),
+			'password' => $request->get('password'),
+		];
+	}
+
 	/**
 	 * Show our themed login page
 	 */
@@ -50,14 +59,4 @@ 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 config('ldap_auth.identifiers.ldap.locate_users_by');
-	}
 }