Skip to content

feat: redirection customization #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions config/fortify.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
11 changes: 11 additions & 0 deletions src/Fortify.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Laravel\Fortify\Fortify;

class EmailVerificationNotificationController extends Controller
{
Expand All @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/Http/Controllers/EmailVerificationPromptController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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);
}
}
5 changes: 3 additions & 2 deletions src/Http/Controllers/VerifyEmailController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()) {
Expand All @@ -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');
}
}
3 changes: 1 addition & 2 deletions src/Http/Responses/FailedPasswordConfirmationResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Laravel\Fortify\Http\Responses;

use Illuminate\Http\Response;
use Illuminate\Validation\ValidationException;
use Laravel\Fortify\Contracts\FailedPasswordConfirmationResponse as FailedPasswordConfirmationResponseContract;

Expand All @@ -24,6 +23,6 @@ public function toResponse($request)
]);
}

return redirect()->back()->withErrors(['password' => $message]);
return back()->withErrors(['password' => $message]);
}
}
6 changes: 3 additions & 3 deletions src/Http/Responses/FailedPasswordResetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)]);
}
}
3 changes: 2 additions & 1 deletion src/Http/Responses/LoginResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Laravel\Fortify\Http\Responses;

use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
use Laravel\Fortify\Fortify;

class LoginResponse implements LoginResponseContract
{
Expand All @@ -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'));
}
}
3 changes: 2 additions & 1 deletion src/Http/Responses/LogoutResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Http\JsonResponse;
use Laravel\Fortify\Contracts\LogoutResponse as LogoutResponseContract;
use Laravel\Fortify\Fortify;

class LogoutResponse implements LogoutResponseContract
{
Expand All @@ -17,6 +18,6 @@ public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 204)
: redirect('/');
: redirect(Fortify::redirects('logout', '/'));
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/PasswordConfirmedResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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'));
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/RegisterResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -18,6 +18,6 @@ public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 201)
: redirect()->intended(config('fortify.home'));
: redirect()->intended(Fortify::redirects('register'));
}
}
3 changes: 2 additions & 1 deletion src/Http/Responses/TwoFactorLoginResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Http\JsonResponse;
use Laravel\Fortify\Contracts\TwoFactorLoginResponse as TwoFactorLoginResponseContract;
use Laravel\Fortify\Fortify;

class TwoFactorLoginResponse implements TwoFactorLoginResponseContract
{
Expand All @@ -17,6 +18,6 @@ public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 204)
: redirect()->intended(config('fortify.home'));
: redirect()->intended(Fortify::redirects('login'));
}
}