From 2e0cc10ded89b5dee14a5f02ab1c9b61913a0433 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Thu, 20 Sep 2018 13:54:43 -0500
Subject: [PATCH] Move redirect configs into phpvms config

---
 app/Http/Controllers/Auth/LoginController.php        |  2 +-
 app/Http/Controllers/Auth/RegisterController.php     |  2 +-
 app/Http/Controllers/Frontend/DownloadController.php |  2 +-
 config/app.php                                       |  4 ----
 config/phpvms.php                                    | 10 ++++++++++
 resources/stubs/installer/config.stub                |  1 -
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index f714c8bf..1589ca88 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -23,7 +23,7 @@ class LoginController extends Controller
      */
     public function __construct()
     {
-        $this->redirectTo = config('app.login_redirect');
+        $this->redirectTo = config('phpvms.login_redirect');
         $this->middleware('guest', ['except' => 'logout']);
     }
 
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 83369583..22cad1d9 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -52,7 +52,7 @@ class RegisterController extends Controller
         $this->userService = $userService;
         $this->middleware('guest');
 
-        $this->redirectTo = config('app.registration_redirect');
+        $this->redirectTo = config('phpvms.registration_redirect');
     }
 
     /**
diff --git a/app/Http/Controllers/Frontend/DownloadController.php b/app/Http/Controllers/Frontend/DownloadController.php
index 3d1972e9..fb6d8e9b 100644
--- a/app/Http/Controllers/Frontend/DownloadController.php
+++ b/app/Http/Controllers/Frontend/DownloadController.php
@@ -72,7 +72,7 @@ class DownloadController extends Controller
 
         // Allowed to download? If not, direct to login
         if (!$file->public && !Auth::check()) {
-            return redirect(config('app.login_redirect'));
+            return redirect(config('phpvms.login_redirect'));
         }
 
         $file->download_count++;
diff --git a/config/app.php b/config/app.php
index c3f4423b..e2b90b73 100755
--- a/config/app.php
+++ b/config/app.php
@@ -17,10 +17,6 @@ return [
     'locale'          => env('APP_LOCALE', 'en'),
     'fallback_locale' => 'en',
 
-    // Where to redirect after logging in/registration
-    'login_redirect'        => '/dashboard',
-    'registration_redirect' => '/profile',
-
     // This sends install and vaCentral specific information to help with
     // optimizations and figuring out where slowdowns might be happening
     'analytics' => true,
diff --git a/config/phpvms.php b/config/phpvms.php
index 92a16a14..03e21c7d 100644
--- a/config/phpvms.php
+++ b/config/phpvms.php
@@ -15,6 +15,16 @@ return [
      */
     'installed' => env('PHPVMS_INSTALLED', false),
 
+    /*
+     * Where to redirect after logging in
+     */
+    'login_redirect'        => '/dashboard',
+
+    /*
+     * Where to redirect after registration
+     */
+    'registration_redirect' => '/profile',
+
     /*
      * The ISO "Currency Code" to use, the list is in config/money.php
      *
diff --git a/resources/stubs/installer/config.stub b/resources/stubs/installer/config.stub
index 1a29a847..b3fe7d4c 100644
--- a/resources/stubs/installer/config.stub
+++ b/resources/stubs/installer/config.stub
@@ -103,5 +103,4 @@ return [
         'default' => 'file',
         'lifetime' => 60 * 24,  # 24 hours
     ],
-
 ];