Merge pull request #139 from laravel/valid-json-responses

[2.x] Use proper json responses

Author: taylorotwell

auth-backend/AuthenticatesUsers.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Foundation\Auth;
 
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\ValidationException;
 
@@ -99,7 +99,7 @@ protected function credentials(Request $request)
      * Send the response after the user was authenticated.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     protected function sendLoginResponse(Request $request)
     {
@@ -112,7 +112,7 @@ protected function sendLoginResponse(Request $request)
         }
 
         return $request->wantsJson()
-                    ? new Response('', 204)
+                    ? new JsonResponse([], 204)
                     : redirect()->intended($this->redirectPath());
     }
 
@@ -157,7 +157,7 @@ public function username()
      * Log the user out of the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     public function logout(Request $request)
     {
@@ -172,7 +172,7 @@ public function logout(Request $request)
         }
 
         return $request->wantsJson()
-            ? new Response('', 204)
+            ? new JsonResponse([], 204)
             : redirect('/');
     }
 

auth-backend/ConfirmsPasswords.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Foundation\Auth;
 
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 trait ConfirmsPasswords
 {
@@ -32,7 +32,7 @@ public function confirm(Request $request)
         $this->resetPasswordConfirmationTimeout($request);
 
         return $request->wantsJson()
-                    ? new Response('', 204)
+                    ? new JsonResponse([], 204)
                     : redirect()->intended($this->redirectPath());
     }
 

auth-backend/RegistersUsers.php

@@ -3,8 +3,8 @@
 namespace Illuminate\Foundation\Auth;
 
 use Illuminate\Auth\Events\Registered;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 
 trait RegistersUsers
@@ -25,7 +25,7 @@ public function showRegistrationForm()
      * Handle a registration request for the application.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {
@@ -40,7 +40,7 @@ public function register(Request $request)
         }
 
         return $request->wantsJson()
-                    ? new Response('', 201)
+                    ? new JsonResponse([], 201)
                     : redirect($this->redirectPath());
     }
 

auth-backend/SendsPasswordResetEmails.php

@@ -82,7 +82,9 @@ protected function sendResetLinkResponse(Request $request, $response)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
      */
     protected function sendResetLinkFailedResponse(Request $request, $response)
     {

auth-backend/VerifiesEmails.php

@@ -4,8 +4,8 @@
 
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\Events\Verified;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 trait VerifiesEmails
 {
@@ -15,7 +15,7 @@ trait VerifiesEmails
      * Show the email verification notice.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response|\Illuminate\View\View
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function show(Request $request)
     {
@@ -28,7 +28,7 @@ public function show(Request $request)
      * Mark the authenticated user's email address as verified.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
@@ -44,7 +44,7 @@ public function verify(Request $request)
 
         if ($request->user()->hasVerifiedEmail()) {
             return $request->wantsJson()
-                        ? new Response('', 204)
+                        ? new JsonResponse([], 204)
                         : redirect($this->redirectPath());
         }
 
@@ -57,7 +57,7 @@ public function verify(Request $request)
         }
 
         return $request->wantsJson()
-                    ? new Response('', 204)
+                    ? new JsonResponse([], 204)
                     : redirect($this->redirectPath())->with('verified', true);
     }
 
@@ -76,20 +76,20 @@ protected function verified(Request $request)
      * Resend the email verification notification.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
     public function resend(Request $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
             return $request->wantsJson()
-                        ? new Response('', 204)
+                        ? new JsonResponse([], 204)
                         : redirect($this->redirectPath());
         }
 
         $request->user()->sendEmailVerificationNotification();
 
         return $request->wantsJson()
-                    ? new Response('', 202)
+                    ? new JsonResponse([], 202)
                     : back()->with('resent', true);
     }
 }