Independent Auth Guard for Statamic (statamic#3143)

config/users.php

@@ -89,4 +89,20 @@
 
     'database' => config('database.default'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Guards
+    |--------------------------------------------------------------------------
+    |
+    | By default, Statamic will use the `web` authentication guard. However,
+    | if you want to run Statamic alongside the default Laravel auth
+    | guard, you can configure that for your cp and/or frontend.
+    |
+    */
+
+    'guards' => [
+        'cp' => 'web',
+        'web' => 'web',
+    ],
+
 ];

routes/cp.php

@@ -11,6 +11,8 @@
 
     Route::get('password/reset', 'ForgotPasswordController@showLinkRequestForm')->name('password.request');
     Route::post('password/email', 'ForgotPasswordController@sendResetLinkEmail')->name('password.email');
+    Route::get('password/reset/{token}', 'ResetPasswordController@showResetForm')->name('password.reset');
+    Route::post('password/reset', 'ResetPasswordController@reset')->name('password.reset.action');
 
     Route::get('token', 'CsrfTokenController')->name('token');
     Route::get('extend', 'ExtendSessionController')->name('extend');

routes/web.php

@@ -29,15 +29,17 @@
         Route::get('protect/password', '\Statamic\Auth\Protect\Protectors\Password\Controller@show')->name('protect.password.show');
         Route::post('protect/password', '\Statamic\Auth\Protect\Protectors\Password\Controller@store')->name('protect.password.store');
 
-        Route::group(['prefix' => 'auth'], function () {
+        Route::group(['prefix' => 'auth', 'middleware' => [\Statamic\Http\Middleware\AuthGuard::class]], function () {
             Route::post('login', 'UserController@login')->name('login');
             Route::get('logout', 'UserController@logout')->name('logout');
             Route::post('register', 'UserController@register')->name('register');
 
             Route::post('password/email', 'ForgotPasswordController@sendResetLinkEmail')->name('password.email');
             Route::get('password/reset/{token}', 'ResetPasswordController@showResetForm')->name('password.reset');
             Route::post('password/reset', 'ResetPasswordController@reset')->name('password.reset.action');
+        });
 
+        Route::group(['prefix' => 'auth', 'middleware' => [\Statamic\Http\Middleware\CP\AuthGuard::class]], function () {
             Route::get('activate/{token}', 'ActivateAccountController@showResetForm')->name('account.activate');
             Route::post('activate', 'ActivateAccountController@reset')->name('account.activate.action');
         });

src/Auth/Passwords/PasswordReset.php

@@ -8,12 +8,17 @@ class PasswordReset
     const BROKER_ACTIVATIONS = 'activations';
 
     protected static $url;
+    protected static $route;
     protected static $redirect;
 
     public static function url($token, $broker)
     {
         $route = $broker === self::BROKER_ACTIVATIONS ? 'statamic.account.activate' : 'statamic.password.reset';
 
+        if (static::$route) {
+            $route = static::$route;
+        }
+
         $defaultUrl = route($route, $token);
 
         $url = static::$url
@@ -36,6 +41,11 @@ public static function resetFormUrl($url)
         static::$url = $url;
     }
 
+    public static function resetFormRoute($route)
+    {
+        static::$route = $route;
+    }
+
     public static function redirectAfterReset($redirect)
     {
         static::$redirect = $redirect;

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

@@ -3,6 +3,7 @@
 namespace Statamic\Http\Controllers\CP\Auth;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Password;
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Http\Controllers\ForgotPasswordController as Controller;
 use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
@@ -16,8 +17,20 @@ public function __construct()
 
     public function sendResetLinkEmail(Request $request)
     {
+        PasswordReset::resetFormRoute('statamic.cp.password.reset');
         PasswordReset::redirectAfterReset(route('statamic.cp.index'));
 
         return parent::sendResetLinkEmail($request);
     }
+
+    public function broker()
+    {
+        $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
+
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
+        return Password::broker($broker);
+    }
 }

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Auth;
+
+use Illuminate\Support\Facades\Password;
+use Statamic\Auth\Passwords\PasswordReset;
+use Statamic\Http\Controllers\ResetPasswordController as Controller;
+use Statamic\Http\Middleware\CP\RedirectIfAuthorized;
+
+class ResetPasswordController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware(RedirectIfAuthorized::class);
+    }
+
+    public function broker()
+    {
+        $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
+
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
+        return Password::broker($broker);
+    }
+
+    protected function resetFormAction()
+    {
+        return route('statamic.cp.password.reset.action');
+    }
+}

src/Http/Controllers/ForgotPasswordController.php

@@ -38,6 +38,10 @@ public function broker()
     {
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
 
+        if (is_array($broker)) {
+            $broker = $broker['web'];
+        }
+
         return Password::broker($broker);
     }
 }

src/Http/Controllers/ResetPasswordController.php

@@ -61,6 +61,10 @@ public function broker()
     {
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
 
+        if (is_array($broker)) {
+            $broker = $broker['web'];
+        }
+
         return Password::broker($broker);
     }
 }

src/Http/Middleware/AuthGuard.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Statamic\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+class AuthGuard
+{
+    public function handle($request, Closure $next)
+    {
+        Auth::shouldUse(config('statamic.users.guards.web', 'web'));
+
+        return $next($request);
+    }
+}

src/Http/Middleware/CP/AuthGuard.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Statamic\Http\Middleware\CP;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+class AuthGuard
+{
+    public function handle($request, Closure $next)
+    {
+        Auth::shouldUse(config('statamic.users.guards.cp', 'web'));
+
+        return $next($request);
+    }
+}

src/Providers/AppServiceProvider.php

@@ -133,6 +133,7 @@ protected function registerMiddlewareGroup()
         $this->app->make(Router::class)->middlewareGroup('statamic.web', [
             \Statamic\Http\Middleware\StacheLock::class,
             \Statamic\Http\Middleware\Localize::class,
+            \Statamic\Http\Middleware\AuthGuard::class,
             \Statamic\StaticCaching\Middleware\Cache::class,
         ]);
     }

src/Providers/CpServiceProvider.php

@@ -74,6 +74,7 @@ protected function registerMiddlewareGroups()
             \Illuminate\Foundation\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \Statamic\Http\Middleware\CP\ContactOutpost::class,
+            \Statamic\Http\Middleware\CP\AuthGuard::class,
         ]);
 
         $router->middlewareGroup('statamic.cp.authenticated', [