From 91b08d1772e2fa66d8eb25adb146d46757f0a29d Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 12 Jun 2021 13:15:01 +0200
Subject: [PATCH] Rename variable.

---
 .ci/.env.ci                                   | 2 +-
 .deploy/heroku/.env.heroku                    | 2 +-
 .env.example                                  | 2 +-
 app/Http/Controllers/Auth/LoginController.php | 2 +-
 app/Http/Controllers/Controller.php           | 2 +-
 config/firefly.php                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/.env.ci b/.ci/.env.ci
index 94995a20c3..38e6a837c8 100644
--- a/.ci/.env.ci
+++ b/.ci/.env.ci
@@ -188,7 +188,7 @@ AUTHENTICATION_GUARD=web
 # 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
 #
-CUSTOM_LOGOUT_URI=
+CUSTOM_LOGOUT_URL=
 
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
diff --git a/.deploy/heroku/.env.heroku b/.deploy/heroku/.env.heroku
index b649b5a1ae..013b5b810a 100644
--- a/.deploy/heroku/.env.heroku
+++ b/.deploy/heroku/.env.heroku
@@ -189,7 +189,7 @@ AUTHENTICATION_GUARD=web
 # 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
 #
-CUSTOM_LOGOUT_URI=
+CUSTOM_LOGOUT_URL=
 
 # LDAP connection configuration
 # OpenLDAP, FreeIPA or ActiveDirectory
diff --git a/.env.example b/.env.example
index df98aea824..1c69588792 100644
--- a/.env.example
+++ b/.env.example
@@ -203,7 +203,7 @@ AUTHENTICATION_GUARD_EMAIL=
 #
 # Extra authentication settings
 #
-CUSTOM_LOGOUT_URI=
+CUSTOM_LOGOUT_URL=
 
 # 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
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 69aeab3b1a..efa5a515d3 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -138,7 +138,7 @@ class LoginController extends Controller
     public function logout(Request $request)
     {
         $authGuard = config('firefly.authentication_guard');
-        $logoutUri = config('firefly.custom_logout_uri');
+        $logoutUri = config('firefly.custom_logout_url');
         if ('remote_user_guard' === $authGuard && '' !== $logoutUri) {
             return redirect($logoutUri);
         }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 5c878445c4..4093cb2ac8 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -63,7 +63,7 @@ abstract class Controller extends BaseController
 
         // share custom auth guard info.
         $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('logoutUri', $logoutUri);
diff --git a/config/firefly.php b/config/firefly.php
index aac88231f2..03fc71f846 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -138,7 +138,7 @@ return [
     // LDAP and authentication settings
     'login_provider'               => envNonEmpty('LOGIN_PROVIDER', 'eloquent'),
     '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')),
 
     // static config (cannot be changed by user)