curtain-web-api 1.0.38 → 1.0.40

package/build/classes/curtain-api.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurtainWebAPI = exports.reviver = exports.replacer = void 0;
 const curtain_user_1 = require("./curtain-user");
@@ -213,46 +222,44 @@ class CurtainWebAPI {
         encrypted: false,
         e2e: false,
     }, onUploadProgress = undefined) {
-        let form = new FormData();
-        let data = JSON.stringify(settings, exports.replacer);
-        if (enable) {
-            form.append("enable", "True");
-        }
-        else {
-            form.append("enable", "False");
-        }
-        if (encryption.encrypted) {
-            form.append("encrypted", "True");
-        }
-        else {
-            form.append("encrypted", "False");
-        }
-        if (encryption.e2e) {
-            form.append("e2e", "True");
-        }
-        else {
-            form.append("e2e", "False");
-        }
-        if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
-            (0, curtain_encryption_1.encryptDataRSA)(data, encryption.publicKey).then((response) => {
-                form.append("file", new Blob([response], { type: 'text/json' }), "curtain-settings.json");
-            });
-        }
-        else {
-            form.append("file", new Blob([data], { type: 'text/json' }), "curtain-settings.json");
-        }
-        form.append("description", description);
-        form.append("curtain_type", sessionType);
-        let headers = new axios_1.AxiosHeaders();
-        headers["Accept"] = "application/json";
-        headers["Content-Type"] = "multipart/form-data";
-        if (onUploadProgress !== undefined) {
-            return this.axiosInstance.post(this.baseURL + "curtain/", form, { headers: headers, responseType: "json", onUploadProgress: onUploadProgress }).then((response) => {
-                return response;
-            });
-        }
-        return this.axiosInstance.post(this.baseURL + "curtain/", form, { headers: headers, responseType: "json" }).then((response) => {
-            return response;
+        return __awaiter(this, void 0, void 0, function* () {
+            let form = new FormData();
+            let data = JSON.stringify(settings, exports.replacer);
+            if (enable) {
+                form.append("enable", "True");
+            }
+            else {
+                form.append("enable", "False");
+            }
+            if (encryption.encrypted) {
+                form.append("encrypted", "True");
+            }
+            else {
+                form.append("encrypted", "False");
+            }
+            if (encryption.e2e) {
+                form.append("e2e", "True");
+            }
+            else {
+                form.append("e2e", "False");
+            }
+            if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
+                const response = yield (0, curtain_encryption_1.encryptDataRSA)(data, encryption.publicKey);
+                const base64String = (0, curtain_encryption_1.arrayBufferToBase64String)(response);
+                form.append("file", new Blob([base64String], { type: 'text/json' }), "curtain-settings.json");
+            }
+            else {
+                form.append("file", new Blob([data], { type: 'text/json' }), "curtain-settings.json");
+            }
+            form.append("description", description);
+            form.append("curtain_type", sessionType);
+            let headers = new axios_1.AxiosHeaders();
+            headers["Accept"] = "application/json";
+            headers["Content-Type"] = "multipart/form-data";
+            if (onUploadProgress !== undefined) {
+                return yield this.axiosInstance.post(this.baseURL + "curtain/", form, { headers: headers, responseType: "json", onUploadProgress: onUploadProgress });
+            }
+            return yield this.axiosInstance.post(this.baseURL + "curtain/", form, { headers: headers, responseType: "json" });
         });
     }
     postSettings(id, token, onDownloadProgress = undefined) {

package/build/index.d.ts

@@ -1,5 +1,5 @@
 import { CurtainWebAPI, replacer, reviver } from "./classes/curtain-api";
 import { User } from "./classes/curtain-user";
 import { getProteomicsData, getPrideData, getEBIAlpha, getInteractomeAtlas, getStringDBInteractions } from "./utilities";
-import { importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage } from "./classes/curtain-encryption";
-export { CurtainWebAPI, User, getProteomicsData, getPrideData, getEBIAlpha, getInteractomeAtlas, getStringDBInteractions, replacer, reviver, importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage };
+import { importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage, pemToArrayBuffer, base64ToArrayBuffer, arrayBufferToBase64String, removeLines } from "./classes/curtain-encryption";
+export { CurtainWebAPI, User, getProteomicsData, getPrideData, getEBIAlpha, getInteractomeAtlas, getStringDBInteractions, replacer, reviver, importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage, pemToArrayBuffer, base64ToArrayBuffer, arrayBufferToBase64String, removeLines };

package/build/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveToLocalStorage = exports.loadFromLocalStorage = exports.decryptDataRSA = exports.encryptDataRSA = exports.generateKeyPair = exports.importPublicKey = exports.exportPublicKey = exports.exportKeyString = exports.exportPrivateKey = exports.importPrivateKey = exports.importKey = exports.reviver = exports.replacer = exports.getStringDBInteractions = exports.getInteractomeAtlas = exports.getEBIAlpha = exports.getPrideData = exports.getProteomicsData = exports.User = exports.CurtainWebAPI = void 0;
+exports.removeLines = exports.arrayBufferToBase64String = exports.base64ToArrayBuffer = exports.pemToArrayBuffer = exports.saveToLocalStorage = exports.loadFromLocalStorage = exports.decryptDataRSA = exports.encryptDataRSA = exports.generateKeyPair = exports.importPublicKey = exports.exportPublicKey = exports.exportKeyString = exports.exportPrivateKey = exports.importPrivateKey = exports.importKey = exports.reviver = exports.replacer = exports.getStringDBInteractions = exports.getInteractomeAtlas = exports.getEBIAlpha = exports.getPrideData = exports.getProteomicsData = exports.User = exports.CurtainWebAPI = void 0;
 const curtain_api_1 = require("./classes/curtain-api");
 Object.defineProperty(exports, "CurtainWebAPI", { enumerable: true, get: function () { return curtain_api_1.CurtainWebAPI; } });
 Object.defineProperty(exports, "replacer", { enumerable: true, get: function () { return curtain_api_1.replacer; } });
@@ -25,3 +25,7 @@ Object.defineProperty(exports, "encryptDataRSA", { enumerable: true, get: functi
 Object.defineProperty(exports, "decryptDataRSA", { enumerable: true, get: function () { return curtain_encryption_1.decryptDataRSA; } });
 Object.defineProperty(exports, "loadFromLocalStorage", { enumerable: true, get: function () { return curtain_encryption_1.loadFromLocalStorage; } });
 Object.defineProperty(exports, "saveToLocalStorage", { enumerable: true, get: function () { return curtain_encryption_1.saveToLocalStorage; } });
+Object.defineProperty(exports, "pemToArrayBuffer", { enumerable: true, get: function () { return curtain_encryption_1.pemToArrayBuffer; } });
+Object.defineProperty(exports, "base64ToArrayBuffer", { enumerable: true, get: function () { return curtain_encryption_1.base64ToArrayBuffer; } });
+Object.defineProperty(exports, "arrayBufferToBase64String", { enumerable: true, get: function () { return curtain_encryption_1.arrayBufferToBase64String; } });
+Object.defineProperty(exports, "removeLines", { enumerable: true, get: function () { return curtain_encryption_1.removeLines; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "curtain-web-api",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/src/classes/curtain-api.ts

@@ -1,6 +1,6 @@
 import {User} from "./curtain-user";
 import axios, {AxiosHeaders} from "axios";
-import {CurtainEncryption, encryptDataRSA} from "./curtain-encryption";
+import {arrayBufferToBase64String, CurtainEncryption, encryptDataRSA} from "./curtain-encryption";
 
 const base: string = "https://celsus.muttsu.xyz/"
 
@@ -199,7 +199,7 @@ export class CurtainWebAPI {
     }
 
 
-    putSettings(settings: any, enable: boolean = true, description: string = "", sessionType: string = "TP", encryption: CurtainEncryption = {
+    async putSettings(settings: any, enable: boolean = true, description: string = "", sessionType: string = "TP", encryption: CurtainEncryption = {
         encrypted: false,
         e2e: false,
     },   onUploadProgress: any = undefined) {
@@ -222,9 +222,9 @@ export class CurtainWebAPI {
         }
 
         if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
-            encryptDataRSA(data, encryption.publicKey).then((response) => {
-                form.append("file", new Blob([response], {type: 'text/json'}), "curtain-settings.json")
-            })
+            const response = await encryptDataRSA(data, encryption.publicKey)
+            const base64String = arrayBufferToBase64String(response)
+            form.append("file", new Blob([base64String], {type: 'text/json'}), "curtain-settings.json")
         } else {
             form.append("file", new Blob([data], {type: 'text/json'}), "curtain-settings.json")
         }
@@ -235,13 +235,9 @@ export class CurtainWebAPI {
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "multipart/form-data";
         if (onUploadProgress !== undefined) {
-            return this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json", onUploadProgress: onUploadProgress}).then((response) => {
-                return response;
-            });
+            return await this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json", onUploadProgress: onUploadProgress})
         }
-        return this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json"}).then((response) => {
-            return response;
-        });
+        return await this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json"})
     }
 
     postSettings(id: string, token: string, onDownloadProgress: any = undefined) {

package/src/index.ts

@@ -1,7 +1,7 @@
 import {CurtainWebAPI, replacer, reviver} from "./classes/curtain-api";
 import {User} from "./classes/curtain-user";
 import {getProteomicsData, getPrideData, getEBIAlpha, getInteractomeAtlas, getStringDBInteractions} from "./utilities";
-import {importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage} from "./classes/curtain-encryption";
+import {importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage, pemToArrayBuffer, base64ToArrayBuffer, arrayBufferToBase64String, removeLines} from "./classes/curtain-encryption";
 export {
   CurtainWebAPI,
   User,
@@ -23,5 +23,9 @@ export {
   encryptDataRSA,
   decryptDataRSA,
   loadFromLocalStorage,
-  saveToLocalStorage
+  saveToLocalStorage,
+  pemToArrayBuffer,
+  base64ToArrayBuffer,
+  arrayBufferToBase64String,
+  removeLines
 };