Move secret under node webhook in configuration (#157)

webgriffe · Nov 27, 2023 · b33d29e · b33d29e
1 parent d0bf295
commit b33d29e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/config/services.xml b/config/services.xml
@@ -65,7 +65,7 @@
             <tag name="controller.service_arguments"/>
             <argument type="service" id="monolog.logger.webgriffe_sylius_akeneo_plugin" />
             <argument type="service" id="webgriffe_sylius_akeneo.command_bus" />
-            <argument type="string">%webgriffe_sylius_akeneo.webhook_secret%</argument>
+            <argument type="string">%webgriffe_sylius_akeneo.webhook.secret%</argument>
             <call method="setContainer">
                 <argument type="service" id="service_container" />
             </call>

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -33,7 +33,11 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->end()
                 ->end()
 
-                ->scalarNode('webhook_secret')
+                ->arrayNode('webhook')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('secret')->isRequired()->cannotBeEmpty()->defaultNull()->end()
+                    ->end()
                 ->end()
 
                 ->arrayNode('value_handlers')

diff --git a/src/DependencyInjection/WebgriffeSyliusAkeneoExtension.php b/src/DependencyInjection/WebgriffeSyliusAkeneoExtension.php
@@ -122,7 +122,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->registerResources('webgriffe_sylius_akeneo', 'doctrine/orm', $config['resources'], $container);
 
         $this->registerApiClientParameters($config['api_client'], $container);
-        $this->registerWebhookParameters($config['webhook_secret'], $container);
+        $this->registerWebhookParameters($config['webhook'], $container);
 
         $loader->load('services.xml');
 
@@ -254,8 +254,8 @@ private function registerTemporaryDirectoryParameter(ContainerBuilder $container
         $container->setParameter($parameterKey, sys_get_temp_dir());
     }
 
-    private function registerWebhookParameters(string $webhookSecret, ContainerBuilder $container): void
+    private function registerWebhookParameters(array $webhook, ContainerBuilder $container): void
     {
-        $container->setParameter('webgriffe_sylius_akeneo.webhook_secret', $webhookSecret);
+        $container->setParameter('webgriffe_sylius_akeneo.webhook.secret', $webhook['secret']);
     }
 }
diff --git a/tests/Application/config/packages/webgriffe_sylius_akeneo_plugin.yaml b/tests/Application/config/packages/webgriffe_sylius_akeneo_plugin.yaml
@@ -8,9 +8,10 @@ webgriffe_sylius_akeneo:
         password: '%env(WEBGRIFFE_SYLIUS_AKENEO_PLUGIN_PASSWORD)%'
         client_id: '%env(WEBGRIFFE_SYLIUS_AKENEO_PLUGIN_CLIENT_ID)%'
         secret: '%env(WEBGRIFFE_SYLIUS_AKENEO_PLUGIN_SECRET)%'
-
-    webhook_secret: '%env(WEBGRIFFE_SYLIUS_AKENEO_PLUGIN_WEBHOOK_SECRET)%'
-
+
+    webhook:
+        secret: '%env(WEBGRIFFE_SYLIUS_AKENEO_PLUGIN_WEBHOOK_SECRET)%'
+
     value_handlers:
         product:
             attribute: