Add token to slide calls if present (#567)

Author: birm

apps/viewer/init.js

@@ -167,7 +167,7 @@ function initCore() {
       if ($D.params.retry) {
         $UI.message.addError(e.message);
         // can't reach Slide and return to home page
-        if (e.isServiceError) redirect($D.pages.table, e.message, 0);
+        if (e.isServiceError) redirect($D.pages.table, e.message, 1);
       } else {
         // If this is our first attempt, try one more time.
         let params = new URLSearchParams(window.location.search);

common/PathdbMods.js

@@ -1,7 +1,7 @@
-function PathDbMods() {
+async function PathDbMods() {
   console.log("PathDbMods()...");
   // determine if user is authenicated
-  fetch("/user/login_status?_format=json", {credentials: 'include'})
+  await fetch("/user/login_status?_format=json", {credentials: 'include'})
     .then(response => response.json())
     .then(function(data) {
       if (data!=0) {
@@ -11,6 +11,7 @@ function PathDbMods() {
               console.log(x)
               if (x.hasOwnProperty('token') && x.token) {
                 document.cookie = "token=" + x.token + ";"
+                console.log("set cookie, is now:" , document.cookie)
               }
            })
       } else {
@@ -49,9 +50,9 @@ function PathDbMods() {
       x.mpp = x.mpp_x
     }
     if (data.field_iip_path && data.field_iip_path.length >= 1) {
-      x.location = data.field_iip_path[0].value;
-      //x.location = "pathdb*" + pathdbid;
-      x.url = "../../img/IIP/raw/?DeepZoom=" + x.location + ".dzi";
+      //x.location = data.field_iip_path[0].value;
+      x.location = "pathdb*" + pathdbid;
+      x.url = "../../img/IIP/raw/?DeepZoom=pathdb*" + pathdbid + ".dzi";
     } else {
       throw "no iip path in pathdb data"
     }

common/dynamicLoadScript.js

@@ -6,14 +6,15 @@ const params = getUrlVars();
 let file;
 if (params.mode && params.mode==="pathdb"){
     ImgloaderMode = 'iip';
-    PathDbMods()
+    PathDbMods().then(x=>{IsPackageLoading = true})
 }
 else if(params.slideId&&params.id&&params.slideId==="local"&&params.id.includes('http://localhost:8888')){
     ImgloaderMode = 'imgbox';
     NanoBorbMods()
     init_LocalStore()
+    IsPackageLoading = true;
 }else{
     ImgloaderMode = 'iip';
+    IsPackageLoading = true;
     // no mods to perform as of now
 }
-IsPackageLoading=true;

core/CaMic.js

@@ -168,21 +168,20 @@ class CaMic {
           }
           const data = x[0];
           // check the slide on service side
-          OpenSeadragon.makeAjaxRequest( {
-            url: '../../img/IIP/raw/?DeepZoom='+ data['location'] + '.dzi',
-            success: function( xhr ) {
+          let checkSlideUrl = '../../img/IIP/raw/&DeepZoom='+ data['location'] + '.dzi';
+          if (getCookie('token')) {
+            checkSlideUrl = '../../img/IIP/raw/?token=' + getCookie('token') + '&DeepZoom='+ data['location'] + '.dzi';
+          }
+          fetch(checkSlideUrl, {credentials: 'include'}).then((z)=>{
+            if (true) {
               this.openSlide(data, func);
-            }.bind(this),
-            error: function( xhr, exc ) {
-              console.log(xhr, exc);
-              Loading.text.textContent = 'Something Wrong With This Slide... X_X';
-              if (func && typeof func === 'function') {
-                func.call(null,
-                    {hasError: true,
-                      isServiceError: true,
-                      message: 'Something Wrong With This Slide... X_X'});
-              }
-            },
+            } else {
+              Loading.text.textContent = 'Slide Source Returned Status Code: ' + z.status;
+              func.call(null,
+                  {hasError: true,
+                    isServiceError: true,
+                    message: 'Slide Source Returned Status Code: ' + z.status});
+            }
           });
         })
         .catch((e)=>{
@@ -197,8 +196,12 @@ class CaMic {
     this.slideId = data['_id']['$oid'];
 
     this.slideName = data['name'];
-
-    this.viewer.open('../../img/IIP/raw/?DeepZoom='+ data['location'] + '.dzi');
+    // insert token if present
+    let openSlideUrl = '../../img/IIP/raw/&DeepZoom='+ data['location'] + '.dzi';
+    if (getCookie('token')) {
+      openSlideUrl = '../../img/IIP/raw/?token=' + getCookie('token') + '&DeepZoom='+ data['location'] + '.dzi';
+    }
+    this.viewer.open(openSlideUrl);
     // set mpp
     this.mpp_x = +data['mpp-x'];
     this.mpp_y = +data['mpp-y'];