Add Exceptions

src/ApiKeyGuard.php

@@ -15,6 +15,7 @@
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Http\Request;
+use Leonis\ApiKeyAuth\Exceptions\ApiKeyAuthException;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 
 class ApiKeyGuard implements Guard
@@ -31,7 +32,7 @@ class ApiKeyGuard implements Guard
     public function __construct(UserProvider $provider, Request $request)
     {
         $this->provider = $provider;
-        $this->request = $request;
+        $this->request  = $request;
     }
 
     /**
@@ -47,30 +48,31 @@ public function user()
 
         $apiKey = $this->getApiKeyInstance();
         if (!$apiKey) {
-            return response()->json([
-                'message' => 'The api key is not exist.',
-            ], 400);
+            throw new ApiKeyAuthException('The api key is not exist.', 400);
         }
 
         $payloads = $this->getPayloads();
 
         $signature = $this->getSignature();
 
         if (!$this->checkSignature($payloads, $apiKey->secret, $signature)) {
-            return response()->json([
-                'message' => 'The signature is invalid.',
-            ], 401);
+            throw new ApiKeyAuthException('The signature is invalid.', 401);
         }
 
         $this->user = $this->provider->retrieveById($apiKey->user_id);
 
+        if (!$this->user) {
+            throw new ApiKeyAuthException('The api key is not exist.', 400);
+        }
+
         return $this->user;
     }
 
     /**
      * Validate a user's credentials.
      *
      * @param array $credentials
+     *
      * @return bool
      */
     public function validate(array $credentials = [])
@@ -128,6 +130,7 @@ public function getSignature()
      * @param string $payloads
      * @param string $secret
      * @param string $signature
+     *
      * @return bool
      */
     public function checkSignature($payloads, $secret, $signature)

src/Exceptions/ApiKeyAuthException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Leonis\ApiKeyAuth\Exceptions;
+
+use Exception;
+
+class ApiKeyAuthException extends Exception
+{
+
+}

src/Middleware/TimeDeviationMiddleware.php

@@ -13,6 +13,7 @@
 
 use Closure;
 use Illuminate\Support\Facades\Validator;
+use Leonis\ApiKeyAuth\Exceptions\ApiKeyAuthException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 class TimeDeviationMiddleware
@@ -21,24 +22,21 @@ class TimeDeviationMiddleware
      * Handle an incoming request.
      *
      * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
     public function handle($request, Closure $next)
     {
-        $timestamp = $request->input('timestamp');
+        $timestamp  = $request->input('timestamp');
         $timeoffset = $request->input('timeoffset');
 
         if ($timestamp === null || $timeoffset === null) {
-            return response()->json([
-                'message' => 'Timestamp and timeoffset is required.',
-            ], 400);
+            throw new ApiKeyAuthException('Timestamp and timeoffset is required.', 400);
         }
 
         if (abs(time() - $timestamp) > $timeoffset) {
-            return response()->json([
-                'message' => 'Request has expired.',
-            ], 400);
+            throw new ApiKeyAuthException('Request has expired.', 400);
         }
 
         return $next($request);