diff --git a/config/ldap_auth.php b/config/ldap_auth.php index 00d6eb5c16..886fff15dc 100644 --- a/config/ldap_auth.php +++ b/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'), - 'authenticate' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'), + 'locate_users_by' => envNonEmpty('ADLDAP_DISCOVER_FIELD', 'userprincipalname'), + 'bind_users_by' => envNonEmpty('ADLDAP_AUTH_FIELD', 'distinguishedname'), ], diff --git a/database/migrations/2019_03_11_223700_fixldap.php b/database/migrations/2019_03_11_223700_fixldap.php new file mode 100644 index 0000000000..09d9356ac7 --- /dev/null +++ b/database/migrations/2019_03_11_223700_fixldap.php @@ -0,0 +1,43 @@ +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'); + } + ); + } +}