core-3nweb-client-lib 0.48.7 → 0.49.1

package/build/core/index.d.ts

@@ -28,7 +28,7 @@ export declare class Core {
     private isInitialized;
     private constructor();
     static make(conf: CoreConf, makeNet: MakeNet, makeResolver: ServiceLocatorMaker, makeCryptor: makeCryptor, random: AsyncRNG): Core;
-    start(): {
+    start(saveStorageKeyForAutologin?: (storageKey: Uint8Array) => void): {
         capsForStartup: web3n.startup.W3N;
         coreInit: Promise<string>;
         coreAppsInit: Promise<void>;

package/build/core/index.js

@@ -53,11 +53,11 @@ class Core {
         const core = new Core(makeNet, makeResolver, makeCryptor, random, dirs, logger, conf.signUpUrl);
         return core;
     }
-    start() {
+    start(saveStorageKeyForAutologin) {
         const { promise: midPromise, resolve: midDone } = (0, deferred_1.defer)();
         const { watchBoot, emitBootEvent } = makeForBootEvents();
-        const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, this.random, this.makeNet, this.appDirs.getUsersOnDisk, user => this.initForNewUser(user, midDone, emitBootEvent), watchBoot, this.logger.logError);
-        const signIn = new sign_in_1.SignIn(this.cryptor.cryptor, addr => this.initForExistingUserWithoutCache(addr, midDone, emitBootEvent), (addr, storageKey) => this.initForExistingUserWithCache(addr, storageKey, midDone, emitBootEvent), this.appDirs.getUsersOnDisk, watchBoot, this.logger.logError);
+        const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, this.random, this.makeNet, this.appDirs.getUsersOnDisk, user => this.initForNewUser(user, midDone, emitBootEvent), saveStorageKeyForAutologin, watchBoot, this.logger.logError);
+        const signIn = new sign_in_1.SignIn(this.cryptor.cryptor, addr => this.initForExistingUserWithoutCache(addr, midDone, emitBootEvent), (addr, storageKey) => this.initForExistingUserWithCache(addr, storageKey, midDone, emitBootEvent), this.appDirs.getUsersOnDisk, saveStorageKeyForAutologin, watchBoot, this.logger.logError);
         const capsForStartup = {
             signUp: signUp.exposedService(),
             signIn: signIn.exposedService()

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

@@ -9,16 +9,18 @@ export type InitWithCache = (address: string, storageKey: GenerateKey) => Promis
 type SignInService = web3n.startup.SignInService;
 type ProgressCB = web3n.startup.ProgressCB;
 export declare class SignIn {
-    private cryptor;
-    private startInitWithoutCache;
-    private initWithCache;
-    private getUsersOnDisk;
+    private readonly cryptor;
+    private readonly startInitWithoutCache;
+    private readonly initWithCache;
+    private readonly getUsersOnDisk;
+    private readonly saveStorageKeyForAutologin;
     private readonly watchBoot;
     private readonly logError;
     private completeInitWithoutCache;
-    constructor(cryptor: Cryptor, startInitWithoutCache: StartInitWithoutCache, initWithCache: InitWithCache, getUsersOnDisk: GetUsersOnDisk, watchBoot: SignInService['watchBoot'], logError: LogError);
+    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,12 +20,14 @@ 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, watchBoot, logError) {
+    constructor(cryptor, startInitWithoutCache, initWithCache, getUsersOnDisk, saveStorageKeyForAutologin, watchBoot, logError) {
         this.cryptor = cryptor;
         this.startInitWithoutCache = startInitWithoutCache;
         this.initWithCache = initWithCache;
         this.getUsersOnDisk = getUsersOnDisk;
+        this.saveStorageKeyForAutologin = saveStorageKeyForAutologin;
         this.watchBoot = watchBoot;
         this.logError = logError;
         this.completeInitWithoutCache = undefined;
@@ -43,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;
         }
@@ -50,7 +56,12 @@ 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) {
             throw new Error(`Call method startLoginToRemoteStorage() before calling this.`);
         }
@@ -58,18 +69,43 @@ class SignIn {
             const midKeyProgressCB = makeKeyGenProgressCB(0, 50, progressCB);
             const midKeyGen = async (params) => (await (0, key_derivation_1.deriveMidKeyPair)(this.cryptor, pass, params, midKeyProgressCB)).skey;
             const storeKeyProgressCB = makeKeyGenProgressCB(51, 100, progressCB);
-            const storeKeyGen = params => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
-            return await this.completeInitWithoutCache(midKeyGen, storeKeyGen);
+            let storeKey;
+            const storeKeyGen = async (params) => {
+                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) {
+                (_a = this.saveStorageKeyForAutologin) === null || _a === void 0 ? void 0 : _a.call(this, storeKey);
+            }
+            return ok;
         }
         catch (err) {
             throw await this.logAndWrap(err, 'Fail to initialize from a state without cache');
         }
     }
     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 = params => (0, key_derivation_1.deriveStorageSKey)(this.cryptor, pass, params, storeKeyProgressCB);
-            return await this.initWithCache(user, storeKeyGen);
+            const storeKeyGen = async (params) => {
+                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) {
+                (_a = this.saveStorageKeyForAutologin) === null || _a === void 0 ? void 0 : _a.call(this, storeKey);
+            }
+            return ok;
         }
         catch (err) {
             throw await this.logAndWrap(err, 'Failing to start in a state with cache');

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

@@ -18,6 +18,7 @@ export declare class SignUp {
     private readonly makeNet;
     private readonly getUsersOnDisk;
     private readonly initForNewUser;
+    private readonly saveStorageKeyForAutologin;
     private readonly watchBoot;
     private readonly logError;
     private mid;
@@ -25,7 +26,7 @@ export declare class SignUp {
     private serviceURL;
     private netLazyInit;
     private get net();
-    constructor(serviceURL: string, cryptor: Cryptor, random: AsyncRNG, makeNet: () => NetClient, getUsersOnDisk: GetUsersOnDisk, initForNewUser: (u: CreatedUser) => Promise<void>, watchBoot: SignUpService['watchBoot'], logError: LogError);
+    constructor(serviceURL: string, cryptor: Cryptor, random: AsyncRNG, makeNet: () => NetClient, getUsersOnDisk: GetUsersOnDisk, initForNewUser: (u: CreatedUser) => Promise<void>, saveStorageKeyForAutologin: ((storageKey: Uint8Array) => void) | undefined, watchBoot: SignUpService['watchBoot'], logError: LogError);
     private setServiceURL;
     private getAvailableDomains;
     private getAvailableAddresses;

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

@@ -61,12 +61,13 @@ class SignUp {
         }
         return this.netLazyInit;
     }
-    constructor(serviceURL, cryptor, random, makeNet, getUsersOnDisk, initForNewUser, watchBoot, logError) {
+    constructor(serviceURL, cryptor, random, makeNet, getUsersOnDisk, initForNewUser, saveStorageKeyForAutologin, watchBoot, logError) {
         this.cryptor = cryptor;
         this.random = random;
         this.makeNet = makeNet;
         this.getUsersOnDisk = getUsersOnDisk;
         this.initForNewUser = initForNewUser;
+        this.saveStorageKeyForAutologin = saveStorageKeyForAutologin;
         this.watchBoot = watchBoot;
         this.logError = logError;
         this.mid = undefined;
@@ -163,6 +164,8 @@ class SignUp {
         if (!accountCreated) {
             return false;
         }
+        const storeKey = new Uint8Array(this.store.skey.length);
+        storeKey.set(this.store.skey);
         this.initForNewUser({
             address,
             midSKey: {
@@ -171,7 +174,8 @@ class SignUp {
             },
             storeSKey: this.store.skey,
             storeParams: this.store.params.kdParams
-        });
+        })
+            .then(() => { var _a; return (_a = this.saveStorageKeyForAutologin) === null || _a === void 0 ? void 0 : _a.call(this, storeKey); });
         this.forgetKeys();
         return true;
     }