build version 400

app/Http/Middleware/AdminMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
 use Auth;
@@ -16,7 +17,7 @@ class AdminMiddleware
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if (Auth::guard($guard)->guest() || !Auth::user()->isAdmin()) {
+        if (Auth::guard($guard)->guest() || !Auth::user()->isSuperAdminOrAdmin()) {
             if ($request->ajax() || $request->wantsJson()) {
                 return response('Unauthorized.', 401);
             } else {

app/Http/Middleware/Authenticate.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Middleware;
+namespace Crater\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
 

app/Http/Middleware/ConfigMiddleware.php

@@ -2,7 +2,8 @@
 namespace Crater\Http\Middleware;
 
 use Closure;
-use Crater\CompanySetting;
+use Crater\Models\CompanySetting;
+use Crater\Models\FileDisk;
 
 class ConfigMiddleware
 {
@@ -15,12 +16,24 @@ class ConfigMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (\Storage::disk('local')->has('installed')) {
+        if (\Storage::disk('local')->has('database_created')) {
             $setting = CompanySetting::getSetting('time_zone', $request->header('company'));
+
             $timezone = config('app.timezone');
+
             if ($setting && $setting != null && $setting != $timezone) {
                 config(['app.timezone' => $setting]);
             }
+
+            if($request->has('file_disk_id')) {
+                $file_disk = FileDisk::find($request->file_disk_id);
+            } else {
+                $file_disk = FileDisk::whereSetAsDefault(true)->first();
+            }
+
+            if($file_disk) {
+                $file_disk->setConfig();
+            }
         }
 
         return $next($request);

app/Http/Middleware/InstallationMiddleware.php

@@ -3,7 +3,7 @@
 namespace Crater\Http\Middleware;
 
 use Closure;
-use Crater\Setting;
+use Crater\Models\Setting;
 
 class InstallationMiddleware
 {

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,6 +1,8 @@
 <?php
+
 namespace Crater\Http\Middleware;
 
+use Crater\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
@@ -17,7 +19,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/admin');
+            return redirect(RouteServiceProvider::HOME);
         }
 
         return $next($request);

app/Http/Middleware/RedirectIfInstalled.php

@@ -3,7 +3,7 @@
 namespace Crater\Http\Middleware;
 
 use Closure;
-use Crater\Setting;
+use Crater\Models\Setting;
 
 class RedirectIfInstalled
 {
@@ -21,6 +21,7 @@ class RedirectIfInstalled
                 return redirect('login');
             }
         }
+
         return $next($request);
     }
 }

app/Http/Middleware/RedirectIfUnauthorized.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Crater\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class RedirectIfUnauthorized
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next, $guard = null)
+    {
+        if (Auth::guard($guard)->check()) {
+            return $next($request);
+        }
+
+        return redirect('/login');
+    }
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -18,6 +18,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'login'
     ];
 }