From 895ace813d3ebc0cb43950c5e34d7c9d5a6ff50a Mon Sep 17 00:00:00 2001
From: "ind.purvesh" <ind.purvesh@gmail.com>
Date: Wed, 21 Jun 2017 15:42:52 +1200
Subject: [PATCH] adding install middleware for auto redirect to install if not

---
 composer.json                                               | 1 +
 modules/base/Mage2/Address/routes/web.php                   | 4 ++--
 modules/base/Mage2/Cart/routes/web.php                      | 2 +-
 modules/base/Mage2/Catalog/routes/web.php                   | 4 ++--
 modules/base/Mage2/Category/routes/web.php                  | 4 ++--
 modules/base/Mage2/Checkout/routes/web.php                  | 2 +-
 .../base/Mage2/Install/Controllers/InstallController.php    | 3 ++-
 modules/base/Mage2/Order/routes/web.php                     | 6 +++---
 modules/base/Mage2/OrderReturn/routes/web.php               | 6 +++---
 modules/base/Mage2/Page/routes/web.php                      | 4 ++--
 modules/base/Mage2/Paypal/routes/web.php                    | 4 ++--
 modules/base/Mage2/Product/routes/web.php                   | 4 ++--
 modules/base/Mage2/Review/routes/web.php                    | 4 ++--
 modules/base/Mage2/Sale/routes/web.php                      | 4 ++--
 modules/base/Mage2/System/routes/web.php                    | 4 ++--
 modules/base/Mage2/TaxClass/routes/web.php                  | 4 ++--
 modules/base/Mage2/User/routes/web.php                      | 6 +++---
 modules/base/Mage2/Wishlist/routes/web.php                  | 4 ++--
 modules/community/Mage2/ContactUs/routes/web.php            | 2 +-
 modules/community/Mage2/Feature/routes/web.php              | 2 +-
 20 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/composer.json b/composer.json
