[Enhancement] Allows users and admins to have separate sessions

src/BaseServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Backpack\Base;
 
+use Config;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Route;
@@ -22,19 +23,30 @@ class BaseServiceProvider extends ServiceProvider
      */
     public function boot(\Illuminate\Routing\Router $router)
     {
+        // -------------
         // LOAD THE VIEWS
-        // - first the published views (in case they have any changes)
+        // -------------
+        // first the published views (in case they have any changes)
         $this->loadViewsFrom(resource_path('views/vendor/backpack/base'), 'backpack');
-        // - then the stock views that come with the package, in case a published view might be missing
+        // then the stock views that come with the package, in case a published view might be missing
         $this->loadViewsFrom(realpath(__DIR__.'/resources/views'), 'backpack');
 
         $this->loadTranslationsFrom(realpath(__DIR__.'/resources/lang'), 'backpack');
 
         // use the vendor configuration file as fallback
         $this->mergeConfigFrom(
-            __DIR__.'/config/backpack/base.php', 'backpack.base'
+            __DIR__.'/config/backpack/base.php',
+            'backpack.base'
         );
 
+        // -------------
+        // AUTH GUARD CONFIGURATION
+        // -------------
+        $appAuthGuards = Config::get('auth.guards');
+        $backpackAuthGuard = Config::get('backpack.base.admin_guard');
+        $appAuthGuards[$backpackAuthGuard['name']] = $backpackAuthGuard;
+        Config::set('auth.guards', $appAuthGuards);
+
         $this->setupRoutes($this->app->router);
 
         // -------------
@@ -52,6 +64,11 @@ public function boot(\Illuminate\Routing\Router $router)
         $this->publishes([__DIR__.'/public' => public_path('vendor/backpack')], 'public');
         // publish public AdminLTE assets
         $this->publishes([base_path('vendor/almasaeed2010/adminlte') => public_path('vendor/adminlte')], 'adminlte');
+
+        // -------------
+        // HELPERS
+        // -------------
+        require_once __DIR__.'/helpers.php';
     }
 
     /**
@@ -64,7 +81,11 @@ public function boot(\Illuminate\Routing\Router $router)
     public function setupRoutes(Router $router)
     {
         // register the 'admin' middleware
-        $router->middleware('admin', app\Http\Middleware\Admin::class);
+        $router->middleware('backpack.base.admin', app\Http\Middleware\BackpackBaseAdmin::class);
+
+        if (config('backpack.base.separate_admin_session')) {
+            $router->middleware('backpack.admin.guard', app\Http\Middleware\BackpackAdminGuard::class);
+        }
 
         $router->group(['namespace' => 'Backpack\Base\app\Http\Controllers'], function ($router) {
             Route::group(

src/app/Http/Controllers/AdminController.php

@@ -11,7 +11,7 @@ class AdminController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('admin');
+        $this->middleware(backpack_middleware());
     }
 
     /**

src/app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -29,7 +29,12 @@ class ForgotPasswordController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest');
+        $this->middleware(backpack_middleware('guest'), ['except' => 'logout']);
+    }
+
+    public function guard()
+    {
+        return \Auth::guard(backpack_guard());
     }
 
     // -------------------------------------------------------

src/app/Http/Controllers/Auth/LoginController.php

@@ -31,7 +31,7 @@ class LoginController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware(backpack_middleware('guest'), ['except' => 'logout']);
 
         // ----------------------------------
         // Use the admin prefix in all routes
@@ -50,6 +50,11 @@ public function __construct()
         // ----------------------------------
     }
 
+    public function guard()
+    {
+        return \Auth::guard(backpack_guard());
+    }
+
     // -------------------------------------------------------
     // Laravel overwrites for loading backpack views
     // -------------------------------------------------------

src/app/Http/Controllers/Auth/RegisterController.php

@@ -30,13 +30,18 @@ class RegisterController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest');
+        $this->middleware(backpack_middleware('guest'), ['except' => 'logout']);
 
         // Where to redirect users after login / registration.
         $this->redirectTo = property_exists($this, 'redirectTo') ? $this->redirectTo
             : config('backpack.base.route_prefix', 'dashboard');
     }
 
+    public function guard()
+    {
+        return \Auth::guard(backpack_guard());
+    }
+
     /**
      * Get a validator for an incoming registration request.
      *

src/app/Http/Controllers/Auth/ResetPasswordController.php

@@ -30,12 +30,17 @@ class ResetPasswordController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest');
+        $this->middleware(backpack_middleware('guest'), ['except' => 'logout']);
 
         // where to redirect after password was reset
         $this->redirectTo = property_exists($this, 'redirectTo') ? $this->redirectTo : config('backpack.base.route_prefix', 'admin').'/dashboard';
     }
 
+    public function guard()
+    {
+        return \Auth::guard(backpack_guard());
+    }
+
     // -------------------------------------------------------
     // Laravel overwrites for loading backpack views
     // -------------------------------------------------------

src/app/Http/Middleware/BackpackAdminGuard.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Backpack\Base\app\Http\Middleware;
+
+use Closure;
+
+class BackpackAdminGuard
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (config('backpack.base.separate_admin_session')) {
+            if (!\Auth::guard(config('backpack.base.admin_guard.name'))->check()) {
+                if ($request->ajax() || $request->wantsJson()) {
+                    return response(trans('backpack::base.unauthorized'), 401);
+                }
+
+                return redirect(config('backpack.base.route_prefix').'/login');
+            }
+        }
+
+        return $next($request);
+    }
+}

src/app/Http/Middleware/Admin.php → src/app/Http/Middleware/BackpackBaseAdmin.php

@@ -5,7 +5,7 @@
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
-class Admin
+class BackpackBaseAdmin
 {
     /**
      * Handle an incoming request.

src/config/backpack/base.php

@@ -75,4 +75,12 @@
     // Fully qualified namespace of the User model
     'user_model_fqn' => '\App\User',
 
+    'separate_admin_session' => false,
+
+    'admin_guard' => [
+        'name'     => 'admin',
+        'driver'   => 'session',
+        'provider' => 'users',
+    ],
+
 ];

src/helpers.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Returns the name of the middleware
+ * defined by the application config
+ * if a param is passed in, it will chain
+ * the backpack middelware to it.
+ * e.g guest:backpack.admin.
+ */
+if (!function_exists('backpack_middleware')) {
+    function backpack_middleware($chainedWith = null)
+    {
+        if (config('backpack.base.separate_admin_session')) {
+            $middlware = config('backpack.base.admin_guard.name');
+        } else {
+            $middlware = 'backpack.base.admin';
+        }
+
+        if ($chainedWith && config('backpack.base.separate_admin_session')) {
+            $middlware = $chainedWith.':'.$middlware;
+        } elseif ($chainedWith) {
+            $middleware = $chainedWith;
+        }
+
+        return $middlware;
+    }
+}
+
+/*
+ * Returns the name of the guard defined
+ * by the application config
+ */
+if (!function_exists('backpack_guard')) {
+    function backpack_guard()
+    {
+        if (config('backpack.base.separate_admin_session')) {
+            $guard = config('backpack.base.admin_guard.name');
+        } else {
+            $guard = null;
+        }
+
+        return $guard;
+    }
+}
+
+/*
+ * Returns the user instance if it exists
+ * of the currently authenticated admin
+ * based off the defined guard.
+ */
+if (!function_exists('backpack_admin')) {
+    function backpack_admin()
+    {
+        return \Auth::guard(backpack_guard())->user();
+    }
+}
+
+/*
+ * Returns back a user instance without
+ * the admin guard, however allows you
+ * to pass in a custom guard if you like.
+ */
+if (!function_exists('backpack_user')) {
+    function backpack_user($guard = null)
+    {
+        return \Auth::guard($guard)->user();
+    }
+}

