kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/5288

Browse Source
This commit is contained in:
James Cole
2021-11-15 23:16:30 +01:00
parent dba24d2dee
commit babf462bcf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/Upgrade/UpgradeDatabase.php
View File

@@ -143,10 +143,10 @@ class UpgradeDatabase extends Command
$result = Artisan::output(); $result = Artisan::output();
echo $result; echo $result;
$this->line('Now installing OAuth2 keys...'); // $this->line('Now installing OAuth2 keys...');
Artisan::call('passport:install'); // Artisan::call('passport:install');
$result = Artisan::output(); // $result = Artisan::output();
echo $result; // echo $result;
$this->line('Done!'); $this->line('Done!');
} }

6
config/auth.php
View File

@@ -26,15 +26,15 @@ use FireflyIII\Ldap\Rules\UserDefinedRule;
# select ldap model based on configuration option # select ldap model based on configuration option
switch(env('LDAP_DIALECT')) { switch(env('LDAP_DIALECT')) {
case 'OpenLDAP':
$ldapModel = class_exists(LdapRecord\Models\OpenLDAP\User::class) ? LdapRecord\Models\OpenLDAP\User::class : '';
break;
case 'ActiveDirectory': case 'ActiveDirectory':
$ldapModel = class_exists(LdapRecord\Models\ActiveDirectory\User::class) ? LdapRecord\Models\ActiveDirectory\User::class : ''; $ldapModel = class_exists(LdapRecord\Models\ActiveDirectory\User::class) ? LdapRecord\Models\ActiveDirectory\User::class : '';
break; break;
case 'FreeIPA': case 'FreeIPA':
$ldapModel = class_exists(LdapRecord\Models\FreeIPA\User::class) ? LdapRecord\Models\FreeIPA\User::class : ''; $ldapModel = class_exists(LdapRecord\Models\FreeIPA\User::class) ? LdapRecord\Models\FreeIPA\User::class : '';
break; break;
default:
# default to openLDAP
$ldapModel = class_exists(LdapRecord\Models\OpenLDAP\User::class) ? LdapRecord\Models\OpenLDAP\User::class : '';
} }
return [ return [