Absolute path with baseURL

tameeshB · Aug 26, 2017 · 5104975 · 5104975
1 parent 8def5f5
commit 5104975
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/js/GroupKeys.js b/js/GroupKeys.js
@@ -2,22 +2,25 @@
 (function ($) {
   // Jquery onload function.
   $(document).ready(function(){
+    var baseURL = drupalSettings.client_side_file_crypto.baseURL;
+
     /**
      * Method to return the csrf token
      */
     function getCsrfToken() {
        return $.ajax({
          type: "GET",
-           url: "/rest/session/token",
+           url: baseURL + "/rest/session/token",
            async: false
          }).responseText;
     }
+
     var routeName = drupalSettings.client_side_file_crypto.routeName;
     if(routeName != 'client_side_file_crypto.newKeys')
-    $.get("/publicKey/?_format=json", function(xhr_pub_key){
+    $.get(baseURL + "/publicKey/?_format=json", function(xhr_pub_key){
       var encrypt = new JSEncrypt();
       encrypt.setPublicKey(xhr_pub_key['publicKey']);
-      $.get("/groupKeys?_format=json", function(pending_roles){
+      $.get(baseURL + "/groupKeys?_format=json", function(pending_roles){
         var pending_role_names = pending_roles['roleNames'];
         if(pending_role_names.length>0){
           pending_role_names.forEach(function(role_name) {
@@ -30,7 +33,7 @@
               "userID" : pending_roles['userID'],
             };
             jQuery.ajax({
-              url: '../accessKey/?_format=json',
+              url: baseURL + '/accessKey/?_format=json',
               method: 'POST',
               headers: {
                 'Content-Type': 'application/hal+json',

diff --git a/js/decrypt.js b/js/decrypt.js
@@ -4,14 +4,15 @@
 
   $(document).ready(function(){
     var uid = drupalSettings.client_side_file_crypto.uid;
+    var baseURL = drupalSettings.client_side_file_crypto.baseURL;
     var file = null;
     var encryptedFileList = $(".node__content div[property='schema:text']");
 
     //Method to return the csrf token.
     function getCsrfToken() {
       return $.ajax({
         type: "GET",
-        url: "/rest/session/token",
+        url: baseURL + "/rest/session/token",
         async: false
       }).responseText;
     }
@@ -20,7 +21,7 @@
     function getAccessKey(roleName){
       var xhrData = $.ajax({
         type: "GET",
-        url: "/accessKey/?_format=json",
+        url: baseURL + "/accessKey/?_format=json",
         async: false
       }).responseText;
       var accessKeysObject = JSON.parse(xhrData);
@@ -108,7 +109,7 @@
 
     //Fetching the file list and appending to the DOM
     if(nodeID != -1){
-      $.get("../fileMetadata/" + nodeID + "/?_format=json", function(fileMetaData){
+      $.get(baseURL + "/fileMetadata/" + nodeID + "/?_format=json", function(fileMetaData){
         if(fileMetaData.fileCount != 0){
           $(".node__content div[property='schema:text']").append("<h3 class='title'>Encrypted Files</h3>");
           var files = fileMetaData.files;

diff --git a/js/encrypt.js b/js/encrypt.js
@@ -1,26 +1,27 @@
 // Jquery wrapper for drupal to avoid conflicts between libraries.
 (function ($) {
+  var baseURL = drupalSettings.client_side_file_crypto.baseURL;
   /**
    * Method to return the csrf token
    */
   function getCsrfToken() {
     return $.ajax({
       type: "GET",
-        url: "/rest/session/token",
-        async: false
+        url: baseURL + "/rest/session/token",
+      async: false
       }).responseText;
   }
 
   var file = undefined;
   $(document).ready(function(){
-    $(".node-form").attr("action", "/node/add/"+$(".node-form").attr('data-drupal-selector').split("-")[1]);
+    $(".node-form").attr("action", "/node/add/" + $(".node-form").attr('data-drupal-selector').split("-")[1]);
     var uid = drupalSettings.client_side_file_crypto.uid;
     $("#cryptoFields").change(function(e){
       e.preventDefault();
       file = e.target.files[0];
       var role = $("#roleSelect").val();
       var fileName = "encrypted_" + file.name;
-      $.get("/accessKey/?_format=json", function(xhrAccessKey){
+      $.get(baseURL + "/accessKey/?_format=json", function(xhrAccessKey){
         var privateKey = localStorage.getItem("csfcPrivKey_" + uid);
         var decrypt = new JSEncrypt();
         decrypt.setPrivateKey(privateKey);
@@ -37,7 +38,7 @@
             formData.append('csfcRoleName', role);
 
             $.ajax({
-              url: '/encryptedFileUpload',
+              url: baseURL + '/encryptedFileUpload',
               data: formData,
               processData: false,
               contentType: false,

diff --git a/js/pubkeyGen.js b/js/pubkeyGen.js
@@ -1,5 +1,6 @@
 // Jquery wrapper for drupal to avoid conflicts between libraries.
 (function ($) {
+    var baseURL = drupalSettings.client_side_file_crypto.baseURL;
 
   // Jquery onload function.
   function download(filename, text) {
@@ -22,7 +23,7 @@
   function getCsrfToken() {
      return $.ajax({
        type: "GET",
-         url: "/rest/session/token",
+         url: baseURL + "/rest/session/token",
          async: false
        }).responseText;
   }
@@ -31,7 +32,7 @@
   function getPublicKey(uid){
     var xhrData = $.ajax({
       type: "GET",
-      url: "/publicKey/"+uid+"/?_format=json",
+      url: baseURL + "/publicKey/" + uid + "/?_format=json",
       async: false
     }).responseText;
     var pubKeyObject = JSON.parse(xhrData);
@@ -40,7 +41,6 @@
 
   $(document).ready(function(){
     var uid = drupalSettings.client_side_file_crypto.uid;
-    var baseURL = drupalSettings.client_side_file_crypto.baseURL;
     var ExistingPubKey = getPublicKey(uid);
     if(!ExistingPubKey && !localStorage.getItem("csfcPrivKey_" + uid)){
       //default pubkey size for now = 1024
@@ -57,7 +57,7 @@
       };
 
       jQuery.ajax({
-        url: '/publicKey?_format=json',
+        url: baseURL + '/publicKey?_format=json',
         method: 'POST',
         headers: {
           'Content-Type': 'application/hal+json',
@@ -69,11 +69,11 @@
       });
       $("#key-status").text("Key generated.");
       $("#more-info").text("A private key has been downloaded to your computer that you will need to keep to keep safe in case your browser data gets wiped and to access the encrypted files on other devices. In case you need to restore the keys you can do it at /restoreKeys");
-      $("#more-info").append("<br><font color='#FF0000'>Key requests have been put up for each of your roles.<br>You will only be able to access the encrypted features once another user with the keys logs in and generated keys for you.<br>You will need to wait until then. </font><br><a href='"+baseURL+"/user/keyGenRedirect'>Go to home.</a>");
+      $("#more-info").append("<br><font color='#FF0000'>Key requests have been put up for each of your roles.<br>You will only be able to access the encrypted features once another user with the keys logs in and generated keys for you.<br>You will need to wait until then. </font><br><a href='" +baseURL + "/user/keyGenRedirect'>Go to home.</a>");
       download('PrivateKey.pem', privateKey);
     } else {
       $("#key-status").text("Key already generated!");
-      $("#more-info").html("A key pair has already been generated for this user.<br><a href='"+baseURL+"'>Go to home.</a>");
+      $("#more-info").html("A key pair has already been generated for this user.<br><a href='" + baseURL + "'>Go to home.</a>");
     }
   });
   $(document).ajaxStop(function() {

diff --git a/js/updatePendingKeys.js b/js/updatePendingKeys.js
@@ -2,20 +2,20 @@
 (function ($) {
   // Jquery onload function.
   $(document).ready(function(){
+    var baseURL = drupalSettings.client_side_file_crypto.baseURL;
 
     /**
      * Method to return the csrf token
      */
     function getCsrfToken() {
        return $.ajax({
          type: "GET",
-           url: "/rest/session/token",
+           url: baseURL + "/rest/session/token",
            async: false
          }).responseText;
      }
 
     var uid = drupalSettings.client_side_file_crypto.uid;
-    var baseURL = drupalSettings.client_side_file_crypto.baseURL;
     var routeName = drupalSettings.client_side_file_crypto.routeName;
     var blockedRoutes = [
       //'client_side_file_crypto.postLogin',
@@ -29,7 +29,7 @@
         }
         var privateKey = localStorage.getItem("csfcPrivKey_" + uid);
         var encrypt = new JSEncrypt();
-        $.get("/accessKey/pending?_format=json", function(pendingKeysJSON){
+        $.get(baseURL + "/accessKey/pending?_format=json", function(pendingKeysJSON){
           var decrypt = new JSEncrypt();
           decrypt.setPrivateKey(privateKey);
           pendingKeys = pendingKeysJSON['accessKeys'];
@@ -46,7 +46,7 @@
                 "userID" : accessKey['uid'],
               };
               jQuery.ajax({
-                url: '/accessKey/?_format=json',
+                url: baseURL + '/accessKey/?_format=json',
                 method: 'POST',
                 headers: {
                   'Content-Type': 'application/hal+json',