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

Rename variable.

Browse Source
This commit is contained in:
James Cole 2021-06-12 13:15:01 +02:00
parent cd9d1cf4ab
commit 91b08d1772
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/.env.ci
View File

@ -188,7 +188,7 @@ AUTHENTICATION_GUARD=web
# Enter a custom URL here that will force a logout (your authentication provider can tell you). # Enter a custom URL here that will force a logout (your authentication provider can tell you).
# Setting this variable only works when AUTHENTICATION_GUARD != web # Setting this variable only works when AUTHENTICATION_GUARD != web
# #
CUSTOM_LOGOUT_URI= CUSTOM_LOGOUT_URL=
# LDAP connection configuration # LDAP connection configuration
# OpenLDAP, FreeIPA or ActiveDirectory # OpenLDAP, FreeIPA or ActiveDirectory

2
.deploy/heroku/.env.heroku
View File

@ -189,7 +189,7 @@ AUTHENTICATION_GUARD=web
# Enter a custom URL here that will force a logout (your authentication provider can tell you). # Enter a custom URL here that will force a logout (your authentication provider can tell you).
# Setting this variable only works when AUTHENTICATION_GUARD != web # Setting this variable only works when AUTHENTICATION_GUARD != web
# #
CUSTOM_LOGOUT_URI= CUSTOM_LOGOUT_URL=
# LDAP connection configuration # LDAP connection configuration
# OpenLDAP, FreeIPA or ActiveDirectory # OpenLDAP, FreeIPA or ActiveDirectory

2
.env.example
View File

@ -203,7 +203,7 @@ AUTHENTICATION_GUARD_EMAIL=
# #
# Extra authentication settings # Extra authentication settings
# #
CUSTOM_LOGOUT_URI= CUSTOM_LOGOUT_URL=
# You can disable the X-Frame-Options header if it interferes with tools like # You can disable the X-Frame-Options header if it interferes with tools like
# Organizr. This is at your own risk. Applications running in frames run the risk # Organizr. This is at your own risk. Applications running in frames run the risk

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -138,7 +138,7 @@ class LoginController extends Controller
public function logout(Request $request) public function logout(Request $request)
{ {
$authGuard = config('firefly.authentication_guard'); $authGuard = config('firefly.authentication_guard');
$logoutUri = config('firefly.custom_logout_uri'); $logoutUri = config('firefly.custom_logout_url');
if ('remote_user_guard' === $authGuard && '' !== $logoutUri) { if ('remote_user_guard' === $authGuard && '' !== $logoutUri) {
return redirect($logoutUri); return redirect($logoutUri);
} }

2
app/Http/Controllers/Controller.php
View File

@ -63,7 +63,7 @@ abstract class Controller extends BaseController
// share custom auth guard info. // share custom auth guard info.
$authGuard = config('firefly.authentication_guard'); $authGuard = config('firefly.authentication_guard');
$logoutUri = config('firefly.custom_logout_uri'); $logoutUri = config('firefly.custom_logout_url');
app('view')->share('authGuard', $authGuard); app('view')->share('authGuard', $authGuard);
app('view')->share('logoutUri', $logoutUri); app('view')->share('logoutUri', $logoutUri);

2
config/firefly.php
View File

@ -138,7 +138,7 @@ return [
// LDAP and authentication settings // LDAP and authentication 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_url' => envNonEmpty('CUSTOM_LOGOUT_URL', ''),
'ldap_auth_field' => env('LDAP_AUTH_FIELD', env('ADLDAP_AUTH_FIELD', 'distinguishedname')), 'ldap_auth_field' => env('LDAP_AUTH_FIELD', env('ADLDAP_AUTH_FIELD', 'distinguishedname')),
// static config (cannot be changed by user) // static config (cannot be changed by user)