curtain-web-api 1.0.62 → 1.0.63

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

@@ -2,6 +2,12 @@ import { User } from "./curtain-user";
 import { CurtainEncryption } from "./curtain-encryption";
 export declare const replacer: (key: any, value: any) => any;
 export declare const reviver: (key: any, value: any) => any;
+export interface SiteProperties {
+    non_user_post: boolean;
+    allow_user_set_permanent: boolean;
+    expiry_duration_options: number[];
+    default_expiry_duration_months: number;
+}
 export declare class CurtainWebAPI {
     loginURL: string;
     logoutURL: string;
@@ -22,7 +28,7 @@ export declare class CurtainWebAPI {
     ORCIDLogin(authorizationCode: string, redirectURI: string): Promise<User>;
     checkIfRefreshTokenExpired(): boolean;
     deleteCurtainLink(curtainLinkID: string): Promise<import("axios").AxiosResponse<any, any, {}>>;
-    putSettings(settings: any, enable?: boolean, description?: string, sessionType?: string, encryption?: CurtainEncryption, permanent?: boolean, onUploadProgress?: any): Promise<import("axios").AxiosResponse<any, any, {}>>;
+    putSettings(settings: any, enable?: boolean, description?: string, sessionType?: string, encryption?: CurtainEncryption, permanent?: boolean, expiry_duration?: number, onUploadProgress?: any): Promise<import("axios").AxiosResponse<any, any, {}>>;
     postSettings(id: string, token: string, onDownloadProgress?: any, url?: string | undefined): 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, {}>>;
@@ -32,7 +38,7 @@ export declare class CurtainWebAPI {
     getOwners(linkId: string): Promise<import("axios").AxiosResponse<any, any, {}>>;
     addOwner(linkId: string, owner: string): Promise<import("axios").AxiosResponse<any, any, {}>>;
     getCurtainLinks(username: string, sessionDescription?: string, offset?: number, sessionType?: string): Promise<import("axios").AxiosResponse<any, any, {}>>;
-    getSiteProperties(): Promise<import("axios").AxiosResponse<any, any, {}>>;
+    getSiteProperties(): Promise<import("axios").AxiosResponse<SiteProperties, any, {}>>;
     saveDataFilterList(name: string, data: string, category?: string): Promise<import("axios").AxiosResponse<any, any, {}>>;
     getDataFilterListByID(id: number, limit?: number): Promise<import("axios").AxiosResponse<any, any, {}>>;
     getDataFilterList(title?: string, searchTerm?: string, category?: string, limit?: number, offset?: number): Promise<import("axios").AxiosResponse<any, any, {}>>;

package/build/classes/curtain-api.js

@@ -235,7 +235,7 @@ class CurtainWebAPI {
         return __awaiter(this, arguments, void 0, function* (settings, enable = true, description = "", sessionType = "TP", encryption = {
             encrypted: false,
             e2e: false,
-        }, permanent = false, onUploadProgress = undefined) {
+        }, permanent = false, expiry_duration, onUploadProgress = undefined) {
             let form = new FormData();
             let data = JSON.stringify(settings, exports.replacer);
             if (enable) {
@@ -262,6 +262,9 @@ class CurtainWebAPI {
             else {
                 form.append("permanent", "False");
             }
+            if (expiry_duration !== undefined) {
+                form.append("expiry_duration", expiry_duration.toString());
+            }
             if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
                 const aesKey = yield (0, curtain_encryption_1.generateAESKey)();
                 console.log("Encrypting data");
@@ -377,6 +380,9 @@ class CurtainWebAPI {
                     form.append("enable", "False");
                 }
             }
+            if ("expiry_duration" in sessionData) {
+                form.append("expiry_duration", sessionData["expiry_duration"].toString());
+            }
             if (encryption.encrypted) {
                 form.append("encrypted", "True");
             }
@@ -442,9 +448,7 @@ class CurtainWebAPI {
     getSiteProperties() {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";
-        return this.axiosInstance.get(this.baseURL + "site-properties/", { headers: headers, responseType: "json" }).then((response) => {
-            return response;
-        });
+        return this.axiosInstance.get(this.baseURL + "site-properties/", { headers: headers, responseType: "json" });
     }
     saveDataFilterList(name, data, category = "") {
         let headers = new axios_1.AxiosHeaders();

package/build/index.d.ts

@@ -1,6 +1,6 @@
-import { CurtainWebAPI, replacer, reviver } from "./classes/curtain-api";
+import { CurtainWebAPI, replacer, reviver, SiteProperties } 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, pemToArrayBuffer, base64ToArrayBuffer, arrayBufferToBase64String, removeLines } from "./classes/curtain-encryption";
 import PouchDB from "pouchdb";
-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, PouchDB };
+export { CurtainWebAPI, User, getProteomicsData, getPrideData, getEBIAlpha, getInteractomeAtlas, getStringDBInteractions, replacer, reviver, SiteProperties, importKey, importPrivateKey, exportPrivateKey, exportKeyString, exportPublicKey, importPublicKey, CurtainEncryption, generateKeyPair, encryptDataRSA, decryptDataRSA, loadFromLocalStorage, saveToLocalStorage, pemToArrayBuffer, base64ToArrayBuffer, arrayBufferToBase64String, removeLines, PouchDB };

package/package.json

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

package/src/classes/curtain-api.ts

@@ -30,6 +30,13 @@ export const reviver = (key: any, value: any) => {
     return value;
 }
 
+export interface SiteProperties {
+    non_user_post: boolean;
+    allow_user_set_permanent: boolean;
+    expiry_duration_options: number[];
+    default_expiry_duration_months: number;
+}
+
 export class CurtainWebAPI {
     loginURL: string = "";
     logoutURL: string = "";
@@ -211,7 +218,7 @@ export class CurtainWebAPI {
     async putSettings(settings: any, enable: boolean = true, description: string = "", sessionType: string = "TP", encryption: CurtainEncryption = {
         encrypted: false,
         e2e: false,
-    }, permanent: boolean = false, onUploadProgress: any = undefined) {
+    }, permanent: boolean = false, expiry_duration?: number, onUploadProgress: any = undefined) {
         let form: FormData = new FormData();
         let data = JSON.stringify(settings, replacer)
         if (enable) {
@@ -234,6 +241,9 @@ export class CurtainWebAPI {
         } else {
             form.append("permanent", "False")
         }
+        if (expiry_duration !== undefined) {
+            form.append("expiry_duration", expiry_duration.toString())
+        }
         if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
             const aesKey = await generateAESKey()
             console.log("Encrypting data")
@@ -350,6 +360,10 @@ export class CurtainWebAPI {
             }
         }
 
+        if ("expiry_duration" in sessionData) {
+            form.append("expiry_duration", sessionData["expiry_duration"].toString())
+        }
+
         if (encryption.encrypted) {
             form.append("encrypted", "True")
         } else {
@@ -422,9 +436,7 @@ export class CurtainWebAPI {
     getSiteProperties() {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
-        return this.axiosInstance.get(this.baseURL + "site-properties/", {headers: headers, responseType:"json"}).then((response) => {
-            return response;
-        });
+        return this.axiosInstance.get<SiteProperties>(this.baseURL + "site-properties/", {headers: headers, responseType:"json"});
     }
 
     saveDataFilterList(name: string, data: string, category: string = "") {

package/src/index.ts

@@ -1,4 +1,4 @@
-import {CurtainWebAPI, replacer, reviver} from "./classes/curtain-api";
+import {CurtainWebAPI, replacer, reviver, SiteProperties} 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, pemToArrayBuffer, base64ToArrayBuffer, arrayBufferToBase64String, removeLines} from "./classes/curtain-encryption";
@@ -13,6 +13,7 @@ export {
   getStringDBInteractions,
   replacer,
   reviver,
+  SiteProperties,
   importKey,
   importPrivateKey,
   exportPrivateKey,