curtain-web-api 1.0.37 → 1.0.39

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

@@ -14,3 +14,7 @@ export interface CurtainEncryption {
     publicKey?: CryptoKey;
     e2e: boolean;
 }
+export declare function arrayBufferToBase64String(arrayBuffer: ArrayBuffer): string;
+export declare function removeLines(str_data: string): string;
+export declare function base64ToArrayBuffer(b64: string): Uint8Array;
+export declare function pemToArrayBuffer(pem: string): Uint8Array;

package/build/classes/curtain-encryption.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadFromLocalStorage = exports.saveToLocalStorage = exports.exportKeyString = exports.importKey = exports.exportPrivateKey = exports.exportPublicKey = exports.generateKeyPair = exports.importPrivateKey = exports.importPublicKey = exports.decryptDataRSA = exports.encryptDataRSA = void 0;
+exports.pemToArrayBuffer = exports.base64ToArrayBuffer = exports.removeLines = exports.arrayBufferToBase64String = exports.loadFromLocalStorage = exports.saveToLocalStorage = exports.exportKeyString = exports.importKey = exports.exportPrivateKey = exports.exportPublicKey = exports.generateKeyPair = exports.importPrivateKey = exports.importPublicKey = exports.decryptDataRSA = exports.encryptDataRSA = void 0;
 function encryptDataRSA(data, publicKey) {
     return crypto.subtle.encrypt({ name: 'RSA-OAEP' }, publicKey, new TextEncoder().encode(data));
 }
@@ -66,14 +66,13 @@ function importKey(key, type) {
 exports.importKey = importKey;
 function exportKeyString(key, type) {
     return __awaiter(this, void 0, void 0, function* () {
-        const decoder = new TextDecoder("utf-8");
         if (type === "public") {
             const k = yield exportPublicKey(key);
-            return decoder.decode(k);
+            return arrayBufferToBase64String(k);
         }
         else {
             const k = yield exportPrivateKey(key);
-            return decoder.decode(k);
+            return arrayBufferToBase64String(k);
         }
     });
 }
@@ -89,9 +88,40 @@ function loadFromLocalStorage(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const k = localStorage.getItem(type + "_key");
         if (k) {
-            return yield importKey(new TextEncoder().encode(k), type);
+            return yield importKey(pemToArrayBuffer(k), type);
         }
         return undefined;
     });
 }
 exports.loadFromLocalStorage = loadFromLocalStorage;
+function arrayBufferToBase64String(arrayBuffer) {
+    const byteArray = new Uint8Array(arrayBuffer);
+    let byteString = '';
+    for (let i = 0; i < byteArray.byteLength; i++) {
+        byteString += String.fromCharCode(byteArray[i]);
+    }
+    return btoa(byteString);
+}
+exports.arrayBufferToBase64String = arrayBufferToBase64String;
+function removeLines(str_data) {
+    return str_data.replace("\n", "");
+}
+exports.removeLines = removeLines;
+function base64ToArrayBuffer(b64) {
+    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;
+}
+exports.base64ToArrayBuffer = base64ToArrayBuffer;
+function pemToArrayBuffer(pem) {
+    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);
+}
+exports.pemToArrayBuffer = pemToArrayBuffer;

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.37",
+  "version": "1.0.39",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/src/classes/curtain-encryption.ts

@@ -44,13 +44,12 @@ export async function importKey(key: ArrayBuffer, type: "public"|"private") {
 }
 
 export async function exportKeyString(key: CryptoKey, type: "public"|"private"): Promise<string> {
-  const decoder = new TextDecoder("utf-8")
   if (type === "public") {
     const k = await exportPublicKey(key)
-    return decoder.decode(k)
+    return arrayBufferToBase64String(k)
   } else {
     const k = await exportPrivateKey(key)
-    return decoder.decode(k)
+    return arrayBufferToBase64String(k)
   }
 }
 
@@ -62,7 +61,7 @@ export async function saveToLocalStorage(key: CryptoKey, type: "public"|"private
 export async function loadFromLocalStorage(type: "public"|"private") {
   const k = localStorage.getItem(type + "_key")
   if (k) {
-    return await importKey(new TextEncoder().encode(k), type)
+    return await importKey(pemToArrayBuffer(k), type)
   }
   return undefined
 }
@@ -72,3 +71,36 @@ export interface CurtainEncryption {
   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) {
+  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;
+}
+
+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);
+}

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
 };