jazz-react-auth-clerk 0.9.22 → 0.10.0

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> jazz-react-auth-clerk@0.9.22 build /home/runner/work/jazz/jazz/packages/jazz-react-auth-clerk
+> jazz-react-auth-clerk@0.10.0 build /home/runner/_work/jazz/jazz/packages/jazz-react-auth-clerk
 > rm -rf ./dist && tsc --sourceMap --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # jazz-browser-media-images
 
+## 0.10.0
+
+### Minor Changes
+
+- 498954f: Introducing the new auth system!
+
+### Patch Changes
+
+- Updated dependencies [b426342]
+- Updated dependencies [498954f]
+- Updated dependencies [8217981]
+- Updated dependencies [d42c2aa]
+- Updated dependencies [dd03464]
+- Updated dependencies [b426342]
+- Updated dependencies [ac3d9fa]
+- Updated dependencies [610543c]
+  - cojson@0.10.0
+  - jazz-auth-clerk@0.10.0
+  - jazz-react@0.10.0
+  - jazz-tools@0.10.0
+
+## 0.9.23
+
+### Patch Changes
+
+- Updated dependencies [70c9a5d]
+  - cojson@0.9.23
+  - jazz-browser-auth-clerk@0.9.23
+  - jazz-react@0.9.23
+  - jazz-tools@0.9.23
+
 ## 0.9.22
 
 ### Patch Changes

package/README.md