index f0e811a0e..9f0cb76d9 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
   },
   "autoload": {
     "psr-4": {
+      "Mage2\\Framework\\": "packages/mage2/framework/src/",
       "Mage2\\Address\\": "modules/base/Mage2/Address/",
       "Mage2\\Cart\\": "modules/base/Mage2/Cart/",
       "Mage2\\Catalog\\": "modules/base/Mage2/Catalog/",
diff --git a/modules/base/Mage2/Address/routes/web.php b/modules/base/Mage2/Address/routes/web.php
index c307875ba..1326533af 100644
--- a/modules/base/Mage2/Address/routes/web.php
+++ b/modules/base/Mage2/Address/routes/web.php
@@ -35,7 +35,7 @@
   |
  */
 
-Route::group(['middleware' => ['web', 'adminauth'], 'namespace' => "Mage2\Address\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'install'], 'namespace' => "Mage2\Address\Controllers\Admin"], function () {
 
   Route::get('/admin/configuration/address', ['as' => 'admin.configuration.address',
       'uses' => 'ConfigurationController@getConfiguration'
@@ -44,6 +44,6 @@
 });
 
 
-Route::group(['middleware' => ['web', 'frontauth'], 'namespace' => "Mage2\Address\Controllers"], function () {
+Route::group(['middleware' => ['web', 'frontauth', 'install'], 'namespace' => "Mage2\Address\Controllers"], function () {
     Route::resource('/my-account/address', 'AddressController', ['as' => 'my-account']);
 });
\ No newline at end of file
diff --git a/modules/base/Mage2/Cart/routes/web.php b/modules/base/Mage2/Cart/routes/web.php
index 9388707ef..76836edc3 100644
--- a/modules/base/Mage2/Cart/routes/web.php
+++ b/modules/base/Mage2/Cart/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Cart\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Cart\Controllers"], function () {
 
     Route::post('/add-to-cart', ['as' => 'cart.add-to-cart', 'uses' => 'CartController@addToCart']);
 
diff --git a/modules/base/Mage2/Catalog/routes/web.php b/modules/base/Mage2/Catalog/routes/web.php
index 83321db8a..9e7dbd537 100644
--- a/modules/base/Mage2/Catalog/routes/web.php
+++ b/modules/base/Mage2/Catalog/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\Catalog\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\Catalog\Controllers\Admin"], function () {
 
 
 
@@ -51,6 +51,6 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Catalog\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Catalog\Controllers"], function () {
 
 });
diff --git a/modules/base/Mage2/Category/routes/web.php b/modules/base/Mage2/Category/routes/web.php
index f4d29ddfb..e3747ecf4 100644
--- a/modules/base/Mage2/Category/routes/web.php
+++ b/modules/base/Mage2/Category/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\Category\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\Category\Controllers\Admin"], function () {
 
     Route::get('/admin/category/get-datatable-data', ['as' => 'admin.category.data-grid-table.get-data',
         'uses' => 'CategoryController@getDataGrid'
@@ -43,7 +43,7 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Category\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Category\Controllers"], function () {
 
     Route::get('/category/{slug}', ['as' => 'category.view', 'uses' => 'CategoryViewController@view']);
 });
diff --git a/modules/base/Mage2/Checkout/routes/web.php b/modules/base/Mage2/Checkout/routes/web.php
index e6d5a2f66..3573b5da7 100644
--- a/modules/base/Mage2/Checkout/routes/web.php
+++ b/modules/base/Mage2/Checkout/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Checkout\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Checkout\Controllers"], function () {
     Route::get('/checkout', ['as' => 'checkout.index', 'uses' => 'CheckoutController@index']);
     Route::post('/checkout/step/user', ['as' => 'checkout.user.post', 'uses' => 'CheckoutController@postUser']);
 
diff --git a/modules/base/Mage2/Install/Controllers/InstallController.php b/modules/base/Mage2/Install/Controllers/InstallController.php
index 7be116ad9..d7f8b7b50 100644
--- a/modules/base/Mage2/Install/Controllers/InstallController.php
+++ b/modules/base/Mage2/Install/Controllers/InstallController.php
@@ -34,6 +34,7 @@
 use Mage2\System\Models\Configuration;
 use Mage2\Framework\Module\Facades\Module;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Storage;
 
 class InstallController extends Controller
 {
@@ -48,7 +49,6 @@ class InstallController extends Controller
 
     public function index()
     {
-
         Session::forget('install-module');
 
         $result = [];
@@ -209,6 +209,7 @@ public function adminPost(AdminUserRequest $request)
 
     public function success()
     {
+        Storage::disk('local')->put('installed.txt', '.installed');
         return view('mage2install::install.success');
     }
 
diff --git a/modules/base/Mage2/Order/routes/web.php b/modules/base/Mage2/Order/routes/web.php
index 70f055c76..59ed438ff 100644
--- a/modules/base/Mage2/Order/routes/web.php
+++ b/modules/base/Mage2/Order/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web', 'adminauth', 'permission'],
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'],
     'namespace' => "Mage2\Order\Controllers\Admin"], function () {
 
     Route::get('/admin/order/get-datatable-data', ['as' => 'admin.order.data-grid-table.get-data',
@@ -51,12 +51,12 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Order\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Order\Controllers"], function () {
     Route::post('/order', ['as' => 'order.place', 'uses' => 'OrderController@place']);
 });
 
 
-Route::group(['middleware' => ['web', 'frontauth'], 'namespace' => "Mage2\Order\Controllers"], function () {
+Route::group(['middleware' => ['web', 'frontauth', 'install'], 'namespace' => "Mage2\Order\Controllers"], function () {
     Route::get('/order', ['as' => 'order.index', 'uses' => 'OrderController@index']);
     Route::get('/order/success/{id}', ['as' => 'order.success', 'uses' => 'OrderController@success']);
 
diff --git a/modules/base/Mage2/OrderReturn/routes/web.php b/modules/base/Mage2/OrderReturn/routes/web.php
index e58643450..3d01d938a 100644
--- a/modules/base/Mage2/OrderReturn/routes/web.php
+++ b/modules/base/Mage2/OrderReturn/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web', 'adminauth', 'permission'],
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'],
     'namespace' => "Mage2\OrderReturn\Controllers\Admin"], function () {
 
     Route::get('/admin/order-return/get-data', ['as' => 'admin.order-return.data-grid-table.get-data',
@@ -44,12 +44,12 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\OrderReturn\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\OrderReturn\Controllers"], function () {
 
 });
 
 
-Route::group(['middleware' => ['web', 'frontauth'], 'namespace' => "Mage2\OrderReturn\Controllers"], function () {
+Route::group(['middleware' => ['web', 'frontauth', 'install'], 'namespace' => "Mage2\OrderReturn\Controllers"], function () {
 
 
     //Route::get('/my-account/order-return', ['as' => 'my-account.order-return.index', 'uses' => 'OrderReturnController@index']);
diff --git a/modules/base/Mage2/Page/routes/web.php b/modules/base/Mage2/Page/routes/web.php
index a2a80cb09..89c92f8fd 100644
--- a/modules/base/Mage2/Page/routes/web.php
+++ b/modules/base/Mage2/Page/routes/web.php
@@ -35,7 +35,7 @@
   |
  */
 
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\Page\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\Page\Controllers\Admin"], function () {
 
     Route::get('/admin/page/get-datatable-data', ['as' => 'admin.page.data-grid-table.get-data',
         'uses' => 'PageController@getDataGrid'
@@ -44,7 +44,7 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Page\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Page\Controllers"], function () {
     Route::get('/page/{slug}', ['as' => 'page.show',
         'uses' => 'PageController@show'
     ]);
diff --git a/modules/base/Mage2/Paypal/routes/web.php b/modules/base/Mage2/Paypal/routes/web.php
index 949220ecc..0400d2a39 100644
--- a/modules/base/Mage2/Paypal/routes/web.php
+++ b/modules/base/Mage2/Paypal/routes/web.php
@@ -35,11 +35,11 @@
   |
  */
 
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\Paypal\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\Paypal\Controllers\Admin"], function () {
     Route::get('/admin/configuration/paypal', ['as' => 'admin.configuration.paypal', 'uses' => 'ConfigurationController@getConfiguration']);
 });
 
-Route::group(['middleware' => ['web', 'frontauth'], 'namespace' => "Mage2\Paypal\Controllers"], function () {
+Route::group(['middleware' => ['web', 'frontauth', 'install'], 'namespace' => "Mage2\Paypal\Controllers"], function () {
     Route::get('/checkout/paypal/store', ['as' => 'paypal.store', 'uses' => 'PaypalController@store']);
     Route::get('/checkout/paypal/cancel', ['as' => 'paypal.cancel', 'uses' => 'PaypalController@cancel']);
 });
diff --git a/modules/base/Mage2/Product/routes/web.php b/modules/base/Mage2/Product/routes/web.php
index e1e169499..01825c803 100644
--- a/modules/base/Mage2/Product/routes/web.php
+++ b/modules/base/Mage2/Product/routes/web.php
@@ -35,7 +35,7 @@
   |
  */
 
-Route::group(['middleware' => ['web', 'adminauth'], 'namespace' => "Mage2\Product\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'install'], 'namespace' => "Mage2\Product\Controllers\Admin"], function () {
 
     Route::resource('/admin/product', 'ProductController', ['as' => 'admin']);
 
@@ -51,7 +51,7 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Product\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Product\Controllers"], function () {
 
     Route::get('/product/{slug}', ['as' => 'product.view', 'uses' => 'ProductViewController@view']);
 
diff --git a/modules/base/Mage2/Review/routes/web.php b/modules/base/Mage2/Review/routes/web.php
index 5ec11fb3c..c67022136 100644
--- a/modules/base/Mage2/Review/routes/web.php
+++ b/modules/base/Mage2/Review/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\Review\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\Review\Controllers\Admin"], function () {
 
 
     Route::get('/admin/review/get-datatable-data', ['as' => 'admin.review.data-grid-table.get-data',
@@ -44,7 +44,7 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\eview\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\eview\Controllers"], function () {
 
     Route::resource('/review', 'ReviewController');
 
diff --git a/modules/base/Mage2/Sale/routes/web.php b/modules/base/Mage2/Sale/routes/web.php
index 56338b960..daadddbc5 100644
--- a/modules/base/Mage2/Sale/routes/web.php
+++ b/modules/base/Mage2/Sale/routes/web.php
@@ -35,7 +35,7 @@
   |
  */
 
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\Sale\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\Sale\Controllers\Admin"], function () {
 
     Route::get('/admin/sale/gift-coupon/get-data', ['as' => 'admin.sale.gift-coupon.data-grid-table.get-data',
         'uses' => 'GiftCouponController@getDataGrid'
@@ -51,7 +51,7 @@
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Sale\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Sale\Controllers"], function () {
     Route::post('/sale/get-code-discount', ['as' => 'get.code-discount', 'uses' => 'GiftCouponController@getCodeDiscount']);
 
 });
diff --git a/modules/base/Mage2/System/routes/web.php b/modules/base/Mage2/System/routes/web.php
index b9f213aee..95e61b50e 100644
--- a/modules/base/Mage2/System/routes/web.php
+++ b/modules/base/Mage2/System/routes/web.php
@@ -36,12 +36,12 @@
   |
  */
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\System\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\System\Controllers"], function () {
     Route::get('/', ['as' => 'home', 'uses' => 'HomeController@index']);
 });
 
 
-Route::group(['middleware' => ['web', 'adminauth', 'permission'], 'namespace' => "Mage2\System\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'permission', 'install'], 'namespace' => "Mage2\System\Controllers\Admin"], function () {
 
     Route::get('/admin/configuration/general', ['as' => 'admin.configuration.general', 'uses' => 'ConfigurationController@getGeneralConfiguration']);
 
diff --git a/modules/base/Mage2/TaxClass/routes/web.php b/modules/base/Mage2/TaxClass/routes/web.php
index 94ffe663c..bfb0d5fc4 100644
--- a/modules/base/Mage2/TaxClass/routes/web.php
+++ b/modules/base/Mage2/TaxClass/routes/web.php
@@ -34,14 +34,14 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web', 'adminauth'], 'namespace' => "Mage2\TaxClass\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'install'], 'namespace' => "Mage2\TaxClass\Controllers\Admin"], function () {
 
     Route::resource('/admin/tax-rule', 'TaxRuleController', ['as' => 'admin']);
     Route::get('/admin/configuration/tax-class', ['as' => 'admin.configuration.tax-class', 'uses' => 'ConfigurationController@getConfiguration']);
 });
 
 
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\TaxClass\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\TaxClass\Controllers"], function () {
 
     Route::post('/tax-calculation', ['as' => 'tax.calculation', 'uses' => 'TaxRuleController@getTaxAmount']);
 });
\ No newline at end of file
diff --git a/modules/base/Mage2/User/routes/web.php b/modules/base/Mage2/User/routes/web.php
index bcff75707..6c7739730 100644
--- a/modules/base/Mage2/User/routes/web.php
+++ b/modules/base/Mage2/User/routes/web.php
@@ -34,7 +34,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\User\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\User\Controllers\Admin"], function () {
 
     Route::get('/admin/login', ['as' => 'admin.login', 'uses' => 'LoginController@showLoginForm']);
     Route::post('/admin/login', ['as' => 'admin.login.post', 'uses' => 'LoginController@login']);
@@ -51,7 +51,7 @@
 });
 
 
-Route::group(['middleware' => ['web', 'adminauth'], 'namespace' => "Mage2\User\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'install'], 'namespace' => "Mage2\User\Controllers\Admin"], function () {
 
     Route::get('/admin/admin-user/get-datatable-data', ['as' => 'admin.user.data-grid-table.get-data',
         'uses' => 'AdminUserController@getDataGrid'
@@ -63,7 +63,7 @@
 
 
 });
-Route::group(['middleware' => ['web', 'frontauth'], 'namespace' => "Mage2\User\Controllers"], function () {
+Route::group(['middleware' => ['web', 'frontauth', 'install'], 'namespace' => "Mage2\User\Controllers"], function () {
 
     Route::get('/my-account', ['as' => 'my-account.home', 'uses' => 'MyAccountController@home']);
     Route::get('/my-account/edit', ['as' => 'my-account.edit', 'uses' => 'MyAccountController@edit']);
diff --git a/modules/base/Mage2/Wishlist/routes/web.php b/modules/base/Mage2/Wishlist/routes/web.php
index a16e8a7d8..08ba3880b 100644
--- a/modules/base/Mage2/Wishlist/routes/web.php
+++ b/modules/base/Mage2/Wishlist/routes/web.php
@@ -35,12 +35,12 @@
   |
  */
 
-Route::group(['middleware' => ['web', 'adminauth'], 'namespace' => "Mage2\Wishlist\Controllers\Admin"], function () {
+Route::group(['middleware' => ['web', 'adminauth', 'install'], 'namespace' => "Mage2\Wishlist\Controllers\Admin"], function () {
 
 });
 
 
-Route::group(['middleware' => ['web', 'frontauth'], 'namespace' => "Mage2\Wishlist\Controllers"], function () {
+Route::group(['middleware' => ['web', 'frontauth', 'install'], 'namespace' => "Mage2\Wishlist\Controllers"], function () {
 
     Route::get('/wishlist/add/{slug}', ['as' => 'wishlist.add', 'uses' => 'WishlistController@add']);
     Route::get('/my-account/wishlist', ['as' => 'wishlist.list', 'uses' => 'WishlistController@mylist']);
diff --git a/modules/community/Mage2/ContactUs/routes/web.php b/modules/community/Mage2/ContactUs/routes/web.php
index 16c045e86..30cfad4d2 100644
--- a/modules/community/Mage2/ContactUs/routes/web.php
+++ b/modules/community/Mage2/ContactUs/routes/web.php
@@ -35,7 +35,7 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\ContactUs\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\ContactUs\Controllers"], function () {
     Route::get('/contact-us', ['as' => 'contact-us.get', 'uses' => 'ContactUsController@getContactUs']);
     Route::post('/contact-us', ['as' => 'contact-us.post', 'uses' => 'ContactUsController@postContactUs']);
 });
diff --git a/modules/community/Mage2/Feature/routes/web.php b/modules/community/Mage2/Feature/routes/web.php
index 4759a6ba1..8391001dd 100644
--- a/modules/community/Mage2/Feature/routes/web.php
+++ b/modules/community/Mage2/Feature/routes/web.php
@@ -34,6 +34,6 @@
   | and give it the controller to call when that URI is requested.
   |
  */
-Route::group(['middleware' => ['web'], 'namespace' => "Mage2\Feature\Controllers"], function () {
+Route::group(['middleware' => ['web', 'install'], 'namespace' => "Mage2\Feature\Controllers"], function () {
     Route::get('/', ['as' => 'home', 'uses' => 'HomeController@index']);
 });