signature: open file from nextcloud webdav

Author: wincelau

public/js/common.js

@@ -1,4 +1,6 @@
 const modalLoading = new bootstrap.Modal('#modalLoading')
+let davTokenReceived = null;
+const isIframe = window.parent !== window;
 
 function is_mobile() {
     return !(window.getComputedStyle(document.getElementById('is_mobile')).display === "none");
@@ -313,3 +315,20 @@ function debounce(callback, delay){
         }, delay)
     }
 }
+
+window.addEventListener('message', function(event) {
+    if (event.data.action === 'davOpenFile' && event.data.key == "token") {
+        davTokenReceived = event.data.value
+        console.log(event.data)
+    }
+});
+
+if(document.getElementById('btn_exit')) {
+    document.getElementById('btn_exit').addEventListener('click', function(e) {
+        if(isIframe) {
+            window.parent.postMessage({action: 'exit'}, '*');
+            e.preventDefault();
+            return;
+        }
+    });
+}

public/js/metadata.js

@@ -4,8 +4,6 @@ let pdffile = null
 let deletedMetadata = [];
 let isLocalPath = false;
 let isDavPath = false;
-let isIframe = Boolean(window.parent);
-let davTokenReceived = null;
 let hasModifications = false;
 let sizeOfText = 0;
 let pdf = null;
@@ -230,9 +228,6 @@ window.addEventListener('message', function(event) {
         }
         setIsChanged(true);
     }
-    if (event.data.action === 'davOpenFile' && event.data.key == "token") {
-        davTokenReceived = event.data.value
-    }
 });
 
 function updateMetadataInfos() {
@@ -492,14 +487,6 @@ function createEventsListener() {
         }
         followText(e.target, '#container-pages .textLayer span', '#pdf_text span', true);
     });
-
-    document.getElementById('btn_exit').addEventListener('click', function(e) {
-        if(isIframe) {
-            window.parent.postMessage({action: 'exit'}, '*');
-            e.preventDefault();
-            return;
-        }
-    });
 }
 
 function followText(element, selectorFrom, selectorTo, hide) {

public/js/signature.js

@@ -23,6 +23,7 @@ let hasModifications = false;
 let currentTextScale = 1;
 const defaultScale = 1.5;
 let customText = '';
+let isDavPath = false;
 
 fabric.Object.prototype.controls.mtr.x = 0;
 fabric.Object.prototype.controls.mtr.y = 0.5;      // bas de l'objet
@@ -1391,7 +1392,7 @@ async function pageSignature(url) {
         fontCaveat = font;
     });
 
-    if(url && url.match(/^cache:\/\//)) {
+    if(url && url.match(/^cache:\/\//) && !isDavPath) {
         await loadFileFromCache(url.replace(/^cache:\/\//, ''));
     } else if (url) {
         await loadFileFromUrl(url);
@@ -1434,6 +1435,9 @@ document.addEventListener('DOMContentLoaded', function () {
         pageSignature('/signature/'+pdfHash+'/pdf');
     } else if(window.location.hash && window.location.hash.match(/^\#http/)) {
         pageSignature(window.location.hash.replace(/^\#/, ''));
+    } else if(window.location.hash && window.location.hash.match(/^\#dav:/)) {
+        isDavPath = true;
+        pageSignature(window.location.hash.replace(/^\#dav:/, ''));
     } else if(window.location.hash) {
         pageSignature('cache:///pdf/'+window.location.hash.replace(/^\#/, ''));
     } else {

templates/signature.html.php

@@ -38,7 +38,7 @@
     </div>
     <div style="height: 55px;" class="d-md-none"></div>
     <div class="offcanvas offcanvas-end show d-none d-md-block shadow-sm" data-bs-backdrop="false" data-bs-scroll="true" data-bs-keyboard="false" tabindex="-1" id="sidebarTools" aria-labelledby="sidebarToolsLabel">
-        <a class="btn btn-close btn-sm position-absolute d-none d-sm-none d-md-block" style="right: 16px; top: 16px;" title="<?php echo _("Close this PDF and return to the homepage"); ?>" href="<?php echo $REVERSE_PROXY_URL; ?>/signature"></a>
+        <a id="btn_exit" class="btn btn-close btn-sm position-absolute d-none d-sm-none d-md-block" style="right: 16px; top: 16px;" title="<?php echo _("Close this PDF and return to the homepage"); ?>" href="<?php echo $REVERSE_PROXY_URL; ?>/signature"></a>
         <div class="offcanvas-header mb-0 pb-0">
             <h5 class="mb-1 d-block w-100" id="sidebarToolsLabel"><i class="bi bi-vector-pen"></i> <?php echo _("PDF Signature"); ?> <?php if(isset($hash)): ?><span class="badge rounded-pill text-bg-dark" title="<?php echo _("This PDF is shared with others to be signed by multiple people"); ?>"><span class="nblayers"></span> <i class="bi bi-people-fill"></i></span><?php endif; ?></h5>
             <button type="button" class="btn-close text-reset d-md-none" data-bs-dismiss="offcanvas" aria-label="Close"></button>