Compare commits

...

23 Commits

Author SHA1 Message Date
Guido D'Orsi
ac3c2df474 Merge pull request #1268 from garden-co/changeset-release/main
Version Packages
2025-01-24 17:32:53 +01:00
github-actions[bot]
681f973d4b Version Packages 2025-01-24 16:17:09 +00:00
Guido D'Orsi
338be7622f Merge pull request #1269 from garden-co/feat/group-add-member-typechecks
fix: improve typescript types for group.addMember
2025-01-24 17:15:57 +01:00
Guido D'Orsi
1227047b03 fix: improve typescript types for group.addMember 2025-01-24 17:07:32 +01:00
Guido D'Orsi
9afde8d0be Merge pull request #1267 from garden-co/feat/invite
feat: move invite API in jazz-tools
2025-01-24 17:06:10 +01:00
Guido D'Orsi
c2ca1feba0 feat: move invite API in jazz-tools 2025-01-24 16:52:34 +01:00
pax
98c265304a Merge pull request #1265 from garden-co/changeset-release/main
Version Packages
2025-01-24 16:57:00 +02:00
github-actions[bot]
675e3e8046 Version Packages 2025-01-24 14:44:45 +00:00
pax
4acba8c990 Merge pull request #1245 from garden-co/JZI-64/handle-gibberish-names-when-signing-up-using-email
Extract friendly user name for profile creation when authenticating using Clerk with a regular email address
2025-01-24 16:43:46 +02:00
pax-k
a93adeb1fe chore: cleanup 2025-01-24 16:35:32 +02:00
pax-k
cf8773f3de chore: pnpm lock 2025-01-24 16:28:27 +02:00
pax-k
3be94ae1e7 feat: extended clerk auth creation props with "other" field 2025-01-24 14:31:04 +02:00
pax-k
6a8aa06d18 fix: cleaning clerk creds 2025-01-24 13:36:27 +02:00
Anselm Eickhoff
dc17889209 Fix incorrect sentence about migrate being static 2025-01-24 10:57:53 +00:00
Guido D'Orsi
55f9d8e120 Merge pull request #1260 from garden-co/changeset-release/main
Version Packages
2025-01-24 09:47:45 +01:00
github-actions[bot]
15b9457ed8 Version Packages 2025-01-24 08:03:18 +00:00
Guido D'Orsi
898297e95c Merge pull request #1259 from garden-co/jazz-672-create-jazz-app-cant-clone-repos
Fix: create-jazz-app fails if no starter param
2025-01-24 09:02:16 +01:00
Trisha Lim
0fc4f24cd5 Add changeset 2025-01-24 15:25:50 +08:00
Trisha Lim
63b5ad9edf Fix: create-jazz-app fails if no starter param 2025-01-24 15:23:23 +08:00
Trisha Lim
873c3264ca Update gitignore 2025-01-24 14:56:22 +08:00
Trisha Lim
34f89e48aa Fix example readme instructions 2025-01-24 14:56:22 +08:00
pax-k
24b3b6afc1 chore: changeset 2025-01-22 20:33:55 +02:00
pax-k
c2eed7e2c4 fix: extract friendly user name for profile creation when authenticating using clerk with a regular email address 2025-01-22 20:32:32 +02:00
96 changed files with 1202 additions and 331 deletions

View File

