Merge branch 'develop'

app/Http/Kernel.php

@@ -39,7 +39,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            \App\Http\Middleware\ApiHeader::class,
+            'api.header',
             'throttle:60,1',
             'bindings',
         ],
@@ -62,8 +62,6 @@ class Kernel extends HttpKernel
         'role'        => \Spatie\Permission\Middlewares\RoleMiddleware::class,
         'permission'  => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
         'minify'      => \App\Http\Middleware\MinifyHtml::class,
-        'jwt.auth'    => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
-        'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class,
-        'theme'       => \CleaniqueCoders\Themer\Http\Middleware\ThemeLoader::class,
+        'api.header'  => \App\Http\Middleware\ApiHeader::class,
     ];
 }

app/Http/Middleware/ApiHeader.php

@@ -17,7 +17,15 @@ class ApiHeader
     public function handle($request, Closure $next)
     {
         if (config('api.header.accept') != $request->header('Accept')) {
-            return response()->json(['message' => 'Invalid Accept Header'], 400);
+            return response()->api(null, 'Invalid Accept Header', false, 400);
+        }
+
+        if (config('api.version') != $request->header('Version')) {
+            return response()->api(null, 'Missing API Version', false, 400);
+
+            if(!in_array($request->header('Version'), config('api.versions'))) {
+                return response()->api(null, 'Invalid API Version', false, 400);
+            }
         }
 
         return $next($request);

composer.json

@@ -34,7 +34,6 @@
         "spatie/laravel-sluggable": "^2.1",
         "thepinecode/i18n": "^0.2.0",
         "tightenco/ziggy": "^0.6.6",
-        "tymon/jwt-auth": "^0.5.12",
         "yajra/laravel-datatables": "^1.0"
     },
     "require-dev": {