Skip to content
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
4 changes: 2 additions & 2 deletions src/Actions/RedirectIfTwoFactorAuthenticatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function twoFactorChallengeResponse($request, $user)
TwoFactorAuthenticationChallenged::dispatch($user);

return $request->wantsJson()
? response()->json(['two_factor' => true])
: redirect()->route('two-factor.login');
? response()->json(['two_factor' => true])
: redirect()->route('two-factor.login');
}
}
4 changes: 2 additions & 2 deletions src/Http/Controllers/ConfirmablePasswordController.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function store(Request $request)
}

return $confirmed
? app(PasswordConfirmedResponse::class)
: app(FailedPasswordConfirmationResponse::class);
? app(PasswordConfirmedResponse::class)
: app(FailedPasswordConfirmationResponse::class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public function store(Request $request)
{
if ($request->user()->hasVerifiedEmail()) {
return $request->wantsJson()
? new JsonResponse('', 204)
: app(RedirectAsIntended::class, ['name' => 'email-verification']);
? new JsonResponse('', 204)
: app(RedirectAsIntended::class, ['name' => 'email-verification']);
}

$request->user()->sendEmailVerificationNotification();
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/EmailVerificationPromptController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class EmailVerificationPromptController extends Controller
public function __invoke(Request $request)
{
return $request->user()->hasVerifiedEmail()
? app(RedirectAsIntended::class, ['name' => 'email-verification'])
: app(VerifyEmailViewResponse::class);
? app(RedirectAsIntended::class, ['name' => 'email-verification'])
: app(VerifyEmailViewResponse::class);
}
}
4 changes: 2 additions & 2 deletions src/Http/Controllers/NewPasswordController.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ function ($user) use ($request) {
// the application's home authenticated view. If there is an error we can
// redirect them back to where they came from with their error message.
return $status == Password::PASSWORD_RESET
? app(PasswordResetResponse::class, ['status' => $status])
: app(FailedPasswordResetResponse::class, ['status' => $status]);
? app(PasswordResetResponse::class, ['status' => $status])
: app(FailedPasswordResetResponse::class, ['status' => $status]);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/PasswordResetLinkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public function store(Request $request): Responsable
);

return $status == Password::RESET_LINK_SENT
? app(SuccessfulPasswordResetLinkRequestResponse::class, ['status' => $status])
: app(FailedPasswordResetLinkRequestResponse::class, ['status' => $status]);
? app(SuccessfulPasswordResetLinkRequestResponse::class, ['status' => $status])
: app(FailedPasswordResetLinkRequestResponse::class, ['status' => $status]);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class EmailVerificationNotificationSentResponse implements EmailVerificationNoti
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 202)
: back()->with('status', Fortify::VERIFICATION_LINK_SENT);
? new JsonResponse('', 202)
: back()->with('status', Fortify::VERIFICATION_LINK_SENT);
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/LoginResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class LoginResponse implements LoginResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? response()->json(['two_factor' => false])
: redirect()->intended(Fortify::redirects('login'));
? response()->json(['two_factor' => false])
: redirect()->intended(Fortify::redirects('login'));
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/LogoutResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class LogoutResponse implements LogoutResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 204)
: redirect(Fortify::redirects('logout', '/'));
? new JsonResponse('', 204)
: 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 @@ -17,7 +17,7 @@ class PasswordConfirmedResponse implements PasswordConfirmedResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 201)
: redirect()->intended(Fortify::redirects('password-confirmation'));
? new JsonResponse('', 201)
: redirect()->intended(Fortify::redirects('password-confirmation'));
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/PasswordResetResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function __construct(string $status)
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse(['message' => trans($this->status)], 200)
: redirect(Fortify::redirects('password-reset', config('fortify.views', true) ? route('login') : null))->with('status', trans($this->status));
? new JsonResponse(['message' => trans($this->status)], 200)
: redirect(Fortify::redirects('password-reset', config('fortify.views', true) ? route('login') : null))->with('status', trans($this->status));
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/ProfileInformationUpdatedResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ProfileInformationUpdatedResponse implements ProfileInformationUpdatedResp
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 200)
: back()->with('status', Fortify::PROFILE_INFORMATION_UPDATED);
? new JsonResponse('', 200)
: back()->with('status', Fortify::PROFILE_INFORMATION_UPDATED);
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/RecoveryCodesGeneratedResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RecoveryCodesGeneratedResponse implements RecoveryCodesGeneratedResponseCo
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 200)
: back()->with('status', Fortify::RECOVERY_CODES_GENERATED);
? new JsonResponse('', 200)
: back()->with('status', Fortify::RECOVERY_CODES_GENERATED);
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/RegisterResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RegisterResponse implements RegisterResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 201)
: redirect()->intended(Fortify::redirects('register'));
? new JsonResponse('', 201)
: redirect()->intended(Fortify::redirects('register'));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function __construct(string $status)
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse(['message' => trans($this->status)], 200)
: back()->with('status', trans($this->status));
? new JsonResponse(['message' => trans($this->status)], 200)
: back()->with('status', trans($this->status));
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/TwoFactorConfirmedResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TwoFactorConfirmedResponse implements TwoFactorConfirmedResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 200)
: back()->with('status', Fortify::TWO_FACTOR_AUTHENTICATION_CONFIRMED);
? new JsonResponse('', 200)
: back()->with('status', Fortify::TWO_FACTOR_AUTHENTICATION_CONFIRMED);
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/TwoFactorDisabledResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TwoFactorDisabledResponse implements TwoFactorLoginResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 200)
: back()->with('status', Fortify::TWO_FACTOR_AUTHENTICATION_DISABLED);
? new JsonResponse('', 200)
: back()->with('status', Fortify::TWO_FACTOR_AUTHENTICATION_DISABLED);
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/TwoFactorEnabledResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TwoFactorEnabledResponse implements TwoFactorLoginResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 200)
: back()->with('status', Fortify::TWO_FACTOR_AUTHENTICATION_ENABLED);
? new JsonResponse('', 200)
: back()->with('status', Fortify::TWO_FACTOR_AUTHENTICATION_ENABLED);
}
}
4 changes: 2 additions & 2 deletions src/Http/Responses/TwoFactorLoginResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TwoFactorLoginResponse implements TwoFactorLoginResponseContract
public function toResponse($request)
{
return $request->wantsJson()
? new JsonResponse('', 204)
: redirect()->intended(Fortify::redirects('login'));
? new JsonResponse('', 204)
: redirect()->intended(Fortify::redirects('login'));
}
}