From 7004ab627c0ab8bbbf491ded261604364d929b30 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Fri, 18 Nov 2016 16:59:05 +0800
Subject: [PATCH] fix routes for setup wizard

---
 app/Http/Kernel.php                    |  1 -
 app/Http/Routes/setup.php              | 25 ++++++++++++++++++++++++
 app/Http/Routes/web.php                | 13 -------------
 app/Providers/RouteServiceProvider.php | 27 +++++++++++++++++++++++---
 4 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 app/Http/Routes/setup.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 2caa49be..9c63904b 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,7 +29,6 @@ class Kernel extends HttpKernel
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\CheckSessionUserValid::class,
             \App\Http\Middleware\Internationalization::class,
             //\App\Http\Middleware\VerifyCsrfToken::class,
         ],
diff --git a/app/Http/Routes/setup.php b/app/Http/Routes/setup.php
new file mode 100644
index 00000000..56bf7be9
--- /dev/null
+++ b/app/Http/Routes/setup.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Application Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register all of the routes for an application.
+| It's a breeze. Simply tell Laravel the URIs it should respond to
+| and give it the controller to call when that URI is requested.
+|
+*/
+
+/**
+ * Setup Wizard
+ */
+Route::group(['prefix' => 'setup'], function ()
+{
+    Route::get ('/',         'SetupController@welcome');
+    Route::get ('/info',     'SetupController@info');
+    Route::post('/finish',   'SetupController@finish');
+
+    Route::get ('/update',   'SetupController@update');
+    Route::post('/update',   'SetupController@doUpdate');
+});
diff --git a/app/Http/Routes/web.php b/app/Http/Routes/web.php
index 31f487a2..f6f4e785 100644
--- a/app/Http/Routes/web.php
+++ b/app/Http/Routes/web.php
@@ -16,19 +16,6 @@ Route::get('/index.php',     'HomeController@index');
 
 Route::get('/locale/{lang}', 'HomeController@locale');
 
-/**
- * Setup Wizard
- */
-Route::group(['prefix' => 'setup'], function ()
-{
-    Route::get ('/',         'SetupController@welcome');
-    Route::get ('/info',     'SetupController@info');
-    Route::post('/finish',   'SetupController@finish');
-
-    Route::get ('/update',   'SetupController@update');
-    Route::post('/update',   'SetupController@doUpdate');
-});
-
 /**
  * Auth
  */
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 82eee205..71c6f561 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use Illuminate\Routing\Router;
 use App\Events\ConfigureRoutes;
+use App\Http\Middleware\CheckSessionUserValid;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
 class RouteServiceProvider extends ServiceProvider
@@ -38,6 +39,8 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map(Router $router)
     {
+        $this->mapSetupRoutes($router);
+
         $this->mapStaticRoutes($router);
 
         $this->mapWebRoutes($router);
@@ -56,7 +59,7 @@ class RouteServiceProvider extends ServiceProvider
     protected function mapWebRoutes(Router $router)
     {
         $router->group([
-            'middleware' => 'web',
+            'middleware' => ['web', CheckSessionUserValid::class],
             'namespace' => $this->namespace,
         ], function ($router) {
             require app_path('Http/Routes/web.php');
@@ -64,9 +67,27 @@ class RouteServiceProvider extends ServiceProvider
     }
 
     /**
-     * Define the "api" routes for the application.
+     * Define the "setup" routes for the application.
      *
-     * These routes are typically stateless.
+     * The routes for setup wizard.
+     *
+     * @param  \Illuminate\Routing\Router  $router
+     * @return void
+     */
+    protected function mapSetupRoutes(Router $router)
+    {
+        $router->group([
+            'middleware' => 'web',
+            'namespace' => $this->namespace,
+        ], function ($router) {
+            require app_path('Http/Routes/setup.php');
+        });
+    }
+
+    /**
+     * Define the "static" routes for the application.
+     *
+     * These routes will not load session, etc.
      *
      * @param  \Illuminate\Routing\Router  $router
      * @return void