curtain-web-api 1.0.42 → 1.0.44

package/build/classes/curtain-api.d.ts

@@ -25,7 +25,7 @@ export declare class CurtainWebAPI {
     postSettings(id: string, token: string, onDownloadProgress?: any): Promise<import("axios").AxiosResponse<any, any>>;
     getPrideData(accession: string): Promise<import("axios").AxiosResponse<any, any>>;
     generateTemporarySession(linkId: string, lifetime: number): Promise<import("axios").AxiosResponse<any, any>>;
-    updateSession(sessionData: any, linkId: string): Promise<import("axios").AxiosResponse<any, any>>;
+    updateSession(sessionData: any, linkId: string, encryption?: CurtainEncryption): Promise<import("axios").AxiosResponse<any, any>>;
     getSessionSettings(linkId: string): Promise<import("axios").AxiosResponse<any, any>>;
     getOwnership(linkId: string): Promise<import("axios").AxiosResponse<any, any>>;
     getOwners(linkId: string): Promise<import("axios").AxiosResponse<any, any>>;

package/build/classes/curtain-api.js

@@ -312,25 +312,56 @@ class CurtainWebAPI {
             return response;
         });
     }
-    updateSession(sessionData, linkId) {
-        let payload = new FormData();
-        if ("file" in sessionData) {
-            payload.append("file", new Blob([JSON.stringify(sessionData["file"], exports.replacer)], { type: 'text/json' }), "curtain-settings.json");
-            payload.append("description", sessionData["file"]["settings"]["description"]);
-        }
-        if ("enable" in sessionData) {
-            if (sessionData["enable"]) {
-                payload.append("enable", "True");
+    updateSession(sessionData, linkId, encryption = {
+        encrypted: false,
+        e2e: false,
+    }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let form = new FormData();
+            if ("file" in sessionData) {
+                let data = JSON.stringify(sessionData["file"], exports.replacer);
+                if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
+                    const aesKey = yield (0, curtain_encryption_1.generateAESKey)();
+                    const encryptedData = yield (0, curtain_encryption_1.encryptAESData)(aesKey, data);
+                    const encryptedKey = yield (0, curtain_encryption_1.encryptAESKey)(encryption.publicKey, yield (0, curtain_encryption_1.exportAESKey)(aesKey));
+                    const encryptedIV = yield (0, curtain_encryption_1.encryptAESKey)(encryption.publicKey, (0, curtain_encryption_1.base64ToArrayBuffer)(encryptedData.iv));
+                    const payload = {
+                        encryptedData: encryptedData.encrypted,
+                        encryptedKey: (0, curtain_encryption_1.arrayBufferToBase64String)(encryptedKey),
+                        encryptedIV: (0, curtain_encryption_1.arrayBufferToBase64String)(encryptedIV)
+                    };
+                    form.append("encryptedKey", payload.encryptedKey);
+                    form.append("encryptedIV", payload.encryptedIV);
+                    form.append("file", new Blob([payload.encryptedData], { type: 'text/json' }), "curtain-settings.json");
+                }
+                else {
+                    form.append("file", new Blob([data], { type: 'text/json' }), "curtain-settings.json");
+                }
+            }
+            if ("enable" in sessionData) {
+                if (sessionData["enable"]) {
+                    form.append("enable", "True");
+                }
+                else {
+                    form.append("enable", "False");
+                }
+            }
+            if (encryption.encrypted) {
+                form.append("encrypted", "True");
             }
             else {
-                payload.append("enable", "False");
+                form.append("encrypted", "False");
             }
-        }
-        let headers = new axios_1.AxiosHeaders();
-        headers["Accept"] = "application/json";
-        headers["Content-Type"] = "multipart/form-data";
-        return this.axiosInstance.patch(this.baseURL + "curtain/" + linkId + "/", payload, { responseType: "json" }).then((response) => {
-            return response;
+            if (encryption.e2e) {
+                form.append("e2e", "True");
+            }
+            else {
+                form.append("e2e", "False");
+            }
+            let headers = new axios_1.AxiosHeaders();
+            headers["Accept"] = "application/json";
+            headers["Content-Type"] = "multipart/form-data";
+            return this.axiosInstance.patch(this.baseURL + "curtain/" + linkId + "/", form, { responseType: "json" });
         });
     }
     getSessionSettings(linkId) {
@@ -483,10 +514,12 @@ class CurtainWebAPI {
         return this.axiosInstance.post(this.baseURL + "curtain/" + linkId + "/set_encryption_factors/", { encryption_key: encryptedAESKey, encryption_iv: encryptedIV }, { headers: headers, responseType: "json" }).then((response) => { return response; });
     }
     getEncryptionFactors(linkId) {
-        let headers = new axios_1.AxiosHeaders();
-        headers["Accept"] = "application/json";
-        headers["Content-Type"] = "application/json";
-        return this.axiosInstance.get(this.baseURL + "curtain/" + linkId + "/get_encryption_factors/", { headers: headers, responseType: "json" }).then((response) => { return response; });
+        return __awaiter(this, void 0, void 0, function* () {
+            let headers = new axios_1.AxiosHeaders();
+            headers["Accept"] = "application/json";
+            headers["Content-Type"] = "application/json";
+            return yield this.axiosInstance.get(this.baseURL + "curtain/" + linkId + "/get_encryption_factors/", { headers: headers, responseType: "json" });
+        });
     }
 }
 exports.CurtainWebAPI = CurtainWebAPI;

package/package.json

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

package/src/classes/curtain-api.ts

@@ -299,27 +299,55 @@ export class CurtainWebAPI {
         });
     }
 