@@ -1,5 +1,26 @@
# chat-rn-clerk
## 1.0.58
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react-native@0.9.17
- jazz-react-native-auth-clerk@0.9.17
- jazz-react-native-media-images@0.9.17
## 1.0.57
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-react-native-auth-clerk@0.9.16
- jazz-tools@0.9.16
- jazz-react-native@0.9.16
- jazz-react-native-media-images@0.9.16
## 1.0.56
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "chat-rn-clerk",
"main": "index.js",
"version": "1.0.56",
"version": "1.0.58",
"scripts": {
"build": "expo export -p ios",
"start": "expo start",

View File

@@ -1,5 +1,22 @@
# chat-rn
## 1.0.55
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react-native@0.9.17
## 1.0.54
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react-native@0.9.16
## 1.0.53
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "chat-rn",
"version": "1.0.53",
"version": "1.0.55",
"main": "index.js",
"scripts": {
"build": "expo export -p ios",

View File

@@ -1,5 +1,24 @@
# chat-vue
## 0.0.42
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
- jazz-vue@0.9.17
## 0.0.41
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
- jazz-vue@0.9.16
## 0.0.40
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "chat-vue",
"version": "0.0.40",
"version": "0.0.42",
"private": true,
"type": "module",
"scripts": {

View File

@@ -1,5 +1,24 @@
# jazz-example-chat
## 0.0.138
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-media-images@0.9.17
- jazz-react@0.9.17
## 0.0.137
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser-media-images@0.9.16
- jazz-react@0.9.16
## 0.0.136
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-example-chat",
"private": true,
"version": "0.0.136",
"version": "0.0.138",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,24 @@
# minimal-auth-clerk
## 0.0.37
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
- jazz-react-auth-clerk@0.9.17
## 0.0.36
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-react-auth-clerk@0.9.16
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.35
### Patch Changes

View File

@@ -15,11 +15,11 @@ You can either
Create a new Jazz project, and use this example as a template.
```bash
npm create jazz-app@latest --start clerk --project-name clerk
npm create jazz-app@latest --example clerk --project-name clerk
```
or
```bash
npx create-jazz-app@latest --start clerk --project-name clerk
npx create-jazz-app@latest --example clerk --project-name clerk
```
Go to the new project directory.

View File

@@ -1,7 +1,7 @@
{
"name": "clerk",
"private": true,
"version": "0.0.35",
"version": "0.0.37",
"type": "module",
"scripts": {
"dev": "vite",
@@ -13,7 +13,7 @@
"dependencies": {
"@clerk/clerk-react": "^5.4.1",
"jazz-react": "workspace:*",
"jazz-react-auth-clerk": "workspace:0.9.15",
"jazz-react-auth-clerk": "workspace:0.9.17",
"jazz-tools": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1"

View File

@@ -1,5 +1,22 @@
# file-share-svelte
## 0.0.22
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-svelte@0.9.17
## 0.0.21
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-svelte@0.9.16
## 0.0.20
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "file-share-svelte",
"version": "0.0.20",
"version": "0.0.22",
"private": true,
"type": "module",
"scripts": {

View File

@@ -1,5 +1,24 @@
# form
## 0.0.33
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-media-images@0.9.17
- jazz-react@0.9.17
## 0.0.32
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser-media-images@0.9.16
- jazz-react@0.9.16
## 0.0.31
### Patch Changes

View File

@@ -28,11 +28,11 @@ You can either
Create a new Jazz project, and use this example as a template.
```bash
npm create jazz-app@latest --start form --project-name form
npm create jazz-app@latest --example form --project-name form
```
or
```bash
npx create-jazz-app@latest --start form --project-name form
npx create-jazz-app@latest --example form --project-name form
```
Go to the new project directory.

View File

@@ -1,7 +1,7 @@
{
"name": "form",
"private": true,
"version": "0.0.31",
"version": "0.0.33",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,24 @@
# image-upload
## 0.0.35
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-media-images@0.9.17
- jazz-react@0.9.17
## 0.0.34
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser-media-images@0.9.16
- jazz-react@0.9.16
## 0.0.33
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "image-upload",
"private": true,
"version": "0.0.33",
"version": "0.0.35",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,24 @@
# jazz-example-musicplayer
## 0.0.58
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-inspector@0.9.17
- jazz-react@0.9.17
## 0.0.57
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-inspector@0.9.16
- jazz-react@0.9.16
## 0.0.56
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-example-music-player",
"private": true,
"version": "0.0.56",
"version": "0.0.58",
"type": "module",
"scripts": {
"dev": "vite",
@@ -18,8 +18,8 @@
"@radix-ui/react-toast": "^1.1.4",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"jazz-react": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15",
"jazz-react": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17",
"jazz-inspector": "workspace:*",
"lucide-react": "^0.274.0",
"react": "^18.3.1",

View File

@@ -1,5 +1,24 @@
# jazz-example-onboarding
## 0.0.39
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-media-images@0.9.17
- jazz-react@0.9.17
## 0.0.38
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser-media-images@0.9.16
- jazz-react@0.9.16
## 0.0.37
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-example-onboarding",
"private": true,
"version": "0.0.37",
"version": "0.0.39",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,22 @@
# organization
## 0.0.31
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
## 0.0.30
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.29
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "organization",
"private": true,
"version": "0.0.29",
"version": "0.0.31",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,17 @@
# passkey-svelte
## 0.0.26
### Patch Changes
- jazz-svelte@0.9.17
## 0.0.25
### Patch Changes
- jazz-svelte@0.9.16
## 0.0.24
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "passkey-svelte",
"version": "0.0.24",
"version": "0.0.26",
"type": "module",
"private": true,
"scripts": {

View File

@@ -1,5 +1,22 @@
# minimal-auth-passkey
## 0.0.36
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
## 0.0.35
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.34
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "passkey",
"private": true,
"version": "0.0.34",
"version": "0.0.36",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,22 @@
# jazz-password-manager
## 0.0.57
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
## 0.0.56
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.55
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-password-manager",
"private": true,
"version": "0.0.55",
"version": "0.0.57",
"type": "module",
"scripts": {
"dev": "vite",
@@ -12,8 +12,8 @@
"clean-install": "rm -rf node_modules pnpm-lock.yaml && pnpm install"
},
"dependencies": {
"jazz-react": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15",
"jazz-react": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.41.5",

View File

@@ -1,5 +1,24 @@
# jazz-example-pets
## 0.0.155
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-media-images@0.9.17
- jazz-react@0.9.17
## 0.0.154
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser-media-images@0.9.16
- jazz-react@0.9.16
## 0.0.153
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-example-pets",
"private": true,
"version": "0.0.153",
"version": "0.0.155",
"type": "module",
"scripts": {
"dev": "vite",
@@ -19,9 +19,9 @@
"@radix-ui/react-toast": "^1.1.4",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"jazz-browser-media-images": "workspace:0.9.15",
"jazz-react": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15",
"jazz-browser-media-images": "workspace:0.9.17",
"jazz-react": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17",
"lucide-react": "^0.274.0",
"qrcode": "^1.5.3",
"react": "^18.3.1",
@@ -41,7 +41,7 @@
"@vitejs/plugin-react-swc": "^3.3.2",
"autoprefixer": "^10.4.20",
"is-ci": "^3.0.1",
"jazz-run": "workspace:0.9.15",
"jazz-run": "workspace:0.9.17",
"postcss": "^8.4.27",
"tailwindcss": "^3.4.15",
"typescript": "~5.6.2",

View File

@@ -1,5 +1,24 @@
# reactions
## 0.0.35
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-media-images@0.9.17
- jazz-react@0.9.17
## 0.0.34
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser-media-images@0.9.16
- jazz-react@0.9.16
## 0.0.33
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "reactions",
"private": true,
"version": "0.0.33",
"version": "0.0.35",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -1,5 +1,24 @@
# todo-vue
## 0.0.40
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
- jazz-vue@0.9.17
## 0.0.39
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
- jazz-vue@0.9.16
## 0.0.38
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "todo-vue",
"version": "0.0.38",
"version": "0.0.40",
"private": true,
"type": "module",
"scripts": {

View File

@@ -1,5 +1,22 @@
# jazz-example-todo
## 0.0.154
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
## 0.0.153
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.152
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-example-todo",
"private": true,
"version": "0.0.152",
"version": "0.0.154",
"type": "module",
"scripts": {
"dev": "vite",
@@ -16,8 +16,8 @@
"@radix-ui/react-toast": "^1.1.4",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"jazz-react": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15",
"jazz-react": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17",
"lucide-react": "^0.274.0",
"qrcode": "^1.5.3",
"react": "^18.3.1",

View File

@@ -1,5 +1,22 @@
# version-history
## 0.0.32
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
## 0.0.31
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.30
### Patch Changes

View File

@@ -1,7 +1,7 @@
{
"name": "version-history",
"private": true,
"version": "0.0.30",
"version": "0.0.32",
"type": "module",
"scripts": {
"dev": "vite",

View File

@@ -132,7 +132,7 @@ As you develop your app, you'll likely want to
- initialise data in a user's `root` and `profile`
- add more data to your `root` and `profile` schemas
You can achieve both by overriding the static `migrate()` method on your `Account` schema class.
You can achieve both by overriding the `migrate()` method on your `Account` schema class.
### When migrations run

View File

@@ -38,7 +38,7 @@ import {
} from "./ids.js";
import { Stringified, parseJSON, stableStringify } from "./jsonStringify.js";
import { LocalNode } from "./localNode.js";
import type { Role } from "./permissions.js";
import type { AccountRole, Role } from "./permissions.js";
import { Channel, connectedPeers } from "./streamUtils.js";
import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
import { expectGroup } from "./typeUtils/expectGroup.js";
@@ -158,6 +158,7 @@ export type {
Stringified,
CoStreamItem,
OpID,
AccountRole,
};
// eslint-disable-next-line @typescript-eslint/no-namespace

View File

@@ -1,5 +1,11 @@
# create-jazz-app
## 0.1.8
### Patch Changes
- 0fc4f24: fix create-jazz-app fails if no starter param
## 0.1.7
### Patch Changes

View File

@@ -5,7 +5,7 @@
"types": "src/index.ts",
"type": "module",
"license": "MIT",
"version": "0.1.7",
"version": "0.1.8",
"bin": {
"create-jazz-app": "./dist/index.js"
},

View File

@@ -263,7 +263,8 @@ async function promptUser(
return {
...answers,
...partialOptions,
template: partialOptions.starter || partialOptions.example,
template:
answers.starter || partialOptions.starter || partialOptions.example,
} as ScaffoldOptions;
}

View File

@@ -1,5 +1,25 @@
# jazz-browser-media-images
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
## 0.9.16
### Patch Changes
- 24b3b6a: Extract friendly user name for profile creation when authenticating using Clerk with a regular email address.
Email passed to creationProps when using Clerk auth
Clear stored Clerk credentials on logout
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,14 +1,14 @@
{
"name": "jazz-browser-auth-clerk",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",
"license": "MIT",
"dependencies": {
"cojson": "workspace:0.9.13",
"jazz-browser": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15"
"jazz-browser": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17"
},
"scripts": {
"format-and-lint": "biome check .",

View File

@@ -1,8 +1,6 @@
import { AgentSecret } from "cojson";
import { Account, AuthMethod, AuthResult, Credentials, ID } from "jazz-tools";
const localStorageKey = "jazz-clerk-auth";
export type MinimalClerkClient = {
user:
| {
@@ -10,6 +8,10 @@ export type MinimalClerkClient = {
unsafeMetadata: Record<string, any>;
fullName: string | null;
username: string | null;
firstName: string | null;
primaryEmailAddress: {
emailAddress: string;
} | null;
id: string;
update: (args: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -21,6 +23,8 @@ export type MinimalClerkClient = {
signOut: () => Promise<void>;
};
const localStorageKey = "jazz-clerk-auth";
function saveCredentialsToLocalStorage(credentials: Credentials) {
localStorage.setItem(
localStorageKey,
@@ -31,6 +35,10 @@ function saveCredentialsToLocalStorage(credentials: Credentials) {
);
}
function clearStoredCredentials() {
localStorage.removeItem(localStorageKey);
}
export class BrowserClerkAuth implements AuthMethod {
constructor(
public driver: BrowserClerkAuth.Driver,
@@ -38,8 +46,21 @@ export class BrowserClerkAuth implements AuthMethod {
) {}
async start(): Promise<AuthResult> {
// Check local storage for credentials
const locallyStoredCredentials = localStorage.getItem(localStorageKey);
// clear localStorage if the current Clerk user doesn't match stored credentials
let locallyStoredCredentials = localStorage.getItem(localStorageKey);
if (locallyStoredCredentials && this.clerkClient.user) {
try {
const stored = JSON.parse(locallyStoredCredentials);
const clerkMetadata = this.clerkClient.user.unsafeMetadata;
if (clerkMetadata.jazzAccountID !== stored.accountID) {
clearStoredCredentials();
}
} catch (e) {
clearStoredCredentials();
}
}
locallyStoredCredentials = localStorage.getItem(localStorageKey);
if (locallyStoredCredentials) {
try {
@@ -53,7 +74,7 @@ export class BrowserClerkAuth implements AuthMethod {
this.driver.onError(error);
},
logOut: () => {
localStorage.removeItem(localStorageKey);
clearStoredCredentials();
void this.clerkClient.signOut();
},
};
@@ -86,6 +107,7 @@ export class BrowserClerkAuth implements AuthMethod {
this.driver.onError(error);
},
logOut: () => {
clearStoredCredentials();
void this.clerkClient.signOut();
},
};
@@ -96,8 +118,15 @@ export class BrowserClerkAuth implements AuthMethod {
creationProps: {
name:
this.clerkClient.user.fullName ||
this.clerkClient.user.firstName ||
this.clerkClient.user.username ||
this.clerkClient.user.primaryEmailAddress?.emailAddress?.split(
"@",
)[0] ||
this.clerkClient.user.id,
other: {
email: this.clerkClient.user.primaryEmailAddress?.emailAddress,
},
},
saveCredentials: async ({ accountID, secret }: Credentials) => {
saveCredentialsToLocalStorage({
@@ -116,6 +145,7 @@ export class BrowserClerkAuth implements AuthMethod {
this.driver.onError(error);
},
logOut: () => {
clearStoredCredentials();
void this.clerkClient.signOut();
},
};

View File

@@ -30,6 +30,8 @@ describe("BrowserClerkAuth", () => {
unsafeMetadata: {},
fullName: "Test User",
username: "testuser",
firstName: null,
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},
@@ -75,6 +77,8 @@ describe("BrowserClerkAuth", () => {
},
fullName: "Test User",
username: "testuser",
firstName: null,
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},
@@ -115,5 +119,68 @@ describe("BrowserClerkAuth", () => {
expect(mockClerkClient.signOut).toHaveBeenCalled();
});
it("should resolve name from available user fields", async () => {
const testCases = [
{
user: {
unsafeMetadata: {},
fullName: "Full Name",
firstName: null,
username: null,
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},
expected: "Full Name",
},
{
user: {
unsafeMetadata: {},
fullName: null,
firstName: "First",
username: null,
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},
expected: "First",
},
{
user: {
unsafeMetadata: {},
fullName: null,
firstName: null,
username: "username123",
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},
expected: "username123",
},
{
user: {
unsafeMetadata: {},
fullName: null,
firstName: null,
username: null,
primaryEmailAddress: { emailAddress: "test@example.com" },
id: "test-id",
update: vi.fn(),
},
expected: "test",
},
];
for (const { user, expected } of testCases) {
const auth = new BrowserClerkAuth(mockDriver, {
...mockClerkClient,
user,
});
const result = await auth.start();
expect(result.type).toBe("new");
expect((result as any).creationProps.name).toBe(expected);
}
});
});
});

View File

@@ -1,5 +1,22 @@
# jazz-browser-media-images
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-browser-media-images",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",
@@ -8,8 +8,8 @@
"dependencies": {
"@types/image-blob-reduce": "^4.1.1",
"image-blob-reduce": "^4.1.0",
"jazz-browser": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15",
"jazz-browser": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17",
"pica": "^9.0.1",
"typescript": "~5.6.2"
},

View File

@@ -1,5 +1,20 @@
# jazz-browser
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-browser",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",
@@ -10,7 +10,7 @@
"cojson": "workspace:0.9.13",
"cojson-storage-indexeddb": "workspace:0.9.13",
"cojson-transport-ws": "workspace:0.9.13",
"jazz-tools": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.17",
"typescript": "~5.6.2"
},
"scripts": {

View File

@@ -12,7 +12,8 @@ import {
InviteSecret,
SessionID,
WasmCrypto,
cojsonInternals,
createInviteLink as baseCreateInviteLink,
consumeInviteLink,
createJazzContext,
} from "jazz-tools";
import { OPFSFilesystem } from "./OPFSFilesystem.js";
@@ -212,68 +213,19 @@ export function createInviteLink<C extends CoValue>(
valueHint,
}: { baseURL?: string; valueHint?: string } = {},
): string {
const coValueCore = value._raw.core;
let currentCoValue = coValueCore;
while (currentCoValue.header.ruleset.type === "ownedByGroup") {
currentCoValue = currentCoValue.getGroup().core;
}
const { ruleset, meta } = currentCoValue.header;
if (ruleset.type !== "group" || meta?.type === "account") {
throw new Error("Can't create invite link for object without group");
}
const group = cojsonInternals.expectGroup(currentCoValue.getCurrentContent());
const inviteSecret = group.createInvite(role);
return `${baseURL}#/invite/${valueHint ? valueHint + "/" : ""}${
value.id
}/${inviteSecret}`;
return baseCreateInviteLink(value, role, baseURL, valueHint);
}
/** @category Invite Links */
export function parseInviteLink<C extends CoValue>(
inviteURL: string,
):
| {
valueID: ID<C>;
valueHint?: string;
inviteSecret: InviteSecret;
}
| undefined {
const url = new URL(inviteURL);
const parts = url.hash.split("/");
let valueHint: string | undefined;
let valueID: ID<C> | undefined;
let inviteSecret: InviteSecret | undefined;
if (parts[0] === "#" && parts[1] === "invite") {
if (parts.length === 5) {
valueHint = parts[2];
valueID = parts[3] as ID<C>;
inviteSecret = parts[4] as InviteSecret;
} else if (parts.length === 4) {
valueID = parts[2] as ID<C>;
inviteSecret = parts[3] as InviteSecret;
}
if (!valueID || !inviteSecret) {
return undefined;
}
return { valueID, inviteSecret, valueHint };
}
}
export { parseInviteLink } from "jazz-tools";
/** @category Invite Links */
export function consumeInviteLinkFromWindowLocation<V extends CoValue>({
export async function consumeInviteLinkFromWindowLocation<V extends CoValue>({
as,
forValueHint,
invitedObjectSchema,
}: {
as: Account;
as?: Account;
forValueHint?: string;
invitedObjectSchema: CoValueClass<V>;
}): Promise<
@@ -284,22 +236,20 @@ export function consumeInviteLinkFromWindowLocation<V extends CoValue>({
}
| undefined
> {
return new Promise((resolve, reject) => {
const result = parseInviteLink<V>(window.location.href);
if (result && result.valueHint === forValueHint) {
as.acceptInvite(result.valueID, result.inviteSecret, invitedObjectSchema)
.then(() => {
resolve(result);
window.history.replaceState(
{},
"",
window.location.href.replace(/#.*$/, ""),
);
})
.catch(reject);
} else {
resolve(undefined);
}
const result = await consumeInviteLink({
inviteURL: window.location.href,
as,
forValueHint,
invitedObjectSchema,
});
if (result) {
window.history.replaceState(
{},
"",
window.location.href.replace(/#.*$/, ""),
);
}
return result;
}

View File

@@ -1,5 +1,22 @@
# jazz-inspector
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react-core@0.8.58
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react-core@0.8.57
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-inspector",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "./dist/jazz-inspector.js",
"types": "./src/app.tsx",

View File

@@ -1,5 +1,20 @@
# jazz-autosub
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -5,11 +5,11 @@
"types": "src/index.ts",
"type": "module",
"license": "MIT",
"version": "0.9.15",
"version": "0.9.17",
"dependencies": {
"cojson": "workspace:0.9.13",
"cojson-transport-ws": "workspace:0.9.13",
"jazz-tools": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.17",
"ws": "^8.14.2"
},
"devDependencies": {

View File

@@ -1,5 +1,27 @@
# jazz-browser-media-images
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser-auth-clerk@0.9.17
- jazz-react@0.9.17
## 0.9.16
### Patch Changes
- 24b3b6a: Extract friendly user name for profile creation when authenticating using Clerk with a regular email address.
Email passed to creationProps when using Clerk auth
Clear stored Clerk credentials on logout
- Updated dependencies [24b3b6a]
- jazz-browser-auth-clerk@0.9.16
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,15 +1,15 @@
{
"name": "jazz-react-auth-clerk",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.tsx",
"license": "MIT",
"dependencies": {
"cojson": "workspace:0.9.13",
"jazz-browser-auth-clerk": "workspace:0.9.15",
"jazz-react": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15"
"jazz-browser-auth-clerk": "workspace:0.9.17",
"jazz-react": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17"
},
"peerDependencies": {
"react": "^18.2.0"

View File

@@ -1,14 +1,7 @@
import {
BrowserClerkAuth,
type MinimalClerkClient,
} from "jazz-browser-auth-clerk";
import { BrowserClerkAuth, MinimalClerkClient } from "jazz-browser-auth-clerk";
import { useMemo, useState } from "react";
export function useJazzClerkAuth(
clerk: MinimalClerkClient & {
signOut: () => Promise<unknown>;
},
) {
export function useJazzClerkAuth(clerk: MinimalClerkClient) {
const [state, setState] = useState<{ errors: string[] }>({ errors: [] });
const authMethod = useMemo(() => {

View File

@@ -1,5 +1,20 @@
# jazz-react-core
## 0.8.58
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
## 0.8.57
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
## 0.8.56
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-react-core",
"version": "0.8.56",
"version": "0.8.58",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",

View File

@@ -1,5 +1,25 @@
# jazz-react-native-auth-clerk
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react-native@0.9.17
## 0.9.16
### Patch Changes
- 24b3b6a: Extract friendly user name for profile creation when authenticating using Clerk with a regular email address.
Email passed to creationProps when using Clerk auth
Clear stored Clerk credentials on logout
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react-native@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-react-native-auth-clerk",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",

View File

@@ -2,8 +2,6 @@ import { AgentSecret } from "cojson";
import type { KvStore } from "jazz-react-native";
import { Account, AuthMethod, AuthResult, Credentials, ID } from "jazz-tools";
const localStorageKey = "jazz-clerk-auth";
export type MinimalClerkClient = {
user:
| {
@@ -11,6 +9,10 @@ export type MinimalClerkClient = {
unsafeMetadata: Record<string, any>;
fullName: string | null;
username: string | null;
firstName: string | null;
primaryEmailAddress: {
emailAddress: string;
} | null;
id: string;
update: (args: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -22,6 +24,8 @@ export type MinimalClerkClient = {
signOut: () => Promise<void>;
};
const localStorageKey = "jazz-clerk-auth";
function saveCredentialsToStorage(kvStore: KvStore, credentials: Credentials) {
kvStore.set(
localStorageKey,
@@ -32,6 +36,10 @@ function saveCredentialsToStorage(kvStore: KvStore, credentials: Credentials) {
);
}
async function clearStoredCredentials(kvStore: KvStore) {
await kvStore.delete(localStorageKey);
}
export class ReactNativeClerkAuth implements AuthMethod {
constructor(
public driver: ReactNativeClerkAuth.Driver,
@@ -40,12 +48,27 @@ export class ReactNativeClerkAuth implements AuthMethod {
) {}
async start(): Promise<AuthResult> {
// Check local storage for credentials
const locallyStoredCredentials = await this.kvStore.get(localStorageKey);
if (locallyStoredCredentials) {
if (locallyStoredCredentials && this.clerkClient.user) {
try {
const credentials = JSON.parse(locallyStoredCredentials) as Credentials;
const stored = JSON.parse(locallyStoredCredentials);
const clerkMetadata = this.clerkClient.user.unsafeMetadata;
if (clerkMetadata.jazzAccountID !== stored.accountID) {
await clearStoredCredentials(this.kvStore);
}
} catch (e) {
await clearStoredCredentials(this.kvStore);
}
}
const locallyStoredCredentialsAgain =
await this.kvStore.get(localStorageKey);
if (locallyStoredCredentialsAgain) {
try {
const credentials = JSON.parse(
locallyStoredCredentialsAgain,
) as Credentials;
return {
type: "existing",
credentials,
@@ -55,7 +78,7 @@ export class ReactNativeClerkAuth implements AuthMethod {
this.driver.onError(error);
},
logOut: () => {
void this.kvStore.delete(localStorageKey);
void clearStoredCredentials(this.kvStore);
void this.clerkClient.signOut();
},
};
@@ -88,6 +111,7 @@ export class ReactNativeClerkAuth implements AuthMethod {
this.driver.onError(error);
},
logOut: () => {
void clearStoredCredentials(this.kvStore);
void this.clerkClient.signOut();
},
};
@@ -98,8 +122,15 @@ export class ReactNativeClerkAuth implements AuthMethod {
creationProps: {
name:
this.clerkClient.user.fullName ||
this.clerkClient.user.firstName ||
this.clerkClient.user.username ||
this.clerkClient.user.primaryEmailAddress?.emailAddress?.split(
"@",
)[0] ||
this.clerkClient.user.id,
other: {
email: this.clerkClient.user.primaryEmailAddress?.emailAddress,
},
},
saveCredentials: async ({ accountID, secret }: Credentials) => {
saveCredentialsToStorage(this.kvStore, {
@@ -118,6 +149,7 @@ export class ReactNativeClerkAuth implements AuthMethod {
this.driver.onError(error);
},
logOut: () => {
void clearStoredCredentials(this.kvStore);
void this.clerkClient.signOut();
},
};
@@ -140,12 +172,7 @@ export namespace ReactNativeClerkAuth {
import { useMemo, useState } from "react";
export function useJazzClerkAuth(
clerk: MinimalClerkClient & {
signOut: () => Promise<unknown>;
},
kvStore: KvStore,
) {
export function useJazzClerkAuth(clerk: MinimalClerkClient, kvStore: KvStore) {
const [state, setState] = useState<{ errors: string[] }>({ errors: [] });
const authMethod = useMemo(() => {

View File

@@ -32,6 +32,8 @@ describe("ReactNativeClerkAuth", () => {
unsafeMetadata: {},
fullName: "Test User",
username: "testuser",
firstName: null,
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},
@@ -88,6 +90,8 @@ describe("ReactNativeClerkAuth", () => {
},
fullName: "Test User",
username: "testuser",
firstName: null,
primaryEmailAddress: null,
id: "test-id",
update: vi.fn(),
},

View File

@@ -1,5 +1,20 @@
# jazz-browser-media-images
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-react-native-media-images",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",

View File

@@ -1,5 +1,22 @@
# jazz-browser
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react-core@0.8.58
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react-core@0.8.57
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-react-native",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",

View File

@@ -1,9 +1,8 @@
import { useEffect } from "react";
import { createUseAccountHooks, useJazzContext } from "jazz-react-core";
import { CoValue, CoValueClass, ID } from "jazz-tools";
import { CoValue, CoValueClass, ID, parseInviteLink } from "jazz-tools";
import { Linking } from "react-native";
import { parseInviteLink } from "./platform.js";
import { RegisteredAccount } from "./provider.js";
export { useCoState, experimental_useInboxSender } from "jazz-react-core";

View File

@@ -4,4 +4,5 @@ export * from "./storage/kv-store-context.js";
export * from "./hooks.js";
export * from "./media.js";
export { parseInviteLink, createInviteLink, setupKvStore } from "./platform.js";
export { parseInviteLink } from "jazz-tools";
export { createInviteLink, setupKvStore } from "./platform.js";

View File

@@ -8,9 +8,8 @@ import {
CoValueClass,
CryptoProvider,
ID,
InviteSecret,
SessionID,
cojsonInternals,
createInviteLink as baseCreateInviteLink,
createJazzContext,
} from "jazz-tools";
@@ -155,58 +154,7 @@ export function createInviteLink<C extends CoValue>(
role: "reader" | "writer" | "admin",
{ baseURL, valueHint }: { baseURL?: string; valueHint?: string } = {},
): string {
const coValueCore = value._raw.core;
let currentCoValue = coValueCore;
while (currentCoValue.header.ruleset.type === "ownedByGroup") {
currentCoValue = currentCoValue.getGroup().core;
}
if (currentCoValue.header.ruleset.type !== "group") {
throw new Error("Can't create invite link for object without group");
}
const group = cojsonInternals.expectGroup(currentCoValue.getCurrentContent());
const inviteSecret = group.createInvite(role);
return `${baseURL}/invite/${valueHint ? valueHint + "/" : ""}${
value.id
}/${inviteSecret}`;
}
/** @category Invite Links */
// TODO: copied from jazz-browser, should be shared
export function parseInviteLink<C extends CoValue>(
inviteURL: string,
):
| {
valueID: ID<C>;
valueHint?: string;
inviteSecret: InviteSecret;
}
| undefined {
const url = new URL(inviteURL);
const parts = url.hash.split("/");
let valueHint: string | undefined;
let valueID: ID<C> | undefined;
let inviteSecret: InviteSecret | undefined;
if (parts[0] === "#" && parts[1] === "invite") {
if (parts.length === 5) {
valueHint = parts[2];
valueID = parts[3] as ID<C>;
inviteSecret = parts[4] as InviteSecret;
} else if (parts.length === 4) {
valueID = parts[2] as ID<C>;
inviteSecret = parts[3] as InviteSecret;
}
if (!valueID || !inviteSecret) {
return undefined;
}
return { valueID, inviteSecret, valueHint };
}
return baseCreateInviteLink(value, role, baseURL ?? "", valueHint);
}
export function setupKvStore(kvStore = new ExpoSecureStoreAdapter()) {

View File

@@ -1,5 +1,24 @@
# jazz-react
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
- jazz-react-core@0.8.58
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
- jazz-react-core@0.8.57
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-react",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",
@@ -18,8 +18,8 @@
"dependencies": {
"@scure/bip39": "^1.3.0",
"cojson": "workspace:0.9.13",
"jazz-browser": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.15",
"jazz-browser": "workspace:0.9.17",
"jazz-tools": "workspace:0.9.17",
"jazz-react-core": "workspace:*"
},
"devDependencies": {

View File

@@ -1,5 +1,20 @@
# jazz-run
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -3,7 +3,7 @@
"bin": "./dist/index.js",
"type": "module",
"license": "MIT",
"version": "0.9.15",
"version": "0.9.17",
"exports": {
"./startSyncServer": {
"import": "./dist/startSyncServer.js",
@@ -32,7 +32,7 @@
"cojson-storage-sqlite": "workspace:0.9.13",
"cojson-transport-ws": "workspace:0.9.13",
"effect": "^3.6.5",
"jazz-tools": "workspace:0.9.15",
"jazz-tools": "workspace:0.9.17",
"ws": "^8.14.2"
},
"devDependencies": {

View File

@@ -1,5 +1,22 @@
# jazz-svelte
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-svelte",
"version": "0.9.15",
"version": "0.9.17",
"scripts": {
"dev": "vite dev",
"build": "vite build && npm run package",

View File

@@ -1,5 +1,20 @@
# jazz-tools
## 0.9.17
### Patch Changes
- c2ca1fe: Add cross-platform invite API
- 1227047: Improve typescript types for group.addMember
## 0.9.16
### Patch Changes
- 24b3b6a: Extract friendly user name for profile creation when authenticating using Clerk with a regular email address.
Email passed to creationProps when using Clerk auth
Clear stored Clerk credentials on logout
## 0.9.15
### Patch Changes

View File

@@ -23,7 +23,7 @@
},
"type": "module",
"license": "MIT",
"version": "0.9.15",
"version": "0.9.17",
"dependencies": {
"cojson": "workspace:*"
},

View File

@@ -1,4 +1,10 @@
import type { Everyone, RawAccountID, RawGroup, Role } from "cojson";
import type {
AccountRole,
Everyone,
RawAccountID,
RawGroup,
Role,
} from "cojson";
import type {
CoValue,
CoValueClass,
@@ -133,7 +139,9 @@ export class Group extends CoValueBase implements CoValue {
return this._raw.myRole();
}
addMember(member: Everyone | Account, role: Role) {
addMember(member: Everyone, role: "writer" | "reader"): Group;
addMember(member: Account, role: AccountRole): Group;
addMember(member: Everyone | Account, role: AccountRole) {
this._raw.addMember(member === "everyone" ? member : member._raw, role);
return this;
}

View File

@@ -49,6 +49,12 @@ export {
subscribeToCoValue,
} from "./internal.js";
export {
createInviteLink,
parseInviteLink,
consumeInviteLink,
} from "./implementation/invites.js";
export {
AnonymousJazzAgent,
createAnonymousJazzContext,

View File

@@ -31,7 +31,11 @@ export type AuthResult =
}
| {
type: "new";
creationProps: { name: string; anonymous?: boolean };
creationProps: {
name: string;
anonymous?: boolean;
other?: Record<string, unknown>;
};
initialSecret?: AgentSecret;
saveCredentials: (credentials: Credentials) => Promise<void>;
onSuccess: () => void;

View File

@@ -0,0 +1,99 @@
import { type InviteSecret, cojsonInternals } from "cojson";
import { Account } from "../coValues/account.js";
import type { CoValue, CoValueClass, ID } from "../internal.js";
/** @category Invite Links */
export function createInviteLink<C extends CoValue>(
value: C,
role: "reader" | "writer" | "admin" | "writeOnly",
baseURL: string,
valueHint?: string,
): string {
const coValueCore = value._raw.core;
let currentCoValue = coValueCore;
while (currentCoValue.header.ruleset.type === "ownedByGroup") {
currentCoValue = currentCoValue.getGroup().core;
}
const { ruleset, meta } = currentCoValue.header;
if (ruleset.type !== "group" || meta?.type === "account") {
throw new Error("Can't create invite link for object without group");
}
const group = cojsonInternals.expectGroup(currentCoValue.getCurrentContent());
const inviteSecret = group.createInvite(role);
return `${baseURL}#/invite/${valueHint ? valueHint + "/" : ""}${
value.id
}/${inviteSecret}`;
}
/** @category Invite Links */
export function parseInviteLink<C extends CoValue>(
inviteURL: string,
):
| {
valueID: ID<C>;
valueHint?: string;
inviteSecret: InviteSecret;
}
| undefined {
const url = new URL(inviteURL);
const parts = url.hash.split("/");
let valueHint: string | undefined;
let valueID: ID<C> | undefined;
let inviteSecret: InviteSecret | undefined;
if (parts[0] === "#" && parts[1] === "invite") {
if (parts.length === 5) {
valueHint = parts[2];
valueID = parts[3] as ID<C>;
inviteSecret = parts[4] as InviteSecret;
} else if (parts.length === 4) {
valueID = parts[2] as ID<C>;
inviteSecret = parts[3] as InviteSecret;
}
if (!valueID || !inviteSecret) {
return undefined;
}
return { valueID, inviteSecret, valueHint };
}
}
/** @category Invite Links */
export function consumeInviteLink<V extends CoValue>({
inviteURL,
as = Account.getMe(),
forValueHint,
invitedObjectSchema,
}: {
inviteURL: string;
as?: Account;
forValueHint?: string;
invitedObjectSchema: CoValueClass<V>;
}): Promise<
| {
valueID: ID<V>;
valueHint?: string;
inviteSecret: InviteSecret;
}
| undefined
> {
return new Promise((resolve, reject) => {
const result = parseInviteLink<V>(inviteURL);
if (result && result.valueHint === forValueHint) {
as.acceptInvite(result.valueID, result.inviteSecret, invitedObjectSchema)
.then(() => {
resolve(result);
})
.catch(reject);
} else {
resolve(undefined);
}
});
}

View File

@@ -1,10 +1,17 @@
import { WasmCrypto } from "cojson";
import { describe, expect, test } from "vitest";
import { beforeEach, describe, expect, test } from "vitest";
import { Account, CoMap, Group, Profile, co } from "../exports.js";
import { createJazzTestAccount } from "../testing.js";
import { setupTwoNodes } from "./utils.js";
const Crypto = await WasmCrypto.create();
beforeEach(async () => {
await createJazzTestAccount({
isCurrentActiveAccount: true,
});
});
describe("Custom accounts and groups", async () => {
class CustomProfile extends Profile {
name = co.string;
@@ -180,4 +187,61 @@ describe("Group inheritance", () => {
expect(loadedGroup).not.toBe("unavailable");
});
test("everyone is valid only for reader and writer roles", () => {
const group = Group.create();
group.addMember("everyone", "reader");
expect(group.members).toContainEqual({
id: "everyone",
role: "reader",
account: undefined,
ref: undefined,
});
group.addMember("everyone", "writer");
expect(group.members).toContainEqual({
id: "everyone",
role: "writer",
account: undefined,
ref: undefined,
});
// @ts-expect-error - admin is not a valid role for everyone
expect(() => group.addMember("everyone", "admin")).toThrow();
expect(group.members).toContainEqual({
id: "everyone",
role: "writer",
account: undefined,
ref: undefined,
});
// @ts-expect-error - writeOnly is not a valid role for everyone
expect(() => group.addMember("everyone", "writeOnly")).toThrow();
expect(group.members).toContainEqual({
id: "everyone",
role: "writer",
account: undefined,
ref: undefined,
});
});
test("typescript should show an error when adding a member with a non-account role", async () => {
const account = await createJazzTestAccount({});
const group = Group.create();
// @ts-expect-error - Even though readerInvite is a valid role for an account, we don't allow it to not create confusion when using the intellisense
group.addMember(account, "readerInvite");
expect(group.members).toContainEqual(
expect.objectContaining({
id: account.id,
role: "readerInvite",
}),
);
});
});

View File

@@ -0,0 +1,85 @@
import { beforeEach, describe, expect, test } from "vitest";
import { Account, Group } from "../exports";
import {
consumeInviteLink,
createInviteLink,
parseInviteLink,
} from "../implementation/invites";
import { createJazzTestAccount, setupJazzTestSync } from "../testing";
describe("Invite Links", () => {
let account: Account;
let group: Group;
const baseURL = "https://example.com";
beforeEach(async () => {
await setupJazzTestSync(); // Required to sync the invite between accounts
account = await createJazzTestAccount({
isCurrentActiveAccount: true,
});
group = Group.create({ owner: account });
});
test("createInviteLink generates correct format", () => {
const inviteLink = createInviteLink(group, "writer", baseURL);
expect(inviteLink).toMatch(
new RegExp(`^${baseURL}#/invite/${group.id}/[A-Za-z0-9_-]+$`),
);
});
test("createInviteLink with valueHint", () => {
const inviteLink = createInviteLink(group, "writer", baseURL, "myGroup");
expect(inviteLink).toMatch(
new RegExp(`^${baseURL}#/invite/myGroup/${group.id}/[A-Za-z0-9_-]+$`),
);
});
test("parseInviteLink correctly parses valid link", () => {
const inviteLink = createInviteLink(group, "writer", baseURL, "myGroup");
const result = parseInviteLink(inviteLink);
expect(result).toBeDefined();
expect(result?.valueID).toBe(group.id);
expect(result?.valueHint).toBe("myGroup");
expect(result?.inviteSecret).toBeDefined();
});
test("parseInviteLink returns undefined for invalid link", () => {
const invalidLink = "https://example.com/not-an-invite";
const result = parseInviteLink(invalidLink);
expect(result).toBeUndefined();
});
test("consumeInviteLink accepts valid invite", async () => {
const inviteLink = createInviteLink(group, "writer", baseURL, "myGroup");
const newAccount = await createJazzTestAccount();
const result = await consumeInviteLink({
inviteURL: inviteLink,
as: newAccount,
forValueHint: "myGroup",
invitedObjectSchema: Group,
});
expect(result).toBeDefined();
expect(result?.valueID).toBe(group.id);
expect(result?.valueHint).toBe("myGroup");
});
test("consumeInviteLink returns undefined for mismatched valueHint", async () => {
const inviteLink = createInviteLink(group, "writer", baseURL, "myGroup");
const newAccount = await createJazzTestAccount();
const result = await consumeInviteLink({
inviteURL: inviteLink,
as: newAccount,
forValueHint: "wrongHint",
invitedObjectSchema: Group,
});
expect(result).toBeUndefined();
});
});

View File

@@ -1,5 +1,22 @@
# jazz-react
## 0.9.17
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-browser@0.9.17
## 0.9.16
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-browser@0.9.16
## 0.9.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "jazz-vue",
"version": "0.9.15",
"version": "0.9.17",
"type": "module",
"main": "dist/index.js",
"types": "src/index.ts",

100
pnpm-lock.yaml generated
View File

@@ -453,7 +453,7 @@ importers:
specifier: workspace:*
version: link:../../packages/jazz-react
jazz-react-auth-clerk:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-react-auth-clerk
jazz-tools:
specifier: workspace:*
@@ -770,10 +770,10 @@ importers:
specifier: workspace:*
version: link:../../packages/jazz-inspector
jazz-react:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-react
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-tools
lucide-react:
specifier: ^0.274.0
@@ -1027,10 +1027,10 @@ importers:
examples/password-manager:
dependencies:
jazz-react:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-react
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-tools
react:
specifier: 18.3.1
@@ -1091,13 +1091,13 @@ importers:
specifier: ^2.0.0
version: 2.1.1
jazz-browser-media-images:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-browser-media-images
jazz-react:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-react
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-tools
lucide-react:
specifier: ^0.274.0
@@ -1152,7 +1152,7 @@ importers:
specifier: ^3.0.1
version: 3.0.1
jazz-run:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-run
postcss:
specifier: ^8.4.27
@@ -1231,10 +1231,10 @@ importers:
specifier: ^2.0.0
version: 2.1.1
jazz-react:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-react
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../../packages/jazz-tools
lucide-react:
specifier: ^0.274.0
@@ -1589,7 +1589,7 @@ importers:
specifier: workspace:0.9.13
version: link:../cojson-transport-ws
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
typescript:
specifier: ~5.6.2
@@ -1601,10 +1601,10 @@ importers:
specifier: workspace:0.9.13
version: link:../cojson
jazz-browser:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-browser
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
devDependencies:
typescript:
@@ -1620,10 +1620,10 @@ importers:
specifier: ^4.1.0
version: 4.1.0
jazz-browser:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-browser
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
pica:
specifier: ^9.0.1
@@ -1679,7 +1679,7 @@ importers:
specifier: workspace:0.9.13
version: link:../cojson-transport-ws
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
ws:
specifier: ^8.14.2
@@ -1704,13 +1704,13 @@ importers:
specifier: workspace:0.9.13
version: link:../cojson
jazz-browser:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-browser
jazz-react-core:
specifier: workspace:*
version: link:../jazz-react-core
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
devDependencies:
'@testing-library/dom':
@@ -1741,13 +1741,13 @@ importers:
specifier: workspace:0.9.13
version: link:../cojson
jazz-browser-auth-clerk:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-browser-auth-clerk
jazz-react:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-react
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
react:
specifier: 18.3.1
@@ -1896,7 +1896,7 @@ importers:
specifier: ^3.6.5
version: 3.11.9
jazz-tools:
specifier: workspace:0.9.15
specifier: workspace:0.9.17
version: link:../jazz-tools
ws:
specifier: ^8.14.2
@@ -3137,8 +3137,8 @@ packages:
expo-secure-store:
optional: true
'@clerk/clerk-js@5.43.3':
resolution: {integrity: sha512-F+ovIOOLEvgJJquGeRcxTUMeVThUYoN9cBUjWUAxpd25NVb2wcuZz/n6yxEaKuhv8lHXdww5m1rlVQIdi1R6cg==}
'@clerk/clerk-js@5.47.0':
resolution: {integrity: sha512-0S3xHJCJLIN2/EeiWF7uk+JstbL92dRbQ2ccEolnQiyMJUKHjwv3NGC5QxVizq1tEQrRcxVYWz46fb0DFamFVA==}
engines: {node: '>=18.17.0'}
peerDependencies:
react: 18.3.1
@@ -3151,10 +3151,22 @@ packages:
react: 18.3.1
react-dom: 18.3.1
'@clerk/localizations@3.9.4':
resolution: {integrity: sha512-VvaSvvXRZuivJWFGPQ5IJI4hhusnS0NQKn5yTF8vd0Y3zv2wCoDcSHrzGsLB5KOj1Qd89GyWb4Pd/50Fh3YCwQ==}
'@clerk/localizations@3.9.13':
resolution: {integrity: sha512-Uw3DqK3Fwns6a6jw8cjM4B3UXAlNDgwMRpI93pOnZlWNeaP7jTGrsRPrq1sBDX8BDGcXYKDoUfM4o73caUoyfQ==}
engines: {node: '>=18.17.0'}
'@clerk/shared@2.20.12':
resolution: {integrity: sha512-uy9Z2h0VXbQ4xwjj8mKuQSwm8MEFTAec+3gu4MSTyc1WboaPfX3MnO3qjqJEwu/oQkakocVI0P3nViYbXokZtQ==}
engines: {node: '>=18.17.0'}
peerDependencies:
react: 18.3.1
react-dom: 18.3.1
peerDependenciesMeta:
react:
optional: true
react-dom:
optional: true
'@clerk/shared@2.20.4':
resolution: {integrity: sha512-1ndGEO+NejIMFkl47DCeSpVv3nmKh9BHD6wt2Sl3X1wv7sj3eWzSVC14Exkag7D8Og2VcN4LXOFLErsCXHS+YQ==}
engines: {node: '>=18.17.0'}
@@ -3171,6 +3183,10 @@ packages:
resolution: {integrity: sha512-9QdllXYujsjYLbvPg9Kq1rWOemX5FB0r6Ijy8HOxwjKN+TPlxUnGcs+t7IwU+M5gdmZ2KV6aA6d1a2q2FlSoiA==}
engines: {node: '>=18.17.0'}
'@clerk/types@4.42.0':
resolution: {integrity: sha512-SPBRHdP+ZggeudncbSj8KLOZ5PdVmtgZhL+tXremVJrETi9WHpf1UOYgnIHl+clp6GZC2IQM4tq57RSrHf0Oew==}
engines: {node: '>=18.17.0'}
'@coinbase/wallet-sdk@4.0.4':
resolution: {integrity: sha512-74c040CRnGhfRjr3ArnkAgud86erIqdkPHNt5HR1k9u97uTIZCJww9eGYT67Qf7gHPpGS/xW8Be1D4dvRm63FA==}
@@ -12500,7 +12516,7 @@ snapshots:
'@clerk/clerk-expo@2.6.5(dxzpvinlcnpqlc4vkhiczb2xvi)':
dependencies:
'@clerk/clerk-js': 5.43.3(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@clerk/clerk-js': 5.47.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@clerk/clerk-react': 5.20.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@clerk/shared': 2.20.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@clerk/types': 4.40.0
@@ -12518,11 +12534,11 @@ snapshots:
- '@types/react'
- supports-color
'@clerk/clerk-js@5.43.3(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
'@clerk/clerk-js@5.47.0(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
dependencies:
'@clerk/localizations': 3.9.4
'@clerk/shared': 2.20.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@clerk/types': 4.40.0
'@clerk/localizations': 3.9.13
'@clerk/shared': 2.20.12(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
'@clerk/types': 4.42.0
'@coinbase/wallet-sdk': 4.0.4
'@emotion/cache': 11.11.0
'@emotion/react': 11.11.1(@types/react@18.3.18)(react@18.3.1)
@@ -12553,9 +12569,21 @@ snapshots:
react-dom: 18.3.1(react@18.3.1)
tslib: 2.4.1
'@clerk/localizations@3.9.4':
'@clerk/localizations@3.9.13':
dependencies:
'@clerk/types': 4.40.0
'@clerk/types': 4.42.0
'@clerk/shared@2.20.12(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
dependencies:
'@clerk/types': 4.42.0
dequal: 2.0.3
glob-to-regexp: 0.4.1
js-cookie: 3.0.5
std-env: 3.8.0
swr: 2.2.5(react@18.3.1)
optionalDependencies:
react: 18.3.1
react-dom: 18.3.1(react@18.3.1)
'@clerk/shared@2.20.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
dependencies:
@@ -12573,6 +12601,10 @@ snapshots:
dependencies:
csstype: 3.1.1
'@clerk/types@4.42.0':
dependencies:
csstype: 3.1.1
'@coinbase/wallet-sdk@4.0.4':
dependencies:
buffer: 6.0.3

View File

@@ -11,6 +11,8 @@ node_modules
dist
dist-ssr
*.local
/test-results/
/playwright-report/
# Editor directories and files
.vscode/*

View File

@@ -1,5 +1,22 @@
# jazz-tailwind-demo-auth-starter
## 0.0.32
### Patch Changes
- Updated dependencies [c2ca1fe]
- Updated dependencies [1227047]
- jazz-tools@0.9.17
- jazz-react@0.9.17
## 0.0.31
### Patch Changes
- Updated dependencies [24b3b6a]
- jazz-tools@0.9.16
- jazz-react@0.9.16
## 0.0.30
### Patch Changes

View File

@@ -6,7 +6,7 @@ A minimal starter template for building apps with **[Jazz](https://jazz.tools)**
Create a new Jazz app.
```bash
npx create-jazz-app
npx create-jazz-app@latest
```
Then select "React + Jazz + Demo Auth + Tailwind".

View File

@@ -1,7 +1,7 @@
{
"name": "jazz-tailwind-demo-auth-starter",
"private": true,
"version": "0.0.30",
"version": "0.0.32",
"type": "module",
"scripts": {
"dev": "vite",

File diff suppressed because one or more lines are too long