Merge master

.gitignore

@@ -4,4 +4,6 @@ bin/
 Gopkg.lock
 vendor/
 temp/
-yarn-error.log
\ No newline at end of file
+yarn-error.log
+/.project
+cmake-build-debug/

javascript/src/iframe/wopiapi-iframe.js

-const axios = require("axios");
+const axios = require('axios');
 
 function WopiAPI() {}
 
-WopiAPI.prototype.getPassports = function(fileID) {
-  const {
-    publicKey,
-    uuid,
-    token,
-    deviceHash
-  } = window.viamApi.getConfig().headers;
+WopiAPI.prototype.getPassports = function (resourceID, contentType) {
+  const { publicKey, uuid, token, deviceHash } = window.viamApi.getConfig().headers;
   const requestConfig = {
     url: `${window.WOPI_URL}getPassports`,
-    method: "POST",
+    method: 'POST',
     headers: {
       publicKey,
       uuid,
       token,
       deviceHash,
-      fileID: encodeURI(fileID)
+      resourceID: encodeURI(resourceID),
+      contentType: encodeURI(contentType)
     }
   };
 
   return axios(requestConfig);
 };
 
-WopiAPI.prototype.putDocument = function(path, accessToken, file) {
-  const {
-    publicKey,
-    uuid,
-    token,
-    deviceHash
-  } = window.viamApi.getConfig().headers;
-  path = path[0] === "/" ? path : `/${path}`;
-  path = encodeURI(path);
+WopiAPI.prototype.putDocument = function (resourceID, accessToken, file) {
+  const { publicKey, uuid, token, deviceHash } = window.viamApi.getConfig().headers;
+
+  resourceID = encodeURI(resourceID);
   const requestConfig = {
-    url: `${window.WOPI_URL}files${path}/contents`,
-    method: "POST",
+    url: `${window.WOPI_URL}files/${resourceID}/contents`,
+    method: 'POST',
     headers: {
       publicKey,
       uuid,

javascript/src/utilities/stringUtilities.js

+export const stringToUtf8ByteArray = (str) => {
+  if (typeof str !== 'string') {
+    str = str.toString();
+  }
+  const res = Buffer.from(str, 'utf-8');
+  return res;
+}
+
+export const utf8ByteArrayToString = (ba) => {
+  if (!Buffer.isBuffer(ba)) {
+    ba = Buffer.from(ba);
+  }
+  const res = ba.toString('utf-8');
+  return res;
+}
+
+export const stringToUtf8Base64 = (str) => {
+  if (!Buffer.isBuffer(str)) {
+    if (typeof str !== 'string') {
+      str = str.toString();
+    }
+    str = Buffer.from(str, 'utf-8');
+  }
+  const res = str.toString('base64');
+  return res;
+}
+
+export const utf8Base64ToString = (strBase64) => {
+  if (!Buffer.isBuffer(strBase64)) {
+    if (typeof strBase64 !== 'string') {
+      strBase64 = strBase64.toString();
+    }
+    strBase64 = Buffer.from(strBase64, 'base64');
+  }
+  const res = strBase64.toString('utf-8');
+  return res;
+}
+
+export const base64ToByteArray = (strBase64) => {
+  if (typeof strBase64 !== 'string') {
+    strBase64 = strBase64.toString();
+  }
+  const res = Buffer.from(strBase64, 'base64');
+  return res;
+}
+
+export const byteArrayToBase64 = (ba) => {
+  if (!Buffer.isBuffer(ba)) {
+    ba = Buffer.from(ba);
+  }
+  const res = ba.toString('base64');
+  return res;
+}