@@ -97,8 +97,9 @@ |
||
97 | 97 | { |
98 | 98 | $url = $this->redirectUrlAfterLogout($request); |
99 | 99 | |
100 | - if ($request->wantsJson()) |
|
101 | - return new Response(['redirect' => $url]); |
|
100 | + if ($request->wantsJson()) { |
|
101 | + return new Response(['redirect' => $url]); |
|
102 | + } |
|
102 | 103 | |
103 | 104 | return redirect()->to($url); |
104 | 105 | } |
@@ -46,8 +46,9 @@ discard block |
||
46 | 46 | event(new PasswordReset($user)); |
47 | 47 | }); |
48 | 48 | |
49 | - if ($status === Password::PASSWORD_RESET) |
|
50 | - return $this->getSuccessResponse($request, $status); |
|
49 | + if ($status === Password::PASSWORD_RESET) { |
|
50 | + return $this->getSuccessResponse($request, $status); |
|
51 | + } |
|
51 | 52 | |
52 | 53 | return $this->getFailedResponse($request, $status); |
53 | 54 | } |
@@ -82,8 +83,9 @@ discard block |
||
82 | 83 | { |
83 | 84 | $status = trans($status); |
84 | 85 | |
85 | - if ($request->wantsJson()) |
|
86 | - return new JsonResponse(['message' => $status], JsonResponse::HTTP_OK); |
|
86 | + if ($request->wantsJson()) { |
|
87 | + return new JsonResponse(['message' => $status], JsonResponse::HTTP_OK); |
|
88 | + } |
|
87 | 89 | |
88 | 90 | return redirect() |
89 | 91 | ->to($this->getRedirectUrl()) |
@@ -39,13 +39,15 @@ discard block |
||
39 | 39 | */ |
40 | 40 | protected function form(string $view, Request $request = null) |
41 | 41 | { |
42 | - if (is_null($request)) |
|
43 | - $request = request(); |
|
42 | + if (is_null($request)) { |
|
43 | + $request = request(); |
|
44 | + } |
|
44 | 45 | |
45 | - if (is_null($request->session()->get('login.id'))) |
|
46 | - return redirect()->to( |
|
46 | + if (is_null($request->session()->get('login.id'))) { |
|
47 | + return redirect()->to( |
|
47 | 48 | $this->getFailedTwoFactorRedirectUrl($request) |
48 | 49 | ); |
50 | + } |
|
49 | 51 | |
50 | 52 | $request->session()->reflash(); |
51 | 53 | |
@@ -70,8 +72,7 @@ discard block |
||
70 | 72 | if ($code = $request->validRecoveryCode()) { |
71 | 73 | $this->getTwoFactorAuthenticationRepository() |
72 | 74 | ->replaceRecoveryCode($user, $code); |
73 | - } |
|
74 | - elseif ( ! $request->hasValidCode()) { |
|
75 | + } elseif ( ! $request->hasValidCode()) { |
|
75 | 76 | return $this->getFailedTwoFactorLoginResponse($request); |
76 | 77 | } |
77 | 78 | |
@@ -90,8 +91,9 @@ discard block |
||
90 | 91 | */ |
91 | 92 | protected function getTwoFactorLoginResponse(Request $request, $user) |
92 | 93 | { |
93 | - if ($request->wantsJson()) |
|
94 | - return new Response('', Response::HTTP_NO_CONTENT); |
|
94 | + if ($request->wantsJson()) { |
|
95 | + return new Response('', Response::HTTP_NO_CONTENT); |
|
96 | + } |
|
95 | 97 | |
96 | 98 | return redirect()->to($this->getRedirectUrlAfterLogin($request, $user)); |
97 | 99 | } |