jazz-tools 0.10.13 → 0.10.15

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> jazz-tools@0.10.13 build /home/runner/_work/jazz/jazz/packages/jazz-tools
+> jazz-tools@0.10.15 build /home/runner/_work/jazz/jazz/packages/jazz-tools
 > tsup
 
 CLI Building entry: {"index":"src/index.ts","testing":"src/testing.ts"}
@@ -10,9 +10,9 @@
 CLI Cleaning output folder
 ESM Build start
 ESM dist/index.js              1.50 KB
-ESM dist/testing.js            6.28 KB
-ESM dist/chunk-GSIV52ZH.js     115.71 KB
+ESM dist/testing.js            6.18 KB
+ESM dist/chunk-5USJBXLW.js     116.50 KB
 ESM dist/index.js.map          259.00 B
-ESM dist/testing.js.map        12.41 KB
-ESM dist/chunk-GSIV52ZH.js.map 276.19 KB
-ESM ⚡️ Build success in 92ms
+ESM dist/testing.js.map        12.24 KB
+ESM dist/chunk-5USJBXLW.js.map 277.65 KB
+ESM ⚡️ Build success in 59ms

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # jazz-tools
 
+## 0.10.15
+
+### Patch Changes
+
+- 2f99de0: Avoid race conditions on context creation and run the anonymous migration only when the hook is provided
+- Updated dependencies [f86e278]
+  - cojson@0.10.15
+
+## 0.10.14
+
+### Patch Changes
+
+- 75211e3: Fixes invalid authentication state when logging out after signUp
+
 ## 0.10.13
 
 ### Patch Changes

package/dist/{chunk-GSIV52ZH.js → chunk-5USJBXLW.js}

