diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index c94a6a6cd5..77cf143ea6 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -143,10 +143,10 @@ class UpgradeDatabase extends Command $result = Artisan::output(); echo $result; - $this->line('Now installing OAuth2 keys...'); - Artisan::call('passport:install'); - $result = Artisan::output(); - echo $result; +// $this->line('Now installing OAuth2 keys...'); +// Artisan::call('passport:install'); +// $result = Artisan::output(); +// echo $result; $this->line('Done!'); } diff --git a/config/auth.php b/config/auth.php index f4abd22976..974c68a8f6 100644 --- a/config/auth.php +++ b/config/auth.php @@ -26,15 +26,15 @@ use FireflyIII\Ldap\Rules\UserDefinedRule; # select ldap model based on configuration option switch(env('LDAP_DIALECT')) { - case 'OpenLDAP': - $ldapModel = class_exists(LdapRecord\Models\OpenLDAP\User::class) ? LdapRecord\Models\OpenLDAP\User::class : ''; - break; case 'ActiveDirectory': $ldapModel = class_exists(LdapRecord\Models\ActiveDirectory\User::class) ? LdapRecord\Models\ActiveDirectory\User::class : ''; break; case 'FreeIPA': $ldapModel = class_exists(LdapRecord\Models\FreeIPA\User::class) ? LdapRecord\Models\FreeIPA\User::class : ''; break; + default: + # default to openLDAP + $ldapModel = class_exists(LdapRecord\Models\OpenLDAP\User::class) ? LdapRecord\Models\OpenLDAP\User::class : ''; } return [