Merge branch 'master' into PHRAS-2069-rescan-files-metadata

alchemy-fr · Nov 28, 2023 · e2a765b · e2a765b
2 parents f1ebf50 + de6a104
commit e2a765b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php b/lib/Alchemy/Phrasea/Controller/Prod/DownloadController.php
@@ -137,7 +137,7 @@ public function listDownloadAsync(Request $request)
 
         $token = $this->getTokenManipulator()->createDownloadToken($this->getAuthenticatedUser(), serialize($list));
 
-        $pusher_auth_key =$this->getConf()->get(['download_async', 'enabled'], false) ? $this->getConf()->get(['pusher', 'auth_key'], '') : null;
+        $pusher_auth_key =$this->getConf()->get(['download_async', 'enabled'], false) ? $this->getConf()->get(['externalservice', 'pusher', 'auth_key'], '') : null;
         return new Response($this->render(
         /** @uses templates/web/prod/actions/Download/prepare_async.html.twig */
             '/prod/actions/Download/prepare_async.html.twig', [

diff --git a/lib/Alchemy/Phrasea/WorkerManager/Worker/DownloadAsyncWorker.php b/lib/Alchemy/Phrasea/WorkerManager/Worker/DownloadAsyncWorker.php
@@ -98,9 +98,9 @@ public function process(array $payload)
             );
             try {
                 $this->pusher = new Pusher(
-                    $this->conf->get(['pusher', 'auth_key'], ''),
-                    $this->conf->get(['pusher', 'secret'], ''),
-                    $this->conf->get(['pusher', 'app_id'], ''),
+                    $this->conf->get(['externalservice', 'pusher', 'auth_key'], ''),
+                    $this->conf->get(['externalservice', 'pusher', 'secret'], ''),
+                    $this->conf->get(['externalservice', 'pusher', 'app_id'], ''),
                     $options
                 );
                 $this->pusher_channel_name = $token->getValue();

diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml
@@ -260,10 +260,7 @@ registration-fields:
         required: true
 download_async:
     enabled: false
-pusher:
-    auth_key: 'pusher-auth_key'
-    secret: 'pusher-secret'
-    app_id: 'pusher-app_id'
+
 xsendfile:
     enabled: false
     type: nginx
@@ -430,12 +427,10 @@ workers:
             - application/pdf
             - image/tiff
 externalservice:
-    ginger:
-        AutoSubtitling:
-            service_base_url: https://base.uri
-            token: 39c6011d
-            transcript_format: text/vtt
-            subdef_source: preview
+    pusher:
+        auth_key: 'pusher-auth_key'
+        secret: 'pusher-secret'
+        app_id: 'pusher-app_id'
 
 
 Console_logger_enabled_environments: [test]