@@ -545,7 +545,7 @@ async function createJazzContext(options) {
       AccountSchema: options.AccountSchema,
       sessionProvider: options.sessionProvider,
       onLogOut: () => {
-        authSecretStorage.clear();
+        authSecretStorage.clearWithoutNotify();
       }
     });
   } else {
@@ -561,11 +561,11 @@ async function createJazzContext(options) {
       crypto,
       AccountSchema: options.AccountSchema,
       onLogOut: async () => {
-        await authSecretStorage.clear();
+        await authSecretStorage.clearWithoutNotify();
       }
     });
     if (!options.newAccountProps) {
-      await authSecretStorage.set({
+      await authSecretStorage.setWithoutNotify({
         accountID: context.account.id,
         secretSeed,
         accountSecret: context.node.account.agentSecret,
@@ -3457,7 +3457,6 @@ var KvStoreContext_default = KvStoreContext;
 var STORAGE_KEY = "jazz-logged-in-secret";
 var AuthSecretStorage = class {
   constructor() {
-    this.notify = false;
     this.listeners = /* @__PURE__ */ new Set();
     this.isAuthenticated = false;
   }
@@ -3522,7 +3521,7 @@ var AuthSecretStorage = class {
       provider: parsed.provider
     };
   }
-  async set(payload) {
+  async setWithoutNotify(payload) {
     const kvStore = KvStoreContext_default.getInstance().getStorage();
     await kvStore.set(
       STORAGE_KEY,
@@ -3533,9 +3532,10 @@ var AuthSecretStorage = class {
         provider: payload.provider
       })
     );
-    if (this.notify) {
-      this.emitUpdate(payload);
-    }
+  }
+  async set(payload) {
+    this.setWithoutNotify(payload);
+    this.emitUpdate(payload);
   }
   getIsAuthenticated(data) {
     if (!data) return false;
@@ -3555,12 +3555,13 @@ var AuthSecretStorage = class {
       listener(this.isAuthenticated);
     }
   }
-  async clear() {
+  async clearWithoutNotify() {
     const kvStore = KvStoreContext_default.getInstance().getStorage();
     await kvStore.delete(STORAGE_KEY);
-    if (this.notify) {
-      this.emitUpdate(null);
-    }
+  }
+  async clear() {
+    await this.clearWithoutNotify();
+    this.emitUpdate(null);
   }
 };
 
@@ -3590,11 +3591,7 @@ import { cojsonInternals as cojsonInternals4 } from "cojson";
 var JazzContextManager = class {
   constructor() {
     this.authSecretStorage = new AuthSecretStorage();
-    this.authSecretStorageWithNotify = Object.assign(
-      Object.create(this.authSecretStorage),
-      { notify: true }
-    );
-    this.authenticating = false;
+    this.keepContextOpen = false;
     this.logOut = async () => {
       if (!this.context || !this.props) {
         return;
@@ -3609,6 +3606,14 @@ var JazzContextManager = class {
       }
       this.context.done();
     };
+    this.shouldMigrateAnonymousAccount = async () => {
+      if (!this.props?.onAnonymousAccountDiscarded) {
+        return false;
+      }
+      const prevCredentials = await this.authSecretStorage.get();
+      const wasAnonymous = this.authSecretStorage.getIsAuthenticated(prevCredentials) === false;
+      return wasAnonymous;
+    };
     /**
      * Authenticates the user with the given credentials
      */
@@ -3617,13 +3622,12 @@ var JazzContextManager = class {
         throw new Error("Props required");
       }
       const prevContext = this.context;
-      const prevCredentials = await this.authSecretStorage.get();
-      const wasAnonymous = this.authSecretStorage.getIsAuthenticated(prevCredentials) === false;
-      this.authenticating = true;
+      const migratingAnonymousAccount = await this.shouldMigrateAnonymousAccount();
+      this.keepContextOpen = migratingAnonymousAccount;
       await this.createContext(this.props, { credentials }).finally(() => {
-        this.authenticating = false;
+        this.keepContextOpen = false;
       });
-      if (wasAnonymous) {
+      if (migratingAnonymousAccount) {
         await this.handleAnonymousAccountMigration(prevContext);
       }
     };
@@ -3632,18 +3636,17 @@ var JazzContextManager = class {
         throw new Error("Props required");
       }
       const prevContext = this.context;
-      const prevCredentials = await this.authSecretStorage.get();
-      const wasAnonymous = this.authSecretStorage.getIsAuthenticated(prevCredentials) === false;
-      this.authenticating = true;
+      const migratingAnonymousAccount = await this.shouldMigrateAnonymousAccount();
+      this.keepContextOpen = migratingAnonymousAccount;
       await this.createContext(this.props, {
         newAccountProps: {
           secret: accountSecret,
           creationProps
         }
       }).finally(() => {
-        this.authenticating = false;
+        this.keepContextOpen = false;
       });
-      if (wasAnonymous) {
+      if (migratingAnonymousAccount) {
         await this.handleAnonymousAccountMigration(prevContext);
       }
       if (this.context && "me" in this.context) {
@@ -3664,12 +3667,27 @@ var JazzContextManager = class {
     return new InMemoryKVStore();
   }
   async createContext(props, authProps) {
+    this.props = props;
+    const { promise, resolve } = createResolvablePromise();
+    const prevPromise = this.contextPromise;
+    this.contextPromise = promise;
+    await prevPromise;
+    try {
+      const result = await this.getNewContext(props, authProps);
+      await this.updateContext(props, result, authProps);
+      resolve();
+    } catch (error) {
+      resolve();
+      throw error;
+    }
+  }
+  async getNewContext(props, authProps) {
     props;
     authProps;
     throw new Error("Not implemented");
   }
   async updateContext(props, context, authProps) {
-    if (!this.authenticating) {
+    if (!this.keepContextOpen) {
       this.context?.done();
     }
     this.context = context;
@@ -3696,7 +3714,7 @@ var JazzContextManager = class {
     return this.value;
   }
   getAuthSecretStorage() {
-    return this.authSecretStorageWithNotify;
+    return this.authSecretStorage;
   }
   async handleAnonymousAccountMigration(prevContext) {
     if (!this.props) {
@@ -3731,6 +3749,13 @@ var JazzContextManager = class {
     }
   }
 };
+function createResolvablePromise() {
+  let resolve;
+  const promise = new Promise((res) => {
+    resolve = res;
+  });
+  return { promise, resolve };
+}
 
 // src/auth/DemoAuth.ts
 var DemoAuth = class {
@@ -4048,4 +4073,4 @@ export {
   consumeInviteLink
 };
 /* istanbul ignore file -- @preserve */
-//# sourceMappingURL=chunk-GSIV52ZH.js.map
+//# sourceMappingURL=chunk-5USJBXLW.js.map