Merge pull request #581 from caesar-team/develop

Release v2.1.0

Author: aburov-dev

.env.dist

@@ -86,3 +86,12 @@ FINGERPRINT_LIFETIME=1209600
 ###> symfony/messenger ###
 MESSENGER_TRANSPORT_DSN=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@${RABBITMQ_HOST}:5672/%2f/messages?connection_timeout=1&lazy=true
 ###< symfony/messenger ###
+
+###> symfony/mercure-bundle ###
+MERCURE_EXTERNAL_PORT=3000
+## See https://symfony.com/doc/current/mercure.html#configuration
+MERCURE_PUBLISH_URL=http://mercure/.well-known/mercure
+# The default token is signed with the secret key: !ChangeMe!
+MERCURE_JWT_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InB1Ymxpc2giOltdfX0.Oo0yg7y4yMa1vr_bziltxuTCqb8JVHKxp-f_FwwOim0
+MERCURE_JWT_SECRET=!ChangeMe!
+###< symfony/mercure-bundle ###

.gitignore

@@ -38,3 +38,7 @@ codeception.yml
 ###< tests ###
 src/.preload.php
 .vscode/settings.json
+
+###> symfony/mercure-bundle ###
+config/mercure/caddy
+###< symfony/mercure-bundle ###

composer.json

@@ -43,6 +43,7 @@
         "symfony/flex": "1.9.10",
         "symfony/framework-bundle": "4.4.15",
         "symfony/http-foundation": "4.4.15",
+        "symfony/mercure-bundle": "^0.2.6",
         "symfony/messenger": "4.4.15",
         "symfony/monolog-bundle": "3.6.0",
         "symfony/orm-pack": "1.2.0",
@@ -110,6 +111,10 @@
             "@php vendor/bin/php-cs-fixer fix --config=.php_cs.dist -vv",
             "@php vendor/bin/phpstan analyse --memory-limit=-1",
             "@php vendor/bin/psalm --show-info=false"
+        ],
+        "test": [
+            "@analyse",
+            "@php vendor/bin/codecept run"
         ]
     },
     "conflict": {

composer.lock

@@ -32,4 +32,5 @@
     Yoanm\SymfonyJsonRpcHttpServer\JsonRpcHttpServerBundle::class => ['all' => true],
     Yoanm\SymfonyJsonRpcParamsValidator\JsonRpcParamsValidatorBundle::class => ['all' => true],
     Fourxxi\RestRequestError\RestRequestErrorBundle::class => ['all' => true],
+    Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
 ];

config/bundles.php

@@ -4,4 +4,5 @@ realpath_cache_size = 8192k
 realpath_cache_ttl = 600
 opcache.memory_consumption = 256
 opcache.max_accelerated_files = 40000
-extension=gnupg.so
+extension=gnupg.so
+post_max_size=100M

config/docker/php/symfony.ini

@@ -0,0 +1,12 @@
+# The address of your server
+localhost
+
+route {
+    mercure {
+        publisher_jwt {$MERCURE_JWT_SECRET}
+        subscriber_jwt {$MERCURE_JWT_SECRET}
+        cors_origins {$CORS_ALLOW_ORIGIN}
+    }
+
+    respond "Not Found" 404
+}

config/mercure/Caddyfile

@@ -10,6 +10,7 @@ doctrine:
         types:
             uuid:  Ramsey\Uuid\Doctrine\UuidType
             NodeEnumType: App\DBAL\Types\Enum\NodeEnumType
+            DirectoryEnumType: App\DBAL\Types\Enum\DirectoryEnumType
             AccessEnumType: App\DBAL\Types\Enum\AccessEnumType
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'

config/packages/doctrine.yaml

@@ -0,0 +1,6 @@
+mercure:
+    enable_profiler: '%kernel.debug%'
+    hubs:
+        default:
+            url: '%env(MERCURE_PUBLISH_URL)%'
+            jwt: '%env(MERCURE_JWT_TOKEN)%'

config/packages/mercure.yaml

@@ -1,14 +1,15 @@
 parameters:
     'env(FINGERPRINT_LIFETIME)': 86400
     'env(BACKUP_CODE_SALT)': ''
+    'env(OAUTH_ALLOWED_DOMAINS)': ''
 services:
     # default configuration for services in *this* file
     _defaults:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
         public: false       # Allows optimizing the container by removing unused services; this also means
-                            # fetching services directly from the container via $container->get() won't work.
-                            # The best practice is to be explicit about your dependencies anyway.
+        bind:
+            $allowedDomains: '%env(OAUTH_ALLOWED_DOMAINS)%'
 
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name