Merge pull request #84 from CollaboraOnline/issue-83-refactor-wopi-co…

…ntroller Issue #83: Refactor wopi controller
CollaboraOnline · Jan 20, 2025 · aea55fb · aea55fb
2 parents 4cdb19b + b6b4a36
commit aea55fb
Show file tree

Hide file tree

Showing 19 changed files with 962 additions and 235 deletions.
diff --git a/collabora_online.routing.yml b/collabora_online.routing.yml
@@ -41,7 +41,7 @@ collabora-online.settings:
     _permission: 'administer site configuration'
 
 collabora-online.wopi.info:
-  path: '/cool/wopi/files/{id}'
+  path: '/cool/wopi/files/{media}'
   defaults:
     _controller: '\Drupal\collabora_online\Controller\WopiController::wopi'
     action: 'info'
@@ -53,11 +53,11 @@ collabora-online.wopi.info:
     parameters:
       action:
         type: string
-      id:
-        type: string
+      media:
+        type: entity:media
 
 collabora-online.wopi.contents:
-  path: '/cool/wopi/files/{id}/contents'
+  path: '/cool/wopi/files/{media}/contents'
   defaults:
     _controller: '\Drupal\collabora_online\Controller\WopiController::wopi'
     action: 'content'
@@ -69,11 +69,11 @@ collabora-online.wopi.contents:
     parameters:
       action:
         type: string
-      id:
-        type: string
+      media:
+        type: entity:media
 
 collabora-online.wopi.save:
-  path: '/cool/wopi/files/{id}/contents'
+  path: '/cool/wopi/files/{media}/contents'
   defaults:
     _controller: '\Drupal\collabora_online\Controller\WopiController::wopi'
     action: 'save'
@@ -85,5 +85,5 @@ collabora-online.wopi.save:
     parameters:
       action:
         type: string
-      id:
-        type: string
+      media:
+        type: entity:media
diff --git a/collabora_online.services.yml b/collabora_online.services.yml
@@ -1,6 +1,7 @@
 services:
   _defaults:
     autowire: true
+    autoconfigure: true
   logger.channel.collabora_online:
     parent: logger.channel_base
     arguments: ['cool']

diff --git a/src/Access/WopiProofAccessCheck.php b/src/Access/WopiProofAccessCheck.php
@@ -175,7 +175,7 @@ protected function getSubject(Request $request): string {
       pack('N', strlen($url)),
       strtoupper($url),
       pack('N', 8),
-      pack('J', $timestamp_ticks)
+      pack('J', $timestamp_ticks),
     );
   }