diff --git a/composer.json b/composer.json index 987da145..d71f0610 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "predis/predis": "^1.1", "pugx/shortid-php": "^0.5", "ramsey/uuid": "^3.9", - "shlinkio/shlink-common": "dev-master#aafa221ec979271713f87e23f17f6a6b5ae5ee67 as 3.0.1", + "shlinkio/shlink-common": "dev-master#3178fd18ce729d1dd63f4fb54f6a3696a11fef3f as 3.1.0", "shlinkio/shlink-config": "^1.0", "shlinkio/shlink-event-dispatcher": "^1.4", "shlinkio/shlink-installer": "^4.3.2", diff --git a/config/autoload/mercure.global.php b/config/autoload/mercure.global.php index c70c9f06..e04336f3 100644 --- a/config/autoload/mercure.global.php +++ b/config/autoload/mercure.global.php @@ -8,6 +8,8 @@ return [ 'public_hub_url' => null, 'internal_hub_url' => null, 'jwt_secret' => null, + 'jwt_days_duration' => 5, + 'jwt_issuer' => 'Shlink', ], ]; diff --git a/config/autoload/mercure.local.php.dist b/config/autoload/mercure.local.php.dist index 508d0f63..c760e771 100644 --- a/config/autoload/mercure.local.php.dist +++ b/config/autoload/mercure.local.php.dist @@ -7,7 +7,7 @@ return [ 'mercure' => [ 'public_hub_url' => 'http://localhost:3080', 'internal_hub_url' => 'http://shlink_mercure', - 'jwt_secret' => 'super_secret_key', + 'jwt_secret' => 'mercure_jwt_key', ], ]; diff --git a/config/config.php b/config/config.php index 98b4552b..5ab429f0 100644 --- a/config/config.php +++ b/config/config.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Shlinkio\Shlink; use Laminas\ConfigAggregator; -use Laminas\ZendFrameworkBridge; use Mezzio; use Mezzio\ProblemDetails; @@ -30,7 +29,6 @@ return (new ConfigAggregator\ConfigAggregator([ ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php') : new ConfigAggregator\LaminasConfigProvider('config/params/{generated_config.php,*.config.{php,json}}'), ], 'data/cache/app_config.php', [ - ZendFrameworkBridge\ConfigPostProcessor::class, Core\Config\SimplifiedConfigParser::class, Core\Config\BasePathPrefixer::class, Core\Config\DeprecatedConfigParser::class, diff --git a/docker-compose.yml b/docker-compose.yml index d7867f32..51a8a83b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,4 +112,4 @@ services: - "3080:80" environment: CORS_ALLOWED_ORIGINS: "*" - JWT_KEY: "super_secret_key" + JWT_KEY: "mercure_jwt_key"