Merge pull request #2167 from wrouesnel/bugfix/ldapauth

Fix LDAP auth configuration paths.

config/ldap_auth.php

@@ -143,7 +143,7 @@ return [
 
     'scopes' => $scopes,
 
-    'usernames' => [
+    'identifiers' => [
 
         /*
         |--------------------------------------------------------------------------
@@ -173,8 +173,8 @@ return [
 
         'ldap' => [
 
-            'discover'     => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
+            'locate_users_by'     => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'),
-            'authenticate' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
+            'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'),
 
         ],
 

database/migrations/2019_03_11_223700_fixldap.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+/**
+ * Class ChangesForV4713
+ */
+class ChangesForV4713 extends Migration
+{
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::table(
+            'users', function (Blueprint $table) {
+            $table->dropColumn(['objectguid']);
+        }
+        );
+    }
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        /**
+         * ADLdap2 appears to require the ability to store an objectguid for LDAP users
+         * now. To support this, we add the column.
+         */
+        Schema::table(
+            'users', function (Blueprint $table) {
+            $table->uuid('objectguid')->nullable()->after('id');
+        }
+        );
+    }
+}