From 078c8ea01151b97eda1815709a59041e2be0c4a0 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 18 Apr 2020 11:29:49 +0200 Subject: [PATCH] Changed default mercure token duration to 1 day --- config/autoload/mercure.global.php | 1 - module/Rest/src/Action/MercureInfoAction.php | 2 +- module/Rest/test/Action/MercureInfoActionTest.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/autoload/mercure.global.php b/config/autoload/mercure.global.php index 04a698c3..1a404dca 100644 --- a/config/autoload/mercure.global.php +++ b/config/autoload/mercure.global.php @@ -13,7 +13,6 @@ return [ 'public_hub_url' => null, 'internal_hub_url' => null, 'jwt_secret' => null, - 'jwt_days_duration' => 5, 'jwt_issuer' => 'Shlink', ], diff --git a/module/Rest/src/Action/MercureInfoAction.php b/module/Rest/src/Action/MercureInfoAction.php index 73526d9f..bad4cb9c 100644 --- a/module/Rest/src/Action/MercureInfoAction.php +++ b/module/Rest/src/Action/MercureInfoAction.php @@ -40,7 +40,7 @@ class MercureInfoAction extends AbstractRestAction throw MercureException::mercureNotConfigured(); } - $days = $this->mercureConfig['jwt_days_duration'] ?? 3; + $days = $this->mercureConfig['jwt_days_duration'] ?? 1; $expiresAt = Chronos::now()->addDays($days); try { diff --git a/module/Rest/test/Action/MercureInfoActionTest.php b/module/Rest/test/Action/MercureInfoActionTest.php index df4b7260..d40b3f70 100644 --- a/module/Rest/test/Action/MercureInfoActionTest.php +++ b/module/Rest/test/Action/MercureInfoActionTest.php @@ -92,7 +92,7 @@ class MercureInfoActionTest extends TestCase $this->assertArrayHasKey('token', $payload); $this->assertArrayHasKey('jwtExpiration', $payload); $this->assertEquals( - Chronos::now()->addDays($days ?? 3)->startOfDay(), + Chronos::now()->addDays($days ?? 1)->startOfDay(), Chronos::parse($payload['jwtExpiration'])->startOfDay(), ); $buildToken->shouldHaveBeenCalledOnce();