From 37766083fab8a586e9b4eeb89d736873d5417380 Mon Sep 17 00:00:00 2001 From: Too Date: Sat, 23 Jun 2018 00:16:26 +0800 Subject: [PATCH] config some jwt stuff --- .gitlab-ci.sh | 1 + composer.json | 2 +- composer.lock | 16 ++++++++-------- config/app.php | 4 ++++ vendor/composer/autoload_classmap.php | 1 - vendor/composer/autoload_static.php | 1 - 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.sh b/.gitlab-ci.sh index d0ba0509..f68d78cd 100644 --- a/.gitlab-ci.sh +++ b/.gitlab-ci.sh @@ -23,6 +23,7 @@ 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 diff --git a/composer.json b/composer.json index 4e5bd78c..0a70c54a 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "laravel/socialite": "^3.0", "laravel/tinker": "~1.0", "laravelcollective/html": "^5.6", - "tymon/jwt-auth": "dev-develop", + "tymon/jwt-auth": "^1.0.0-rc.2", "zizaco/entrust": "dev-master" }, "require-dev": { diff --git a/composer.lock b/composer.lock index fdaa9cc7..129e5488 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "041e70e1674a10af3e2afd9acb054661", + "content-hash": "3f411d272d823b9e69fdedb77a2abf73", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -1441,7 +1441,7 @@ { "name": "Luís Otávio Cobucci Oblonczyk", "email": "lcobucci@gmail.com", - "role": "developer" + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -3320,16 +3320,16 @@ }, { "name": "tymon/jwt-auth", - "version": "dev-develop", + "version": "1.0.0-rc.2", "source": { "type": "git", "url": "https://github.com/tymondesigns/jwt-auth.git", - "reference": "6e419252cc592afc2ed4cd61be6f5e303a636cc5" + "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/6e419252cc592afc2ed4cd61be6f5e303a636cc5", - "reference": "6e419252cc592afc2ed4cd61be6f5e303a636cc5", + "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b", + "reference": "d5220f6a84cbb8300f6f2f0f20aa908d072b4e4b", "shasum": "" }, "require": { @@ -3391,7 +3391,7 @@ "jwt", "laravel" ], - "time": "2018-06-19T20:04:27+00:00" + "time": "2018-02-07T20:55:14+00:00" }, { "name": "vlucas/phpdotenv", @@ -5341,7 +5341,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "tymon/jwt-auth": 20, + "tymon/jwt-auth": 5, "zizaco/entrust": 20 }, "prefer-stable": false, diff --git a/config/app.php b/config/app.php index 9d2e4b07..4b98dcfc 100644 --- a/config/app.php +++ b/config/app.php @@ -169,6 +169,7 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, + 'Tymon\JWTAuth\Providers\JWTAuthServiceProvider', ], /* @@ -219,6 +220,9 @@ return [ 'View' => Illuminate\Support\Facades\View::class, 'Html' => Collective\Html\HtmlFacade::class, 'Entrust' => Zizaco\Entrust\EntrustFacade::class, + + 'JWTAuth' => 'Tymon\JWTAuth\Facades\JWTAuth', + 'JWTFactory' => 'Tymon\JWTAuth\Facades\JWTFactory', ], ]; diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 894ab857..244694e5 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -4185,7 +4185,6 @@ return array( 'Tymon\\JWTAuth\\Exceptions\\UserNotDefinedException' => $vendorDir . '/tymon/jwt-auth/src/Exceptions/UserNotDefinedException.php', 'Tymon\\JWTAuth\\Facades\\JWTAuth' => $vendorDir . '/tymon/jwt-auth/src/Facades/JWTAuth.php', 'Tymon\\JWTAuth\\Facades\\JWTFactory' => $vendorDir . '/tymon/jwt-auth/src/Facades/JWTFactory.php', - 'Tymon\\JWTAuth\\Facades\\JWTProvider' => $vendorDir . '/tymon/jwt-auth/src/Facades/JWTProvider.php', 'Tymon\\JWTAuth\\Factory' => $vendorDir . '/tymon/jwt-auth/src/Factory.php', 'Tymon\\JWTAuth\\Http\\Middleware\\Authenticate' => $vendorDir . '/tymon/jwt-auth/src/Http/Middleware/Authenticate.php', 'Tymon\\JWTAuth\\Http\\Middleware\\AuthenticateAndRenew' => $vendorDir . '/tymon/jwt-auth/src/Http/Middleware/AuthenticateAndRenew.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 9eb9eb01..42c53135 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4613,7 +4613,6 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a 'Tymon\\JWTAuth\\Exceptions\\UserNotDefinedException' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Exceptions/UserNotDefinedException.php', 'Tymon\\JWTAuth\\Facades\\JWTAuth' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Facades/JWTAuth.php', 'Tymon\\JWTAuth\\Facades\\JWTFactory' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Facades/JWTFactory.php', - 'Tymon\\JWTAuth\\Facades\\JWTProvider' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Facades/JWTProvider.php', 'Tymon\\JWTAuth\\Factory' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Factory.php', 'Tymon\\JWTAuth\\Http\\Middleware\\Authenticate' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Http/Middleware/Authenticate.php', 'Tymon\\JWTAuth\\Http\\Middleware\\AuthenticateAndRenew' => __DIR__ . '/..' . '/tymon/jwt-auth/src/Http/Middleware/AuthenticateAndRenew.php',