@@ -4,49 +4,39 @@ This package provides a [Clerk-based](https://clerk.com/) authentication strateg
 
 ## Usage
 
-`useJazzClerkAuth` is a hook that returns a `JazzAuth` object and a `JazzAuthState` object. Provide a Clerk instance to `useJazzClerkAuth`, and it will return the appropriate `JazzAuth` object. Once authenticated, authentication will persist across page reloads, even if the device is offline.
+The `JazzProviderWithClerk` component is a JazzProvider that automatically handles Clerk authentication.
 
+Once authenticated, authentication will persist across page reloads, even if the device is offline.
 
 See the full [example app](https://github.com/garden-co/jazz/tree/main/examples/clerk) for a complete example.
 
 ```tsx
-import { ClerkProvider, SignInButton, useClerk } from "@clerk/clerk-react";
-import { useJazzClerkAuth } from "jazz-react-auth-clerk";
-import { JazzProvider } from "jazz-react";
+import { ClerkProvider, useClerk } from "@clerk/clerk-react";
+import { JazzProviderWithClerk } from "jazz-react-auth-clerk";
 
 const PUBLISHABLE_KEY = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY;
 
-function JazzAndAuth({ children }: { children: React.ReactNode }) {
+function JazzProvider({ children }: { children: React.ReactNode }) {
   const clerk = useClerk();
-  const [auth, state] = useJazzClerkAuth(clerk);
 
   return (
-    <>
-      {state?.errors?.map((error) => (
-        <div key={error}>{error}</div>
-      ))}
-      {clerk.user && auth ? (
-        <JazzProvider
-          auth={auth}
-          peer="wss://cloud.jazz.tools/?key=your-email-address"
-        >
-          {children}
-        </JazzProvider>
-      ) : (
-        <SignInButton />
-      )}
-    </>
+    <JazzProviderWithClerk
+      clerk={clerk}
+      sync={{
+        peer: "wss://cloud.jazz.tools/?key=your-email-address",
+      }}
+    >
+      {children}
+    </JazzProviderWithClerk>
   );
 }
 
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
     <ClerkProvider publishableKey={PUBLISHABLE_KEY} afterSignOutUrl="/">
-      <JazzAndAuth>
+      <JazzProvider>
         <App />
-      </JazzAndAuth>
+      </JazzProvider>
     </ClerkProvider>
   </StrictMode>,
 );
-
-```

package/dist/index.js

@@ -1,18 +1,28 @@
-import { BrowserClerkAuth } from "jazz-browser-auth-clerk";
-import { useMemo, useState } from "react";
-export function useJazzClerkAuth(clerk) {
-    const [state, setState] = useState({ errors: [] });
+import { jsx as _jsx } from "react/jsx-runtime";
+import { JazzClerkAuth } from "jazz-auth-clerk";
+import { JazzProvider, useAuthSecretStorage, useJazzContext, } from "jazz-react";
+import { useEffect, useMemo } from "react";
+function useJazzClerkAuth(clerk) {
+    const context = useJazzContext();
+    const authSecretStorage = useAuthSecretStorage();
+    if ("guest" in context) {
+        throw new Error("Clerk auth is not supported in guest mode");
+    }
     const authMethod = useMemo(() => {
-        return new BrowserClerkAuth({
-            onError: (error) => {
-                void clerk.signOut();
-                setState((state) => ({
-                    ...state,
-                    errors: [...state.errors, error.toString()],
-                }));
-            },
-        }, clerk);
-    }, [clerk.user]);
-    return [authMethod, state];
+        return new JazzClerkAuth(context.authenticate, authSecretStorage);
+    }, []);
+    useEffect(() => {
+        // Need to use addListener because the clerk user object is not updated when the user logs in
+        return clerk.addListener((event) => {
+            authMethod.onClerkUserChange(event);
+        });
+    }, []);
 }
+function RegisterClerkAuth(props) {
+    useJazzClerkAuth(props.clerk);
+    return props.children;
+}
+export const JazzProviderWithClerk = (props) => {
+    return (_jsx(JazzProvider, { ...props, onLogOut: props.clerk.signOut, children: _jsx(RegisterClerkAuth, { clerk: props.clerk, children: props.children }) }));
+};
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE1C,MAAM,UAAU,gBAAgB,CAAC,KAAyB;IACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAuB,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,OAAO,IAAI,gBAAgB,CACzB;YACE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;gBACrB,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBACnB,GAAG,KAAK;oBACR,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;iBAC5C,CAAC,CAAC,CAAC;YACN,CAAC;SACF,EACD,KAAK,CACN,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjB,OAAO,CAAC,UAAU,EAAE,KAAK,CAAU,CAAC;AACtC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAA2B,MAAM,iBAAiB,CAAC;AACzE,OAAO,EACL,YAAY,EAEZ,oBAAoB,EACpB,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE3C,SAAS,gBAAgB,CAAC,KAAyB;IACjD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;IAEjD,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,OAAO,IAAI,aAAa,CAAC,OAAO,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IACpE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,6FAA6F;QAC7F,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,UAAU,CAAC,iBAAiB,CAAC,KAAyC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,iBAAiB,CAAC,KAG1B;IACC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAE9B,OAAO,KAAK,CAAC,QAAQ,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAwD,EACxD,EAAE;IACF,OAAO,CACL,KAAC,YAAY,OAAK,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,YACpD,KAAC,iBAAiB,IAAC,KAAK,EAAE,KAAK,CAAC,KAAK,YAClC,KAAK,CAAC,QAAQ,GACG,GACP,CAChB,CAAC;AACJ,CAAC,CAAC"}

package/dist/tests/JazzProviderWithClerk.test.js

@@ -0,0 +1,67 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+// @vitest-environment happy-dom
+import { act, render } from "@testing-library/react";
+import { AuthSecretStorage, InMemoryKVStore, KvStoreContext } from "jazz-tools";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { JazzProviderWithClerk } from "../index";
+vi.mock("jazz-react", async (importOriginal) => {
+    const { JazzTestProvider, createJazzTestAccount } = await import("jazz-react/testing");
+    const account = await createJazzTestAccount({
+        isCurrentActiveAccount: true,
+    });
+    function JazzProvider(props) {
+        return (_jsx(JazzTestProvider, { account: account, children: props.children }));
+    }
+    return {
+        ...(await importOriginal()),
+        JazzProvider,
+    };
+});
+const authSecretStorage = new AuthSecretStorage();
+KvStoreContext.getInstance().initialize(new InMemoryKVStore());
+describe("JazzProviderWithClerk", () => {
+    beforeEach(async () => {
+        await authSecretStorage.clear();
+    });
+    const setup = (children = _jsx("div", { "data-testid": "test-child", children: "Test Content" })) => {
+        let callbacks = new Set();
+        const mockClerk = {
+            user: {
+                fullName: "Test User",
+                unsafeMetadata: {},
+                update: vi.fn(),
+            },
+            signOut: vi.fn().mockImplementation(() => {
+                mockClerk.user = null;
+                Array.from(callbacks).map((callback) => callback(mockClerk));
+            }),
+            addListener: vi.fn((callback) => {
+                callbacks.add(callback);
+                return () => {
+                    callbacks.delete(callback);
+                };
+            }),
+        };
+        const utils = render(_jsx(JazzProviderWithClerk, { clerk: mockClerk, sync: { peer: "wss://test.jazz.tools" }, children: children }));
+        return {
+            ...utils,
+            mockClerk,
+            callbacks,
+        };
+    };
+    it("should push the local credentials to clerk", async () => {
+        const { mockClerk, callbacks } = setup();
+        expect(mockClerk.user?.update).not.toHaveBeenCalled();
+        await act(async () => {
+            await Promise.all(Array.from(callbacks).map((callback) => callback(mockClerk)));
+        });
+        expect(mockClerk.user?.update).toHaveBeenCalledWith({
+            unsafeMetadata: {
+                jazzAccountID: expect.any(String),
+                jazzAccountSecret: expect.any(String),
+                jazzAccountSeed: expect.any(Array),
+            },
+        });
+    });
+});
+//# sourceMappingURL=JazzProviderWithClerk.test.js.map

package/dist/tests/JazzProviderWithClerk.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JazzProviderWithClerk.test.js","sourceRoot":"","sources":["../../src/tests/JazzProviderWithClerk.test.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "jazz-react-auth-clerk",
-  "version": "0.9.22",
+  "version": "0.10.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "src/index.tsx",
   "license": "MIT",
   "dependencies": {
-    "cojson": "0.9.19",
-    "jazz-browser-auth-clerk": "0.9.22",
-    "jazz-react": "0.9.22",
-    "jazz-tools": "0.9.21"
+    "cojson": "0.10.0",
+    "jazz-auth-clerk": "0.10.0",
+    "jazz-react": "0.10.0",
+    "jazz-tools": "0.10.0"
   },
   "peerDependencies": {
     "react": "^18.2.0"
   },
   "devDependencies": {
+    "@testing-library/react": "^16.1.0",
     "@types/react": "^18.3.12",
     "typescript": "~5.6.2"
   },

package/src/index.tsx

@@ -1,23 +1,49 @@
-import { BrowserClerkAuth, MinimalClerkClient } from "jazz-browser-auth-clerk";
-import { useMemo, useState } from "react";
+import { JazzClerkAuth, type MinimalClerkClient } from "jazz-auth-clerk";
+import {
+  JazzProvider,
+  JazzProviderProps,
+  useAuthSecretStorage,
+  useJazzContext,
+} from "jazz-react";
+import { useEffect, useMemo } from "react";
 
-export function useJazzClerkAuth(clerk: MinimalClerkClient) {
-  const [state, setState] = useState<{ errors: string[] }>({ errors: [] });
+function useJazzClerkAuth(clerk: MinimalClerkClient) {
+  const context = useJazzContext();
+  const authSecretStorage = useAuthSecretStorage();
+
+  if ("guest" in context) {
+    throw new Error("Clerk auth is not supported in guest mode");
+  }
 
   const authMethod = useMemo(() => {
-    return new BrowserClerkAuth(
-      {
-        onError: (error) => {
-          void clerk.signOut();
-          setState((state) => ({
-            ...state,
-            errors: [...state.errors, error.toString()],
-          }));
-        },
-      },
-      clerk,
-    );
-  }, [clerk.user]);
+    return new JazzClerkAuth(context.authenticate, authSecretStorage);
+  }, []);
 
-  return [authMethod, state] as const;
+  useEffect(() => {
+    // Need to use addListener because the clerk user object is not updated when the user logs in
+    return clerk.addListener((event) => {
+      authMethod.onClerkUserChange(event as Pick<MinimalClerkClient, "user">);
+    });
+  }, []);
 }