src/resources/views/inc/menu.blade.php

@@ -19,7 +19,7 @@
 
       <!-- <li><a href="{{ url('/') }}"><i class="fa fa-home"></i> <span>Home</span></a></li> -->
 
-        @if (Auth::guest())
+        @if (!backpack_admin())
             <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/login') }}">{{ trans('backpack::base.login') }}</a></li>
             @if (config('backpack.base.registration_open'))
             <li><a href="{{ url(config('backpack.base.route_prefix', 'admin').'/register') }}">{{ trans('backpack::base.register') }}</a></li>

src/resources/views/inc/sidebar.blade.php

@@ -1,15 +1,15 @@
-@if (Auth::check())
+@if (backpack_admin())
     <!-- Left side column. contains the sidebar -->
     <aside class="main-sidebar">
       <!-- sidebar: style can be found in sidebar.less -->
       <section class="sidebar">
         <!-- Sidebar user panel -->
         <div class="user-panel">
           <div class="pull-left image">
-            <img src="https://placehold.it/160x160/00a65a/ffffff/&text={{ mb_substr(Auth::user()->name, 0, 1) }}" class="img-circle" alt="User Image">
+            <img src="https://placehold.it/160x160/00a65a/ffffff/&text={{ mb_substr(backpack_admin()->name, 0, 1) }}" class="img-circle" alt="User Image">
           </div>
           <div class="pull-left info">
-            <p>{{ Auth::user()->name }}</p>
+            <p>{{ backpack_admin()->name }}</p>
             <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
           </div>
         </div>