Handle JSON request (#17369)

laravel · Jan 17, 2017 · a0bebba · a0bebba
1 parent c52d031
commit a0bebba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php b/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php
@@ -123,11 +123,15 @@ protected function authenticated(Request $request, $user)
      */
     protected function sendFailedLoginResponse(Request $request)
     {
+        $errors = [$this->username() => trans('auth.failed')];
+
+        if ($request->expectsJson()) {
+            return response()->json($errors, 422);
+        }
+
         return redirect()->back()
             ->withInput($request->only($this->username(), 'remember'))
-            ->withErrors([
-                $this->username() => trans('auth.failed'),
-            ]);
+            ->withErrors($errors);
     }
 
     /**

diff --git a/src/Illuminate/Foundation/Auth/ThrottlesLogins.php b/src/Illuminate/Foundation/Auth/ThrottlesLogins.php
@@ -48,9 +48,15 @@ protected function sendLockoutResponse(Request $request)
 
         $message = Lang::get('auth.throttle', ['seconds' => $seconds]);
 
+        $errors = [$this->username() => $message];
+
+        if ($request->expectsJson()) {
+            return response()->json($errors, 423);
+        }
+
         return redirect()->back()
             ->withInput($request->only($this->username(), 'remember'))
-            ->withErrors([$this->username() => $message]);
+            ->withErrors($errors);
     }
 
     /**