+
+function RegisterClerkAuth(props: {
+  clerk: MinimalClerkClient;
+  children: React.ReactNode;
+}) {
+  useJazzClerkAuth(props.clerk);
+
+  return props.children;
+}
+
+export const JazzProviderWithClerk = (
+  props: { clerk: MinimalClerkClient } & JazzProviderProps,
+) => {
+  return (
+    <JazzProvider {...props} onLogOut={props.clerk.signOut}>
+      <RegisterClerkAuth clerk={props.clerk}>
+        {props.children}
+      </RegisterClerkAuth>
+    </JazzProvider>
+  );
+};

package/src/tests/JazzProviderWithClerk.test.tsx

@@ -0,0 +1,97 @@
+// @vitest-environment happy-dom
+
+import { act, render, waitFor } from "@testing-library/react";
+import type { MinimalClerkClient } from "jazz-auth-clerk";
+import { AuthSecretStorage, InMemoryKVStore, KvStoreContext } from "jazz-tools";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { JazzProviderWithClerk } from "../index";
+
+vi.mock("jazz-react", async (importOriginal) => {
+  const { JazzTestProvider, createJazzTestAccount } = await import(
+    "jazz-react/testing"
+  );
+
+  const account = await createJazzTestAccount({
+    isCurrentActiveAccount: true,
+  });
+
+  function JazzProvider(props: { children: React.ReactNode }) {
+    return (
+      <JazzTestProvider account={account}>{props.children}</JazzTestProvider>
+    );
+  }
+
+  return {
+    ...(await importOriginal<typeof import("jazz-react")>()),
+    JazzProvider,
+  };
+});
+
+const authSecretStorage = new AuthSecretStorage();
+KvStoreContext.getInstance().initialize(new InMemoryKVStore());
+
+describe("JazzProviderWithClerk", () => {
+  beforeEach(async () => {
+    await authSecretStorage.clear();
+  });
+
+  const setup = (
+    children = <div data-testid="test-child">Test Content</div>,
+  ) => {
+    let callbacks = new Set<(clerk: MinimalClerkClient) => void>();
+
+    const mockClerk = {
+      user: {
+        fullName: "Test User",
+        unsafeMetadata: {},
+        update: vi.fn(),
+      },
+      signOut: vi.fn().mockImplementation(() => {
+        mockClerk.user = null;
+        Array.from(callbacks).map((callback) => callback(mockClerk));
+      }),
+      addListener: vi.fn((callback) => {
+        callbacks.add(callback);
+
+        return () => {
+          callbacks.delete(callback);
+        };
+      }),
+    } as unknown as MinimalClerkClient;
+
+    const utils = render(
+      <JazzProviderWithClerk
+        clerk={mockClerk}
+        sync={{ peer: "wss://test.jazz.tools" }}
+      >
+        {children}
+      </JazzProviderWithClerk>,
+    );
+
+    return {
+      ...utils,
+      mockClerk,
+      callbacks,
+    };
+  };
+
+  it("should push the local credentials to clerk", async () => {
+    const { mockClerk, callbacks } = setup();
+
+    expect(mockClerk.user?.update).not.toHaveBeenCalled();
+
+    await act(async () => {
+      await Promise.all(
+        Array.from(callbacks).map((callback) => callback(mockClerk)),
+      );
+    });
+
+    expect(mockClerk.user?.update).toHaveBeenCalledWith({
+      unsafeMetadata: {
+        jazzAccountID: expect.any(String),
+        jazzAccountSecret: expect.any(String),
+        jazzAccountSeed: expect.any(Array),
+      },
+    });
+  });
+});