jazz-tools 0.19.19 → 0.19.21

package/src/better-auth/auth/tests/client.test.ts

@@ -1,5 +1,5 @@
 import { createAuthClient } from "better-auth/client";
-import type { Account, AuthSecretStorage } from "jazz-tools";
+import { Account, AuthSecretStorage } from "jazz-tools";
 import {
   TestJazzContextManager,
   createJazzTestAccount,
@@ -9,7 +9,6 @@ import {
 import { assert, beforeEach, describe, expect, it, vi } from "vitest";
 import { jazzPluginClient } from "../client.js";
 import { emailOTPClient, genericOAuthClient } from "better-auth/client/plugins";
-
 describe("Better-Auth client plugin", () => {
   let account: Account;
   let jazzContextManager: TestJazzContextManager<Account>;
@@ -155,6 +154,71 @@ describe("Better-Auth client plugin", () => {
     });
   });
 
+  it("should preserve secretSeed over signup", async () => {
+    const secretSeed = new Uint8Array([1, 2, 3]);
+    await authSecretStorage.set({
+      accountID: account.$jazz.id,
+      secretSeed: secretSeed,
+      accountSecret: account.$jazz.localNode.getCurrentAgent().agentSecret,
+      provider: "test",
+    });
+    const credentials = await authSecretStorage.get();
+    assert(credentials, "Jazz credentials are not available");
+    expect(credentials.secretSeed).toBeInstanceOf(Uint8Array);
+
+    customFetchImpl.mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          token: "6diDScDDcLJLl3sxAEestZz63mrw9Azy",
+          user: {
+            id: "S6SDKApdnh746gUnP3zujzsEY53tjuTm",
+            email: "test@jazz.dev",
+            name: "Matteo",
+            image: null,
+            emailVerified: false,
+            createdAt: new Date(),
+            updatedAt: new Date(),
+          },
+          jazzAuth: {
+            accountID: credentials.accountID,
+            secretSeed: credentials.secretSeed,
+            accountSecret: credentials.accountSecret,
+          },
+        }),
+      ),
+    );
+
+    // Sign up
+    await authClient.signUp.email({
+      email: "test@jazz.dev",
+      password: "12345678",
+      name: "Matteo",
+    });
+
+    expect(customFetchImpl).toHaveBeenCalledTimes(1);
+    expect(customFetchImpl.mock.calls[0]![0].toString()).toBe(
+      "http://localhost:3000/api/auth/sign-up/email",
+    );
+
+    // Verify the credentials have been injected in the request body
+    expect(
+      customFetchImpl.mock.calls[0]![1].headers.get("x-jazz-auth")!,
+    ).toEqual(
+      JSON.stringify({
+        accountID: credentials!.accountID,
+        secretSeed: Array.from(credentials.secretSeed!),
+        accountSecret: credentials!.accountSecret,
+      }),
+    );
+
+    expect(authSecretStorage.isAuthenticated).toBe(true);
+
+    // Verify the profile name has been updated
+    const context = jazzContextManager.getCurrentValue();
+    assert(context && "me" in context);
+    expect(context.me.$jazz.id).toBe(credentials!.accountID);
+  });
+
   it("should logout from Jazz after BetterAuth sign-out", async () => {
     const credentials = await authSecretStorage.get();
     expect(authSecretStorage.isAuthenticated).toBe(false);

package/src/better-auth/database-adapter/repository/generic.ts

@@ -1,5 +1,5 @@
 import { CleanedWhere } from "better-auth/adapters";
-import { BetterAuthDbSchema } from "better-auth/db";
+import { BetterAuthDBSchema } from "better-auth/db";
 import { Account, CoList, CoMap, Group, co } from "jazz-tools";
 import type { Database, TableItem } from "../schema.js";
 import {
@@ -14,7 +14,7 @@ export class JazzRepository {
   protected databaseRoot: co.loaded<Database, { group: true }>;
   protected worker: Account;
   protected owner: Group;
-  protected betterAuthSchema: BetterAuthDbSchema;
+  protected betterAuthSchema: BetterAuthDBSchema;
 
   private coValuesTracker:
     | {
@@ -26,7 +26,7 @@ export class JazzRepository {
     databaseSchema: Database,
     databaseRoot: co.loaded<Database, { group: true }>,
     worker: Account,
-    betterAuthSchema: BetterAuthDbSchema = {},
+    betterAuthSchema: BetterAuthDBSchema = {},
     ensureSync: boolean = false,
   ) {
     this.databaseSchema = databaseSchema;

package/src/better-auth/database-adapter/repository/session.ts

@@ -1,4 +1,4 @@
-import { BetterAuthDbSchema } from "better-auth/db";
+import { BetterAuthDBSchema } from "better-auth/db";
 import { CleanedWhere } from "better-auth/adapters";
 import { co, Account } from "jazz-tools";
 import { JazzRepository } from "./generic";
@@ -22,7 +22,7 @@ export class SessionRepository extends JazzRepository {
     databaseSchema: Database,
     databaseRoot: co.loaded<Database, { group: true }>,
     worker: Account,
-    betterAuthSchema: BetterAuthDbSchema = {},
+    betterAuthSchema: BetterAuthDBSchema = {},
     ensureSync: boolean = false,
   ) {
     super(databaseSchema, databaseRoot, worker, betterAuthSchema, ensureSync);

package/src/better-auth/database-adapter/schema.ts

@@ -1,4 +1,4 @@
-import { BetterAuthDbSchema, FieldAttribute } from "better-auth/db";
+import { BetterAuthDBSchema, DBFieldAttribute } from "better-auth/db";
 import { Group, co, z } from "jazz-tools";
 
 type TableRow = co.Map<any>;
@@ -20,7 +20,7 @@ type WorkerAccount = co.Account<{
 type JazzSchema = {
   WorkerAccount: WorkerAccount;
   DatabaseRoot: Database;
-  betterAuthSchema: BetterAuthDbSchema;
+  betterAuthSchema: BetterAuthDBSchema;
   loadDatabase: (
     account: co.loaded<co.Account>,
     options?: Parameters<Database["loadUnique"]>[2],
@@ -29,7 +29,7 @@ type JazzSchema = {
 
 const DATABASE_ROOT_ID = "better-auth-root";
 
-export function createJazzSchema(schema: BetterAuthDbSchema): JazzSchema {
+export function createJazzSchema(schema: BetterAuthDBSchema): JazzSchema {
   const tablesSchema = generateSchemaFromBetterAuthSchema(schema);
 
   const DatabaseRoot: Database = co.map({
@@ -134,7 +134,7 @@ type ZodPrimitiveSchema =
   | z.z.ZodLiteral;
 type ZodOptionalPrimitiveSchema = z.z.ZodOptional<ZodPrimitiveSchema>;
 
-function generateSchemaFromBetterAuthSchema(schema: BetterAuthDbSchema) {
+function generateSchemaFromBetterAuthSchema(schema: BetterAuthDBSchema) {
   const tablesSchema: Record<string, Table> = {};
 
   for (const [key, value] of Object.entries(schema)) {
@@ -178,7 +178,7 @@ function generateSchemaFromBetterAuthSchema(schema: BetterAuthDbSchema) {
   return tablesSchema;
 }
 
-function convertFieldToCoValue(field: FieldAttribute) {
+function convertFieldToCoValue(field: DBFieldAttribute) {
   let zodType: ZodPrimitiveSchema | ZodOptionalPrimitiveSchema;
 
   switch (field.type) {

package/src/react/hooks.tsx

@@ -4,8 +4,6 @@ import { useEffect } from "react";
 import { CoValueClassOrSchema } from "jazz-tools";
 import { useJazzContext } from "jazz-tools/react-core";
 
-export { useCoState, useAuthSecretStorage } from "jazz-tools/react-core";
-
 export function useAcceptInvite<S extends CoValueClassOrSchema>({
   invitedObjectSchema,
   onAccept,
@@ -49,7 +47,10 @@ export function useAcceptInvite<S extends CoValueClassOrSchema>({
 export {
   experimental_useInboxSender,
   useJazzContext,
+  useAuthSecretStorage,
   useAccount,
+  useCoState,
+  useCoStates,
   useAgent,
   useLogOut,
   useSyncConnectionStatus,
@@ -58,4 +59,5 @@ export {
   useSubscriptionSelector,
   useSuspenseAccount,
   useSuspenseCoState,
+  useSuspenseCoStates,
 } from "jazz-tools/react-core";