Better error handling

Loek van der Linde · Loek van der Linde · commit b006afc5aa5f · 2017-01-17T15:40:32.000+01:00
diff --git a/src/AppBundle/Controller/TokenController.php b/src/AppBundle/Controller/TokenController.php
@@ -2,12 +2,12 @@
 
 namespace AppBundle\Controller;
 
-use AppBundle\Exception\InvalidRequestArgumentException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 
 class TokenController extends Controller
 {
@@ -24,14 +24,14 @@ public function newTokenAction(Request $request)
         $user = $repository->findOneBy(['username' => $username]);
 
         if (is_null($user)) {
-            throw new InvalidRequestArgumentException('User not found', 401);
+            throw new BadCredentialsException('User not found', 401);
         }
 
         $encoder = $this->get('security.password_encoder');
         $passwordValid = $encoder->isPasswordValid($user, $password);
 
         if (!$passwordValid) {
-            throw new InvalidRequestArgumentException('Password invalid', 401);
+            throw new BadCredentialsException('Password invalid', 401);
         }
 
         $tokenEncoder = $this->get('lexik_jwt_authentication.encoder');
diff --git a/src/AppBundle/Security/JwtTokenAuthenticator.php b/src/AppBundle/Security/JwtTokenAuthenticator.php
@@ -53,9 +53,14 @@ public function __construct(JWTEncoderInterface $encoder, EntityManager $em)
      */
     public function start(Request $request, AuthenticationException $authException = null)
     {
-        return new JsonResponse([
-            'error' => 'Auth required',
-        ], 401);
+        $errorMessage = [
+            'error' => [
+                'code' => 401,
+                'message' => $authException->getMessageKey()
+            ]
+        ];
+
+        return new JsonResponse($errorMessage, 401);
     }
 
     /**