-    updateSession(sessionData: any, linkId: string) {
-        let payload: FormData = new FormData();
+    async updateSession(sessionData: any, linkId: string, encryption: CurtainEncryption = {
+        encrypted: false,
+        e2e: false,
+    }) {
+        let form: FormData = new FormData();
         if ("file" in sessionData) {
-            payload.append("file", new Blob([JSON.stringify(sessionData["file"], replacer)], {type: 'text/json'}), "curtain-settings.json")
-            payload.append("description", sessionData["file"]["settings"]["description"])
+            let data = JSON.stringify(sessionData["file"], replacer)
+            if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
+                const aesKey = await generateAESKey()
+                const encryptedData = await encryptAESData(aesKey, data)
+                const encryptedKey = await encryptAESKey(encryption.publicKey, await exportAESKey(aesKey))
+                const encryptedIV = await encryptAESKey(encryption.publicKey, base64ToArrayBuffer(encryptedData.iv))
+                const payload = {
+                    encryptedData: encryptedData.encrypted,
+                    encryptedKey: arrayBufferToBase64String(encryptedKey),
+                    encryptedIV: arrayBufferToBase64String(encryptedIV)
+                }
+
+                form.append("encryptedKey", payload.encryptedKey)
+                form.append("encryptedIV", payload.encryptedIV)
+                form.append("file", new Blob([payload.encryptedData], {type: 'text/json'}), "curtain-settings.json")
+            } else {
+                form.append("file", new Blob([data], {type: 'text/json'}), "curtain-settings.json")
+            }
         }
         if ("enable" in sessionData) {
             if (sessionData["enable"]) {
-                payload.append("enable", "True")
+                form.append("enable", "True")
             } else {
-                payload.append("enable", "False")
+                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")
+        }
+
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "multipart/form-data";
 
-        return this.axiosInstance.patch(this.baseURL + "curtain/" + linkId + "/", payload, {responseType:"json"}).then((response) => {
-            return response;
-        });
+        return this.axiosInstance.patch(this.baseURL + "curtain/" + linkId + "/", form, {responseType:"json"})
     }
 
     getSessionSettings(linkId: string) {
@@ -497,11 +525,11 @@ export class CurtainWebAPI {
         return this.axiosInstance.post(this.baseURL + "curtain/" + linkId + "/set_encryption_factors/", {encryption_key: encryptedAESKey, encryption_iv: encryptedIV}, {headers: headers, responseType: "json"}).then((response) => {return response;});
     }
 
-    getEncryptionFactors(linkId: string) {
+    async getEncryptionFactors(linkId: string) {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
-        return this.axiosInstance.get(this.baseURL + "curtain/" + linkId + "/get_encryption_factors/", {headers: headers, responseType: "json"}).then((response) => {return response;});
+        return await this.axiosInstance.get(this.baseURL + "curtain/" + linkId + "/get_encryption_factors/", {headers: headers, responseType: "json"})
     }
 }