core-3nweb-client-lib 0.49.0 → 0.49.1

package/build/core/startup/sign-in.d.ts

@@ -20,6 +20,7 @@ export declare class SignIn {
     constructor(cryptor: Cryptor, startInitWithoutCache: StartInitWithoutCache, initWithCache: InitWithCache, getUsersOnDisk: GetUsersOnDisk, saveStorageKeyForAutologin: ((storageKey: Uint8Array) => void) | undefined, watchBoot: SignInService['watchBoot'], logError: LogError);
     exposedService(): SignInService;
     private startLoginToRemoteStorage;
+    private getAddressFromDisk;
     private completeLoginAndLocalSetup;
     private useExistingStorage;
     private logAndWrap;

package/build/core/startup/sign-in.js

@@ -20,6 +20,7 @@ exports.SignIn = void 0;
 exports.makeKeyGenProgressCB = makeKeyGenProgressCB;
 const key_derivation_1 = require("../../lib-client/key-derivation");
 const error_1 = require("../../lib-common/exceptions/error");
+const canonical_address_1 = require("../../lib-common/canonical-address");
 class SignIn {
     constructor(cryptor, startInitWithoutCache, initWithCache, getUsersOnDisk, saveStorageKeyForAutologin, watchBoot, logError) {
         this.cryptor = cryptor;
@@ -44,6 +45,10 @@ class SignIn {
     }
     async startLoginToRemoteStorage(address) {
         try {
+            const addrOnDisk = await this.getAddressFromDisk(address);
+            if (addrOnDisk) {
+                throw new Error(`${address} exists on disk as ${addrOnDisk}`);
+            }
             this.completeInitWithoutCache = await this.startInitWithoutCache(address);
             return !!this.completeInitWithoutCache;
         }
@@ -51,6 +56,10 @@ class SignIn {
             throw await this.logAndWrap(err, 'Fail to start login to remote storage');
         }
     }
+    async getAddressFromDisk(address) {
+        const usersOnDisk = await this.getUsersOnDisk();
+        return usersOnDisk.find(existing => (0, canonical_address_1.areAddressesEqual)(existing, address));
+    }
     async completeLoginAndLocalSetup(pass, progressCB) {
         var _a;
         if (!this.completeInitWithoutCache) {
@@ -62,8 +71,10 @@ class SignIn {
             const storeKeyProgressCB = makeKeyGenProgressCB(51, 100, progressCB);
             let storeKey;
             const storeKeyGen = async (params) => {
-                storeKey = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
-                return storeKey;
+                const key = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
+                storeKey = new Uint8Array(key.length);
+                storeKey.set(key);
+                return key;
             };
             const ok = await this.completeInitWithoutCache(midKeyGen, storeKeyGen);
             if (ok) {
@@ -77,12 +88,18 @@ class SignIn {
     }
     async useExistingStorage(user, pass, progressCB) {
         var _a;
+        const addrOnDisk = await this.getAddressFromDisk(user);
+        if (addrOnDisk) {
+            user = addrOnDisk;
+        }
         try {
             let storeKey;
             const storeKeyProgressCB = makeKeyGenProgressCB(0, 99, progressCB);
             const storeKeyGen = async (params) => {
-                storeKey = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
-                return storeKey;
+                const key = await (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
+                storeKey = new Uint8Array(key.length);
+                storeKey.set(key);
+                return key;
             };
             const ok = await this.initWithCache(user, storeKeyGen);
             if (ok) {

package/build/core/startup/sign-up.js

@@ -164,7 +164,8 @@ class SignUp {
         if (!accountCreated) {
             return false;
         }
-        const storeKey = this.store.skey;
+        const storeKey = new Uint8Array(this.store.skey.length);
+        storeKey.set(this.store.skey);
         this.initForNewUser({
             address,
             midSKey: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",