add support for signing of external images

Ivan Barlog · Ivan Barlog · commit 70803fc3c743 · 2019-03-12T14:01:38.000+01:00
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -17,6 +17,7 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('storage_id')->isRequired()->end()
                 ->scalarNode('api_key')->isRequired()->end()
+                ->scalarNode('signature_secret')->end()
                 ->booleanNode('auto_mode')->defaultTrue()->end()
             ->end();
 
diff --git a/src/DependencyInjection/FileJetExtension.php b/src/DependencyInjection/FileJetExtension.php
@@ -19,6 +19,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter('filejet.api_key', $processedConfig['api_key']);
         $container->setParameter('filejet.storage_id', $processedConfig['storage_id']);
+        $container->setParameter('filejet.signature_secret', $processedConfig['signature_secret']);
         $container->setParameter('filejet.auto_mode', $processedConfig['auto_mode']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
diff --git a/src/Resources/config/services-autowire.yml b/src/Resources/config/services-autowire.yml
@@ -4,17 +4,20 @@ services:
     autoconfigure: true
 
   FileJet\HttpClient: ~
+  FileJet\Mutation: ~
 
   FileJet\Config:
     arguments:
       - "%filejet.api_key%"
       - "%filejet.storage_id%"
+      - "%filejet.signature_secret%"
       - "%filejet.auto_mode%"
 
   FileJet\FileJet:
     arguments:
       - '@FileJet\HttpClient'
       - '@FileJet\Config'
+      - '@FileJet\Mutation'
 
 
   FileJetBundle\Twig\FileJetExtension:
diff --git a/src/Resources/config/services-legacy.yml b/src/Resources/config/services-legacy.yml
@@ -2,18 +2,23 @@ services:
   filejet.http_client:
     class: FileJet\HttpClient
 
+  filejet.mutation:
+    class: FileJet\Mutation
+
   filejet.config:
     class: FileJet\Config
     arguments:
       - "%filejet.api_key%"
       - "%filejet.storage_id%"
+      - "%filejet.signature_secret%"
       - "%filejet.auto_mode%"
 
   filejet.filejet:
     class: FileJet\FileJet
     arguments:
       - '@filejet.http_client'
       - '@filejet.config'
+      - '@filejet.mutation'
 
 
   filejet.extension:
diff --git a/src/Twig/FileJetExtension.php b/src/Twig/FileJetExtension.php
@@ -22,6 +22,7 @@ public function getFunctions()
     {
         return [
             new \Twig_SimpleFunction('file_url', [$this, 'getUrl']),
+            new \Twig_SimpleFunction('external_file_url', [$this->fileJet, 'getExternalUrl']),
             new \Twig_SimpleFunction('private_file_url', [$this->fileJet, 'getPrivateUrl'])
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public function getFunctions()`
`22`	`22`	`{`
`23`	`23`	`return [`
`24`	`24`	`new \Twig_SimpleFunction('file_url', [$this, 'getUrl']),`
	`25`	`+ new \Twig_SimpleFunction('external_file_url', [$this->fileJet, 'getExternalUrl']),`
`25`	`26`	`new \Twig_SimpleFunction('private_file_url', [$this->fileJet, 'getPrivateUrl'])`
`26`	`27`	`];`
`27`	`28`	`}`