feat: redirection customization (#298)

* feat: redirection customization

* fix redirects default

* formatting

* fix

Co-authored-by: Taylor Otwell <[email protected]>

Author: ricardogobbosouza

config/fortify.php

@@ -15,6 +15,13 @@
     'limiters' => [
         'login' => null,
     ],
+    'redirects' => [
+        'login' => null,
+        'logout' => null,
+        'password-confirmation' => null,
+        'register' => null,
+        'email-verification' => null,
+    ],
     'features' => [
         Features::registration(),
         Features::resetPasswords(),

src/Fortify.php

@@ -65,6 +65,17 @@ public static function email()
         return config('fortify.email', 'email');
     }
 
+    /**
+     * Get a completion redirect path for a specific feature.
+     *
+     * @param  string  $redirect
+     * @return string
+     */
+    public static function redirects(string $redirect, $default = null)
+    {
+        return config('fortify.redirects.'.$redirect) ?? $default ?? config('fortify.home');
+    }
+
     /**
      * Register the views for Fortify using conventional names under the given namespace.
      *

src/Http/Controllers/EmailVerificationNotificationController.php

@@ -5,6 +5,7 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Laravel\Fortify\Fortify;
 
 class EmailVerificationNotificationController extends Controller
 {
@@ -19,7 +20,7 @@ public function store(Request $request)
         if ($request->user()->hasVerifiedEmail()) {
             return $request->wantsJson()
                         ? new JsonResponse('', 204)
-                        : redirect()->intended(config('fortify.home'));
+                        : redirect()->intended(Fortify::redirects('email-verification'));
         }
 
         $request->user()->sendEmailVerificationNotification();

src/Http/Controllers/EmailVerificationPromptController.php

@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Laravel\Fortify\Contracts\VerifyEmailViewResponse;
+use Laravel\Fortify\Fortify;
 
 class EmailVerificationPromptController extends Controller
 {
@@ -17,7 +18,7 @@ class EmailVerificationPromptController extends Controller
     public function __invoke(Request $request)
     {
         return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(config('fortify.home'))
+                    ? redirect()->intended(Fortify::redirects('email-verification'))
                     : app(VerifyEmailViewResponse::class);
     }
 }

src/Http/Controllers/VerifyEmailController.php

@@ -5,6 +5,7 @@
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller;
+use Laravel\Fortify\Fortify;
 use Laravel\Fortify\Http\Requests\VerifyEmailRequest;
 
 class VerifyEmailController extends Controller
@@ -20,7 +21,7 @@ public function __invoke(VerifyEmailRequest $request)
         if ($request->user()->hasVerifiedEmail()) {
             return $request->wantsJson()
                 ? new JsonResponse('', 204)
-                : redirect()->intended(config('fortify.home').'?verified=1');
+                : redirect()->intended(Fortify::redirects('email-verification').'?verified=1');
         }
 
         if ($request->user()->markEmailAsVerified()) {
@@ -29,6 +30,6 @@ public function __invoke(VerifyEmailRequest $request)
 
         return $request->wantsJson()
             ? new JsonResponse('', 202)
-            : redirect()->intended(config('fortify.home').'?verified=1');
+            : redirect()->intended(Fortify::redirects('email-verification').'?verified=1');
     }
 }

src/Http/Responses/FailedPasswordConfirmationResponse.php

@@ -2,7 +2,6 @@
 
 namespace Laravel\Fortify\Http\Responses;
 
-use Illuminate\Http\Response;
 use Illuminate\Validation\ValidationException;
 use Laravel\Fortify\Contracts\FailedPasswordConfirmationResponse as FailedPasswordConfirmationResponseContract;
 
@@ -24,6 +23,6 @@ public function toResponse($request)
             ]);
         }
 
-        return redirect()->back()->withErrors(['password' => $message]);
+        return back()->withErrors(['password' => $message]);
     }
 }

src/Http/Responses/FailedPasswordResetResponse.php

@@ -39,8 +39,8 @@ public function toResponse($request)
             ]);
         }
 
-        return redirect()->back()
-                    ->withInput($request->only('email'))
-                    ->withErrors(['email' => trans($this->status)]);
+        return back()
+                ->withInput($request->only('email'))
+                ->withErrors(['email' => trans($this->status)]);
     }
 }

src/Http/Responses/LoginResponse.php

@@ -3,6 +3,7 @@
 namespace Laravel\Fortify\Http\Responses;
 
 use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
+use Laravel\Fortify\Fortify;
 
 class LoginResponse implements LoginResponseContract
 {
@@ -16,6 +17,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
                     ? response()->json(['two_factor' => false])
-                    : redirect()->intended(config('fortify.home'));
+                    : redirect()->intended(Fortify::redirects('login'));
     }
 }

src/Http/Responses/LogoutResponse.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\JsonResponse;
 use Laravel\Fortify\Contracts\LogoutResponse as LogoutResponseContract;
+use Laravel\Fortify\Fortify;
 
 class LogoutResponse implements LogoutResponseContract
 {
@@ -17,6 +18,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
                     ? new JsonResponse('', 204)
-                    : redirect('/');
+                    : redirect(Fortify::redirects('logout', '/'));
     }
 }

src/Http/Responses/PasswordConfirmedResponse.php

@@ -3,8 +3,8 @@
 namespace Laravel\Fortify\Http\Responses;
 
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
 use Laravel\Fortify\Contracts\PasswordConfirmedResponse as PasswordConfirmedResponseContract;
+use Laravel\Fortify\Fortify;
 
 class PasswordConfirmedResponse implements PasswordConfirmedResponseContract
 {
@@ -18,6 +18,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
                     ? new JsonResponse('', 201)
-                    : redirect()->intended(config('fortify.home'));
+                    : redirect()->intended(Fortify::redirects('password-confirmation'));
     }
 }

src/Http/Responses/RegisterResponse.php

@@ -3,8 +3,8 @@
 namespace Laravel\Fortify\Http\Responses;
 
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
 use Laravel\Fortify\Contracts\RegisterResponse as RegisterResponseContract;
+use Laravel\Fortify\Fortify;
 
 class RegisterResponse implements RegisterResponseContract
 {
@@ -18,6 +18,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
                     ? new JsonResponse('', 201)
-                    : redirect()->intended(config('fortify.home'));
+                    : redirect()->intended(Fortify::redirects('register'));
     }
 }

src/Http/Responses/TwoFactorLoginResponse.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Http\JsonResponse;
 use Laravel\Fortify\Contracts\TwoFactorLoginResponse as TwoFactorLoginResponseContract;
+use Laravel\Fortify\Fortify;
 
 class TwoFactorLoginResponse implements TwoFactorLoginResponseContract
 {
@@ -17,6 +18,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
                     ? new JsonResponse('', 204)
-                    : redirect()->intended(config('fortify.home'));
+                    : redirect()->intended(Fortify::redirects('login'));
     }
 }