diff --git a/.env.testing b/.env.testing
index 849ef16c..a9f779b2 100644
--- a/.env.testing
+++ b/.env.testing
@@ -18,3 +18,8 @@ QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+
+JWT_SECRET=JhNAbJXgtxljtjJYaPAtFo160yzKgDTW
+JWT_TTL=60
+JWT_REFRESH_TTL=21600
+JWT_BLACKLIST_GRACE_PERIOD=30
\ No newline at end of file
diff --git a/.gitlab-ci.sh b/.gitlab-ci.sh
index 11ba9955..f68d78cd 100644
--- a/.gitlab-ci.sh
+++ b/.gitlab-ci.sh
@@ -23,9 +23,12 @@ pecl install xdebug && docker-php-ext-enable xdebug
 
 # Generate an application key. Re-cache.
 php artisan key:generate
+php artisan jwt:secret
 php artisan config:cache
 php artisan config:clear
 # php artisan optimize // remove after laravel 5.6
 
 # Run database migrations with seeder
 php artisan migrate:refresh --seed
+
+
diff --git a/app/Http/Controllers/Auth/OAuthController.php b/app/Http/Controllers/Auth/OAuthController.php
index 1064c9f5..b5d2c8c6 100644
--- a/app/Http/Controllers/Auth/OAuthController.php
+++ b/app/Http/Controllers/Auth/OAuthController.php
@@ -8,6 +8,8 @@ use App\Http\Controllers\Controller;
 use App\Exceptions\EmailTakenException;
 use Laravel\Socialite\Facades\Socialite;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Tymon\JWTAuth\Facades\JWTAuth;
+use Tymon\JWTAuth\Exceptions\JWTException;
 
 class OAuthController extends Controller
 {
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index da7a7f5c..9230257c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -61,5 +61,6 @@ class Kernel extends HttpKernel
         'ability' => 'App\Http\Middleware\TokenEntrustAbility',
         'role' => \Zizaco\Entrust\Middleware\EntrustRole::class,
         'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class,
+        'jwt' => \App\Http\Middleware\RefreshToken::class
     ];
 }