From 09abcb44bb303019e43b005a866dfff54a2ede84 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 22 Jul 2024 13:49:47 +0100 Subject: [PATCH 1/3] Remove cookie serialization Signed-off-by: snipe --- app/Http/Middleware/EncryptCookies.php | 2 +- app/Providers/AuthServiceProvider.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 5f4c62723a..0d5b37de77 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -20,5 +20,5 @@ class EncryptCookies extends BaseEncrypter * * @var bool */ - protected static $serialize = true; + protected static $serialize = false; } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index e17d667845..0e2aa1884e 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -87,11 +87,9 @@ class AuthServiceProvider extends ServiceProvider ]); $this->registerPolicies(); - //Passport::routes(); //this is no longer required in newer passport versions Passport::tokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); Passport::refreshTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); - Passport::withCookieSerialization(); /** From 4ac4f9b0a968ca56a9edd4bdd512ca3b8028eb45 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 22 Jul 2024 14:17:16 +0100 Subject: [PATCH 2/3] Customize cookie name Signed-off-by: snipe --- app/Providers/AuthServiceProvider.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 0e2aa1884e..f7f9b47a0a 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -91,6 +91,8 @@ class AuthServiceProvider extends ServiceProvider Passport::refreshTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); + Passport::cookie('snipeit_token'); + /** * BEFORE ANYTHING ELSE From c752c2a1254050f1788c52db792e0aeaf30d400c Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 22 Jul 2024 14:22:19 +0100 Subject: [PATCH 3/3] Make the passport cookie name configurable Signed-off-by: snipe --- .env.example | 1 + app/Providers/AuthServiceProvider.php | 2 +- config/passport.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 5c0a0b8abc..426af4ff88 100644 --- a/.env.example +++ b/.env.example @@ -87,6 +87,7 @@ SESSION_LIFETIME=12000 EXPIRE_ON_CLOSE=false ENCRYPT=false COOKIE_NAME=snipeit_session +PASSPORT_COOKIE_NAME='snipeit_passport_token' COOKIE_DOMAIN=null SECURE_COOKIES=false API_TOKEN_EXPIRATION_YEARS=15 diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index f7f9b47a0a..a69a6cadf0 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -91,7 +91,7 @@ class AuthServiceProvider extends ServiceProvider Passport::refreshTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); Passport::personalAccessTokensExpireIn(Carbon::now()->addYears(config('passport.expiration_years'))); - Passport::cookie('snipeit_token'); + Passport::cookie(config('passport.cookie_name')); /** diff --git a/config/passport.php b/config/passport.php index d410cfe20e..8de731b49a 100644 --- a/config/passport.php +++ b/config/passport.php @@ -14,4 +14,5 @@ return [ 'private_key' => env('PASSPORT_PRIVATE_KEY'), 'public_key' => env('PASSPORT_PUBLIC_KEY'), 'expiration_years' => env('API_TOKEN_EXPIRATION_YEARS', 20), + 'cookie_name' => env('PASSPORT_COOKIE_NAME', 'snipeit_passport_token'), ];