curtain-web-api 1.0.77 → 1.0.79

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

@@ -98,16 +98,25 @@ export interface CreatePermanentLinkRequest {
     requested_expiry_months?: number;
     reason?: string;
 }
+export interface AccessibleCurtain {
+    id: number;
+    link_id: string;
+    description: string;
+    created: string;
+    curtain_type: string;
+}
 export interface CurtainCollection {
     id: number;
     created: string;
     updated: string;
     name: string;
     description: string;
+    enable: boolean;
     owner: number;
     owner_username: string;
     curtains: number[];
     curtain_count: number;
+    accessible_curtains: AccessibleCurtain[];
 }
 export interface CreateCurtainCollection {
     name: string;
@@ -117,6 +126,7 @@ export interface CreateCurtainCollection {
 export interface UpdateCurtainCollection {
     name?: string;
     description?: string;
+    enable?: boolean;
     curtains?: number[];
 }
 export interface AddCurtainToCollection {
@@ -257,7 +267,7 @@ export declare class CurtainWebAPI {
         count: number;
         results: CurtainCollection[];
     }, any, {}>>;
-    getCurtainCollection(id: number): Promise<import("axios").AxiosResponse<CurtainCollection, any, {}>>;
+    getCurtainCollection(id: number, curtainType?: string): Promise<import("axios").AxiosResponse<CurtainCollection, any, {}>>;
     getCurtainCollectionSessions(id: number): Promise<import("axios").AxiosResponse<{
         collection_id: number;
         collection_name: string;

package/build/classes/curtain-api.js

@@ -1,6 +1,6 @@
 import { User } from "./curtain-user";
 import axios, { AxiosHeaders } from "axios";
-import { arrayBufferToBase64String, base64ToArrayBuffer, encryptAESData, encryptAESKey, exportAESKey, generateAESKey } from "./curtain-encryption";
+import { arrayBufferToBase64String, base64ToArrayBuffer, decodeJWTPayload, encryptAESData, encryptAESKey, exportAESKey, generateAESKey } from "./curtain-encryption";
 const base = "https://celsus.muttsu.xyz/";
 export const replacer = (key, value) => {
     if (value instanceof Map) {
@@ -175,6 +175,12 @@ export class CurtainWebAPI {
         });
     }
     checkIfRefreshTokenExpired() {
+        if (this.user.refresh_token) {
+            const payload = decodeJWTPayload(this.user.refresh_token);
+            if (payload && payload.exp) {
+                return Date.now() >= payload.exp * 1000;
+            }
+        }
         let now = new Date();
         let diff = (now.getTime() - this.user.lastRefreshTokenUpdate.getTime()) / 1000;
         diff = diff / 60 / 60;
@@ -957,10 +963,14 @@ export class CurtainWebAPI {
         }
         return this.axiosInstance.get(this.baseURL + "curtain-collections/", { headers: headers, params: params, responseType: "json" });
     }
-    getCurtainCollection(id) {
+    getCurtainCollection(id, curtainType) {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
-        return this.axiosInstance.get(this.baseURL + "curtain-collections/" + id + "/", { headers: headers, responseType: "json" });
+        let params = new URLSearchParams();
+        if (curtainType) {
+            params.append("curtain_type", curtainType);
+        }
+        return this.axiosInstance.get(this.baseURL + "curtain-collections/" + id + "/", { headers: headers, params: params, responseType: "json" });
     }
     getCurtainCollectionSessions(id) {
         let headers = new AxiosHeaders();

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

@@ -37,3 +37,4 @@ export declare function encryptDataAES(data: string, publicKey: CryptoKey): Prom
 }>;
 export declare function decryptDataAES(encryptedKey: ArrayBuffer, encryptedData: string, iv: string, privateKey: CryptoKey): Promise<string>;
 export declare function hashData(data: string): Promise<string>;
+export declare function decodeJWTPayload(token: string): any;

package/build/classes/curtain-encryption.js

@@ -137,3 +137,24 @@ export async function hashData(data) {
     const hash = await crypto.subtle.digest("SHA-256", encoded);
     return arrayBufferToBase64String(hash);
 }
+export function decodeJWTPayload(token) {
+    try {
+        const parts = token.split('.');
+        if (parts.length !== 3) {
+            return null;
+        }
+        const base64Url = parts[1];
+        let base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+        const pad = base64.length % 4;
+        if (pad) {
+            base64 += new Array(5 - pad).join('=');
+        }
+        const jsonPayload = decodeURIComponent(atob(base64).split('').map(function (c) {
+            return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+        }).join(''));
+        return JSON.parse(jsonPayload);
+    }
+    catch (e) {
+        return null;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "curtain-web-api",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "description": "",
   "type": "module",
   "main": "./build/index.js",

package/src/classes/curtain-api.ts

@@ -3,6 +3,7 @@ import axios, {AxiosHeaders} from "axios";
 import {
     arrayBufferToBase64String, base64ToArrayBuffer,
     CurtainEncryption,
+    decodeJWTPayload,
     encryptAESData, encryptAESKey,
     encryptDataRSA, exportAESKey,
     generateAESKey
@@ -135,16 +136,26 @@ export interface CreatePermanentLinkRequest {
     reason?: string;
 }
 
+export interface AccessibleCurtain {
+    id: number;
+    link_id: string;
+    description: string;
+    created: string;
+    curtain_type: string;
+}
+
 export interface CurtainCollection {
     id: number;
     created: string;
     updated: string;
     name: string;
     description: string;
+    enable: boolean;
     owner: number;
     owner_username: string;
     curtains: number[];
     curtain_count: number;
+    accessible_curtains: AccessibleCurtain[];
 }
 
 export interface CreateCurtainCollection {
@@ -156,6 +167,7 @@ export interface CreateCurtainCollection {
 export interface UpdateCurtainCollection {
     name?: string;
     description?: string;
+    enable?: boolean;
     curtains?: number[];
 }
 
@@ -357,6 +369,12 @@ export class CurtainWebAPI {
     }
 
     checkIfRefreshTokenExpired() {
+        if (this.user.refresh_token) {
+            const payload = decodeJWTPayload(this.user.refresh_token);
+            if (payload && payload.exp) {
+                return Date.now() >= payload.exp * 1000;
+            }
+        }
         let now = new Date();
         let diff = (now.getTime() - this.user.lastRefreshTokenUpdate.getTime()) / 1000;
         diff = diff/60/60;
@@ -1239,10 +1257,14 @@ export class CurtainWebAPI {
         return this.axiosInstance.get<{count: number, results: CurtainCollection[]}>(this.baseURL + "curtain-collections/", {headers: headers, params: params, responseType: "json"});
     }
 
-    getCurtainCollection(id: number) {
+    getCurtainCollection(id: number, curtainType?: string) {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
-        return this.axiosInstance.get<CurtainCollection>(this.baseURL + "curtain-collections/" + id + "/", {headers: headers, responseType: "json"});
+        let params = new URLSearchParams();
+        if (curtainType) {
+            params.append("curtain_type", curtainType);
+        }
+        return this.axiosInstance.get<CurtainCollection>(this.baseURL + "curtain-collections/" + id + "/", {headers: headers, params: params, responseType: "json"});
     }
 
     getCurtainCollectionSessions(id: number) {

package/src/classes/curtain-encryption.ts

@@ -1,176 +1,198 @@
-export function encryptDataRSA(data: string, publicKey: CryptoKey) {
-  return crypto.subtle.encrypt({name: 'RSA-OAEP'}, publicKey, new TextEncoder().encode(data))
-}
-
-export function decryptDataRSA(data: string, privateKey: CryptoKey) {
-  return crypto.subtle.decrypt({name: 'RSA-OAEP'}, privateKey, new TextEncoder().encode(data))
-}
-
-export async function importPublicKey(key: ArrayBuffer) {
-  return await crypto.subtle.importKey('spki', key, {name: 'RSA-OAEP', hash: 'SHA-256'}, true, ['encrypt'])
-}
-
-export async function importPrivateKey(key: ArrayBuffer) {
-  return await crypto.subtle.importKey('pkcs8', key, {name: 'RSA-OAEP', hash: 'SHA-256'}, true, ['decrypt'])
-}
-
-export async function generateKeyPair(modulusLength: number = 2048, publicExponent: Uint8Array = new Uint8Array([1, 0, 1])) {
-  return await crypto.subtle.generateKey(
-    {
-      name: "RSA-OAEP",
-      modulusLength: modulusLength,
-      publicExponent: publicExponent,
-      hash: "SHA-256",
-    } as RsaHashedKeyGenParams,
-    true,
-    ["encrypt", "decrypt"],
-  )
-}
-
-export async function exportPublicKey(key: CryptoKey) {
-  return await crypto.subtle.exportKey('spki', key)
-}
-
-export async function exportPrivateKey(key: CryptoKey) {
-  return await crypto.subtle.exportKey('pkcs8', key)
-}
-
-export async function importKey(key: ArrayBuffer, type: "public"|"private") {
-  if (type === "public") {
-    return await importPublicKey(key)
-  } else {
-    return await importPrivateKey(key)
-  }
-}
-
-export async function exportKeyString(key: CryptoKey, type: "public"|"private"): Promise<string> {
-  if (type === "public") {
-    const k = await exportPublicKey(key)
-    return arrayBufferToBase64String(k)
-  } else {
-    const k = await exportPrivateKey(key)
-    return arrayBufferToBase64String(k)
-  }
-}
-
-export async function saveToLocalStorage(key: CryptoKey, type: "public"|"private") {
-  const k = await exportKeyString(key, type)
-  localStorage.setItem(type + "_key", k)
-}
-
-export async function loadFromLocalStorage(type: "public"|"private") {
-  const k = localStorage.getItem(type + "_key")
-  if (k) {
-    return await importKey(pemToArrayBuffer(k), type)
-  }
-  return undefined
-}
-
-export interface CurtainEncryption {
-  encrypted: boolean,
-  publicKey?: CryptoKey,
-  e2e: boolean,
-}
-
-export function arrayBufferToBase64String(arrayBuffer: ArrayBuffer) {
-  const byteArray = new Uint8Array(arrayBuffer)
-  let byteString = ''
-  for (let i=0; i<byteArray.byteLength; i++) {
-    byteString += String.fromCharCode(byteArray[i])
-  }
-  return btoa(byteString)
-}
-
-export function removeLines(str_data: string) {
-  return str_data.replace("\n", "");
-}
-
-export function base64ToArrayBuffer(b64: string): ArrayBuffer {
-  const byteString = atob(b64);
-  const byteArray = new Uint8Array(byteString.length);
-  for(let i=0; i < byteString.length; i++) {
-    byteArray[i] = byteString.charCodeAt(i);
-  }
-
-  return byteArray.buffer;
-}
-
-export function pemToArrayBuffer(pem: string) {
-  const b64Lines = removeLines(pem);
-  let b64Prefix = b64Lines.replace('-----BEGIN PRIVATE KEY-----', '');
-  b64Prefix = b64Prefix.replace('-----BEGIN PUBLIC KEY-----', '');
-  let b64Final = b64Prefix.replace('-----END PRIVATE KEY-----', '');
-  b64Final = b64Final.replace('-----END PUBLIC KEY-----', '');
-
-  return base64ToArrayBuffer(b64Final);
-}
-
-// a function to generate to encrypt an aes key arraybuffer with a public key
-export async function encryptAESKey(publicKey: CryptoKey, aesKey: ArrayBuffer) {
-  return await crypto.subtle.encrypt({name: "RSA-OAEP"}, publicKey, aesKey)
-}
-
-// a function to generate an aes key in GCM mode with a length of 256 bits
-export async function generateAESKey() {
-  return await crypto.subtle.generateKey(
-    {
-      name: "AES-GCM",
-      length: 256,
-    },
-    true,
-    ["encrypt", "decrypt"],
-  )
-}
-
-// a function to encrypt a string with an aes key
-export async function encryptAESData(aesKey: CryptoKey, data: string) {
-  const iv = crypto.getRandomValues(new Uint8Array(12))
-  const enc = new TextEncoder()
-  const encoded = enc.encode(data)
-  const encrypted = await crypto.subtle.encrypt({name: "AES-GCM", iv: iv}, aesKey, encoded)
-  return {encrypted: arrayBufferToBase64String(encrypted), iv: arrayBufferToBase64String(iv.buffer)}
-}
-
-// a function to decrypt a string with an aes key
-export async function decryptAESData(aesKey: CryptoKey, data: string, iv: string) {
-  const dec = new TextDecoder()
-  const decrypted = await crypto.subtle.decrypt({name: "AES-GCM", iv: base64ToArrayBuffer(iv)}, aesKey, base64ToArrayBuffer(data))
-  return dec.decode(decrypted)
-}
-
-// a function to decrypt an aes key with a private key
-export async function decryptAESKey(privateKey: CryptoKey, encryptedKey: ArrayBuffer) {
-  return await crypto.subtle.decrypt({name: "RSA-OAEP"}, privateKey, encryptedKey)
-}
-
-// a function to export an aes key to a string
-export async function exportAESKey(key: CryptoKey) {
-  return await crypto.subtle.exportKey("raw", key)
-}
-// a function to import an aes key from a string
-export async function importAESKey(key: ArrayBuffer) {
-  return await crypto.subtle.importKey("raw", key, "AES-GCM", true, ["encrypt", "decrypt"])
-}
-
-// a function to encrypt aes key with a public key and also use the aes key to encrypt a large string then return the encrypted aes key and the encrypted string
-export async function encryptDataAES(data: string, publicKey: CryptoKey) {
-  const aesKey = await generateAESKey()
-  const encryptedKey = await encryptAESKey(publicKey, await exportAESKey(aesKey))
-  const encryptedData = await encryptAESData(aesKey, data)
-  return {encryptedKey: arrayBufferToBase64String(encryptedKey), encryptedData: encryptedData}
-}
-
-// a function to decrypt an aes key with a private key and use the aes key to decrypt a large string
-export async function decryptDataAES(encryptedKey: ArrayBuffer, encryptedData: string, iv: string, privateKey: CryptoKey) {
-  const aesKey = await decryptAESKey(privateKey, encryptedKey)
-  //import aes key
-  return await decryptAESData(await importAESKey(aesKey), encryptedData, iv)
-}
-
-// a function to calculate sha-256 hash of a large string
-export async function hashData(data: string) {
-  const enc = new TextEncoder()
-  const encoded = enc.encode(data)
-  const hash = await crypto.subtle.digest("SHA-256", encoded)
-  return arrayBufferToBase64String(hash)
-}
+export function encryptDataRSA(data: string, publicKey: CryptoKey) {
+  return crypto.subtle.encrypt({name: 'RSA-OAEP'}, publicKey, new TextEncoder().encode(data))
+}
+
+export function decryptDataRSA(data: string, privateKey: CryptoKey) {
+  return crypto.subtle.decrypt({name: 'RSA-OAEP'}, privateKey, new TextEncoder().encode(data))
+}
+
+export async function importPublicKey(key: ArrayBuffer) {
+  return await crypto.subtle.importKey('spki', key, {name: 'RSA-OAEP', hash: 'SHA-256'}, true, ['encrypt'])
+}
+
+export async function importPrivateKey(key: ArrayBuffer) {
+  return await crypto.subtle.importKey('pkcs8', key, {name: 'RSA-OAEP', hash: 'SHA-256'}, true, ['decrypt'])
+}
+
+export async function generateKeyPair(modulusLength: number = 2048, publicExponent: Uint8Array = new Uint8Array([1, 0, 1])) {
+  return await crypto.subtle.generateKey(
+    {
+      name: "RSA-OAEP",
+      modulusLength: modulusLength,
+      publicExponent: publicExponent,
+      hash: "SHA-256",
+    } as RsaHashedKeyGenParams,
+    true,
+    ["encrypt", "decrypt"],
+  )
+}
+
+export async function exportPublicKey(key: CryptoKey) {
+  return await crypto.subtle.exportKey('spki', key)
+}
+
+export async function exportPrivateKey(key: CryptoKey) {
+  return await crypto.subtle.exportKey('pkcs8', key)
+}
+
+export async function importKey(key: ArrayBuffer, type: "public"|"private") {
+  if (type === "public") {
+    return await importPublicKey(key)
+  } else {
+    return await importPrivateKey(key)
+  }
+}
+
+export async function exportKeyString(key: CryptoKey, type: "public"|"private"): Promise<string> {
+  if (type === "public") {
+    const k = await exportPublicKey(key)
+    return arrayBufferToBase64String(k)
+  } else {
+    const k = await exportPrivateKey(key)
+    return arrayBufferToBase64String(k)
+  }
+}
+
+export async function saveToLocalStorage(key: CryptoKey, type: "public"|"private") {
+  const k = await exportKeyString(key, type)
+  localStorage.setItem(type + "_key", k)
+}
+
+export async function loadFromLocalStorage(type: "public"|"private") {
+  const k = localStorage.getItem(type + "_key")
+  if (k) {
+    return await importKey(pemToArrayBuffer(k), type)
+  }
+  return undefined
+}
+
+export interface CurtainEncryption {
+  encrypted: boolean,
+  publicKey?: CryptoKey,
+  e2e: boolean,
+}
+
+export function arrayBufferToBase64String(arrayBuffer: ArrayBuffer) {
+  const byteArray = new Uint8Array(arrayBuffer)
+  let byteString = ''
+  for (let i=0; i<byteArray.byteLength; i++) {
+    byteString += String.fromCharCode(byteArray[i])
+  }
+  return btoa(byteString)
+}
+
+export function removeLines(str_data: string) {
+  return str_data.replace("\n", "");
+}
+
+export function base64ToArrayBuffer(b64: string): ArrayBuffer {
+  const byteString = atob(b64);
+  const byteArray = new Uint8Array(byteString.length);
+  for(let i=0; i < byteString.length; i++) {
+    byteArray[i] = byteString.charCodeAt(i);
+  }
+
+  return byteArray.buffer;
+}
+
+export function pemToArrayBuffer(pem: string) {
+  const b64Lines = removeLines(pem);
+  let b64Prefix = b64Lines.replace('-----BEGIN PRIVATE KEY-----', '');
+  b64Prefix = b64Prefix.replace('-----BEGIN PUBLIC KEY-----', '');
+  let b64Final = b64Prefix.replace('-----END PRIVATE KEY-----', '');
+  b64Final = b64Final.replace('-----END PUBLIC KEY-----', '');
+
+  return base64ToArrayBuffer(b64Final);
+}
+
+// a function to generate to encrypt an aes key arraybuffer with a public key
+export async function encryptAESKey(publicKey: CryptoKey, aesKey: ArrayBuffer) {
+  return await crypto.subtle.encrypt({name: "RSA-OAEP"}, publicKey, aesKey)
+}
+
+// a function to generate an aes key in GCM mode with a length of 256 bits
+export async function generateAESKey() {
+  return await crypto.subtle.generateKey(
+    {
+      name: "AES-GCM",
+      length: 256,
+    },
+    true,
+    ["encrypt", "decrypt"],
+  )
+}
+
+// a function to encrypt a string with an aes key
+export async function encryptAESData(aesKey: CryptoKey, data: string) {
+  const iv = crypto.getRandomValues(new Uint8Array(12))
+  const enc = new TextEncoder()
+  const encoded = enc.encode(data)
+  const encrypted = await crypto.subtle.encrypt({name: "AES-GCM", iv: iv}, aesKey, encoded)
+  return {encrypted: arrayBufferToBase64String(encrypted), iv: arrayBufferToBase64String(iv.buffer)}
+}
+
+// a function to decrypt a string with an aes key
+export async function decryptAESData(aesKey: CryptoKey, data: string, iv: string) {
+  const dec = new TextDecoder()
+  const decrypted = await crypto.subtle.decrypt({name: "AES-GCM", iv: base64ToArrayBuffer(iv)}, aesKey, base64ToArrayBuffer(data))
+  return dec.decode(decrypted)
+}
+
+// a function to decrypt an aes key with a private key
+export async function decryptAESKey(privateKey: CryptoKey, encryptedKey: ArrayBuffer) {
+  return await crypto.subtle.decrypt({name: "RSA-OAEP"}, privateKey, encryptedKey)
+}
+
+// a function to export an aes key to a string
+export async function exportAESKey(key: CryptoKey) {
+  return await crypto.subtle.exportKey ("raw", key)
+}
+// a function to import an aes key from a string
+export async function importAESKey(key: ArrayBuffer) {
+  return await crypto.subtle.importKey("raw", key, "AES-GCM", true, ["encrypt", "decrypt"])
+}
+
+// a function to encrypt aes key with a public key and also use the aes key to encrypt a large string then return the encrypted aes key and the encrypted string
+export async function encryptDataAES(data: string, publicKey: CryptoKey) {
+  const aesKey = await generateAESKey()
+  const encryptedKey = await encryptAESKey(publicKey, await exportAESKey(aesKey))
+  const encryptedData = await encryptAESData(aesKey, data)
+  return {encryptedKey: arrayBufferToBase64String(encryptedKey), encryptedData: encryptedData}
+}
+
+// a function to decrypt an aes key with a private key and use the aes key to decrypt a large string
+export async function decryptDataAES(encryptedKey: ArrayBuffer, encryptedData: string, iv: string, privateKey: CryptoKey) {
+  const aesKey = await decryptAESKey(privateKey, encryptedKey)
+  //import aes key
+  return await decryptAESData(await importAESKey(aesKey), encryptedData, iv)
+}
+
+// a function to calculate sha-256 hash of a large string
+export async function hashData(data: string) {
+  const enc = new TextEncoder()
+  const encoded = enc.encode(data)
+  const hash = await crypto.subtle.digest("SHA-256", encoded)
+  return arrayBufferToBase64String(hash)
+}
+
+export function decodeJWTPayload(token: string) {
+  try {
+    const parts = token.split('.');
+    if (parts.length !== 3) {
+      return null;
+    }
+    const base64Url = parts[1];
+    let base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+    const pad = base64.length % 4;
+    if (pad) {
+      base64 += new Array(5 - pad).join('=');
+    }
+    const jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) {
+      return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+    }).join(''));
+
+    return JSON.parse(jsonPayload);
+  } catch (e) {
+    return null;
+  }
+}