mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Update auth config and firefly config
This commit is contained in:
parent
1157625f6d
commit
2488e444aa
@ -21,6 +21,17 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
// TODO die with error if LOGIN_PROVIDER = eloquent
|
||||
// because it must be changed to "users".
|
||||
// login provider no longer used?
|
||||
if (null !== env('LOGIN_PROVIDER', null)) {
|
||||
die('The "LOGIN_PROVIDER" environment variable must be removed.');
|
||||
}
|
||||
|
||||
// kill ADLDAP values?
|
||||
|
||||
// AUTHENTICATION_GUARD
|
||||
|
||||
return [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -62,6 +73,10 @@ return [
|
||||
'driver' => 'session',
|
||||
'provider' => 'users',
|
||||
],
|
||||
'ldap' => [
|
||||
'driver' => 'session',
|
||||
'provider' => 'ldap',
|
||||
],
|
||||
'remote_user_guard' => [
|
||||
'driver' => 'remote_user_guard',
|
||||
'provider' => 'remote_user_provider',
|
||||
@ -91,13 +106,27 @@ return [
|
||||
|
||||
'providers' => [
|
||||
'users' => [
|
||||
'driver' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
|
||||
'driver' => 'eloquent',
|
||||
'model' => FireflyIII\User::class,
|
||||
],
|
||||
'remote_user_provider' => [
|
||||
'driver' => 'remote_user_provider',
|
||||
'model' => FireflyIII\User::class,
|
||||
],
|
||||
|
||||
'ldap' => [
|
||||
'driver' => 'ldap',
|
||||
//'model' => LdapRecord\Models\ActiveDirectory\User::class,
|
||||
'model' => LdapRecord\Models\OpenLDAP\User::class,
|
||||
'rules' => [],
|
||||
'database' => [
|
||||
'model' => FireflyIII\User::class,
|
||||
'sync_passwords' => false,
|
||||
'sync_attributes' => [
|
||||
'email' => 'mail',
|
||||
],
|
||||
],
|
||||
],
|
||||
],
|
||||
|
||||
/*
|
||||
|
@ -121,9 +121,14 @@ return [
|
||||
'tracker_url' => env('TRACKER_URL', ''),
|
||||
'disable_frame_header' => env('DISABLE_FRAME_HEADER', false),
|
||||
'disable_csp_header' => env('DISABLE_CSP_HEADER', false),
|
||||
|
||||
// ldap and auth settings
|
||||
'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
|
||||
'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
|
||||
'custom_logout_uri' => envNonEmpty('CUSTOM_LOGOUT_URI', ''),
|
||||
'ldap_auth_field' => env('LDAP_AUTH_FIELD', env('ADLDAP_AUTH_FIELD', 'distinguishedname')),
|
||||
|
||||
// other settings
|
||||
'ipinfo_token' => env('IPINFO_TOKEN', ''),
|
||||
'update_endpoint' => 'https://version.firefly-iii.org/index.json',
|
||||
'send_telemetry' => env('SEND_TELEMETRY', false),
|
||||
|
Loading…
Reference in New Issue
Block a user