IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update auth config and firefly config

Browse Source
This commit is contained in:
James Cole 2021-05-09 07:48:47 +02:00
parent 1157625f6d
commit 2488e444aa
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config/auth.php
View File

@ -21,6 +21,17 @@
declare(strict_types=1); 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 [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -62,6 +73,10 @@ return [
'driver' => 'session', 'driver' => 'session',
'provider' => 'users', 'provider' => 'users',
], ],
'ldap' => [
'driver' => 'session',
'provider' => 'ldap',
],
'remote_user_guard' => [ 'remote_user_guard' => [
'driver' => 'remote_user_guard', 'driver' => 'remote_user_guard',
'provider' => 'remote_user_provider', 'provider' => 'remote_user_provider',
@ -91,13 +106,27 @@ return [
'providers' => [ 'providers' => [
'users' => [ 'users' => [
'driver' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), 'driver' => 'eloquent',
'model' => FireflyIII\User::class, 'model' => FireflyIII\User::class,
], ],
'remote_user_provider' => [ 'remote_user_provider' => [
'driver' => 'remote_user_provider', 'driver' => 'remote_user_provider',
'model' => FireflyIII\User::class, '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',
],
],
],
], ],
/* /*

5
config/firefly.php
View File

@ -121,9 +121,14 @@ return [
'tracker_url' => env('TRACKER_URL', ''), 'tracker_url' => env('TRACKER_URL', ''),
'disable_frame_header' => env('DISABLE_FRAME_HEADER', false), 'disable_frame_header' => env('DISABLE_FRAME_HEADER', false),
'disable_csp_header' => env('DISABLE_CSP_HEADER', false), 'disable_csp_header' => env('DISABLE_CSP_HEADER', false),
// ldap and auth settings
'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), 'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'), 'authentication_guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
'custom_logout_uri' => envNonEmpty('CUSTOM_LOGOUT_URI', ''), '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', ''), 'ipinfo_token' => env('IPINFO_TOKEN', ''),
'update_endpoint' => 'https://version.firefly-iii.org/index.json', 'update_endpoint' => 'https://version.firefly-iii.org/index.json',
'send_telemetry' => env('SEND_TELEMETRY', false), 'send_telemetry' => env('SEND_TELEMETRY', false),