Fix for #133

pawelrojek · Mar 10, 2021 · 0fdc792 · 0fdc792
1 parent cf4d037
commit 0fdc792
Show file tree

Hide file tree

Showing 9 changed files with 550 additions and 220 deletions.
diff --git a/drawio/CHANGELOG.md b/drawio/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.0.0
+-
+
 ## 0.9.9
 - NC21 compatibility
 - public link support (#20)

diff --git a/drawio/appinfo/application.php b/drawio/appinfo/application.php
@@ -17,6 +17,7 @@
 use OCA\Drawio\AppConfig;
 use OCA\Drawio\Controller\DisplayController;
 use OCA\Drawio\Controller\EditorController;
+use OCA\Drawio\Controller\ViewerController;
 use OCA\Drawio\Controller\SettingsController;
 
 class Application extends App {
@@ -105,5 +106,21 @@ function() {
                 $c->query("Session")
             );
         });
+
+        $container->registerService("ViewerController", function($c)
+        {
+            return new ViewerController(
+                $c->query("AppName"),
+                $c->query("Request"),
+                $c->query("RootStorage"),
+                $c->query("UserSession"),
+                $c->query("ServerContainer")->getURLGenerator(),
+                $c->query("L10N"),
+                $c->query("Logger"),
+                $this->appConfig,
+                $c->query("IManager"),
+                $c->query("Session")
+            );
+        });        
     }
 }
diff --git a/drawio/appinfo/routes.php b/drawio/appinfo/routes.php
@@ -5,8 +5,11 @@
        ["name" => "editor#index", "url" => "/{fileId}", "verb" => "GET"],
        ["name" => "editor#create", "url" => "/ajax/new", "verb" => "POST"],
 
-       ["name" => "editor#public_page", "url" => "/s/{shareToken}", "verb" => "GET"],
-       ["name" => "editor#public_file", "url" => "/ajax/shared/{fileId}", "verb" => "GET"],
+       //["name" => "editor#public_page", "url" => "/s/{shareToken}", "verb" => "GET"],
+       //["name" => "editor#public_file", "url" => "/ajax/shared/{fileId}", "verb" => "GET"],
+
+       ["name" => "viewer#public_page", "url" => "/s/{shareToken}", "verb" => "GET"],
+       ["name" => "viewer#public_file", "url" => "/ajax/shared/{fileId}", "verb" => "GET"],
 
        ["name" => "settings#settings", "url" => "/ajax/settings", "verb" => "POST"],
        ["name" => "settings#getsettings", "url" => "/ajax/settings", "verb" => "GET"],

diff --git a/drawio/controller/editorcontroller.php b/drawio/controller/editorcontroller.php
@@ -35,6 +35,7 @@
 
 use OCA\Files\Helper;
 use OCA\Files_Versions\Storage;
+use OCA\Viewer\Event\LoadViewer;
 
 use OCA\Drawio\AppConfig;
 
@@ -173,6 +174,8 @@ public function index($fileId, $shareToken = NULL, $filePath = NULL) {
         $lang = $this->config->GetLang();
         $lang = trim(strtolower($lang));
 
+        $eventDispatcher = \OC::$server->getEventDispatcher();
+
         if ("auto" === $lang)
         {
             $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode();
@@ -226,6 +229,19 @@ public function index($fileId, $shareToken = NULL, $filePath = NULL) {
             "shareToken" => $shareToken
         ];
 
+        //viewer code
+        if (class_exists(LoadViewer::class)) {
+            $eventDispatcher->addListener(LoadViewer::class,
+                function () {
+                        Util::addScript("drawio", "viewer");
+                        $csp = new ContentSecurityPolicy();
+                        $csp->addAllowedFrameDomain("'self'");
+                        $cspManager = $this->getContainer()->getServer()->getContentSecurityPolicyManager();
+                        $cspManager->addDefaultPolicy($csp);
+                });
+        }
+        //viewer code
+
         $response = new TemplateResponse($this->appName, "editor", $params);
 
         $csp = new ContentSecurityPolicy();