Skip to content

Commit a486d34

Browse files
committed
Merge branch 'main' into fix/respect-afterCreateOrganizationUrl
2 parents 17461a6 + c17db8f commit a486d34

File tree

166 files changed

+2968
-2024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+2968
-2024
lines changed

.changeset/brown-chairs-invite.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

.changeset/famous-wolves-open.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/flat-papers-begin.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.changeset/modern-fans-tease.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/new-coins-attend.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/shaky-seas-dream.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@clerk/localizations': patch
3+
'@clerk/clerk-js': patch
4+
'@clerk/types': patch
5+
---
6+
7+
Add "Past Due" amount on checkout flow when applicable

.changeset/sixty-carpets-stare.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

.changeset/tender-brooms-look.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

integration/cleanup/cleanup.setup.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,22 @@ setup('cleanup instances ', async () => {
1515
.filter(Boolean);
1616

1717
for (const entry of entries) {
18-
console.log(`Cleanup for ${entry.secretKey.replace(/(sk_test_)(.+)(...)/, '$1***$3')}`);
18+
console.log(`Cleanup for ${entry.secretKey.replace(/(sk_(test|live)_)(.+)(...)/, '$1***$4')}`);
1919
const clerkClient = createClerkClient({ secretKey: entry.secretKey });
20-
const { data: users } = await clerkClient.users.getUserList({
20+
const { data: usersWithEmail } = await clerkClient.users.getUserList({
2121
orderBy: '-created_at',
2222
query: 'clerkcookie',
2323
limit: 150,
2424
});
2525

26+
const { data: usersWithPhoneNumber } = await clerkClient.users.getUserList({
27+
orderBy: '-created_at',
28+
query: '55501',
29+
limit: 150,
30+
});
31+
32+
const users = [...usersWithEmail, ...usersWithPhoneNumber];
33+
2634
const { data: orgs } = await clerkClient.organizations
2735
.getOrganizationList({
2836
limit: 150,

integration/testUtils/usersService.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export type UserService = {
6464
* Creates a BAPI user if it doesn't exist, otherwise returns the existing user.
6565
*/
6666
getOrCreateUser: (fakeUser: FakeUser) => Promise<User>;
67-
deleteIfExists: (opts: { id?: string; email?: string }) => Promise<void>;
67+
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
6868
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
6969
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
7070
};
@@ -92,15 +92,16 @@ export const createUserService = (clerkClient: ClerkClient) => {
9292
const email = fictionalEmail
9393
? `${randomHash}[email protected]`
9494
: `clerkcookie+${randomHash}@mailsac.com`;
95+
const phoneNumber = fakerPhoneNumber();
9596

9697
return {
9798
firstName: faker.person.firstName(),
9899
lastName: faker.person.lastName(),
99100
email: withEmail ? email : undefined,
100101
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
101102
password: withPassword ? `${email}${randomHash}` : undefined,
102-
phoneNumber: withPhoneNumber ? fakerPhoneNumber() : undefined,
103-
deleteIfExists: () => self.deleteIfExists({ email }),
103+
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
104+
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
104105
};
105106
},
106107
createBapiUser: async fakeUser => {
@@ -121,16 +122,19 @@ export const createUserService = (clerkClient: ClerkClient) => {
121122
}
122123
return await self.createBapiUser(fakeUser);
123124
},
124-
deleteIfExists: async (opts: { id?: string; email?: string }) => {
125+
deleteIfExists: async (opts: { id?: string; email?: string; phoneNumber?: string }) => {
125126
let id = opts.id;
126127

127128
if (!id) {
128-
const { data: users } = await clerkClient.users.getUserList({ emailAddress: [opts.email] });
129+
const { data: users } = await clerkClient.users.getUserList({
130+
emailAddress: [opts.email],
131+
phoneNumber: [opts.phoneNumber],
132+
});
129133
id = users[0]?.id;
130134
}
131135

132136
if (!id) {
133-
console.log(`User "${opts.email}" does not exist!`);
137+
console.log(`User "${opts.email || opts.phoneNumber}" does not exist!`);
134138
return;
135139
}
136140

integration/tests/pricing-table.test.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
214214
await u.po.checkout.confirmAndContinue();
215215
await u.po.pricingTable.startCheckout({ planSlug: 'free_user', shouldSwitch: true });
216216
await u.po.checkout.waitForSubscribeButton();
217+
await expect(
218+
page.locator('.cl-checkout-root').getByRole('button', { name: /^pay with test card$/i }),
219+
).toBeHidden();
217220

218221
await fakeUser.deleteIfExists();
219222
});

integration/tests/whatsapp-phone-code.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test.describe('sign up and sign in with WhatsApp phone code @generic', () => {
2121
await app.withEnv(appConfigs.envs.withWhatsappPhoneCode);
2222
await app.dev();
2323
fakeUser = createTestUtils({ app }).services.users.createFakeUser({
24-
fictionalEmail: true,
24+
withEmail: false,
2525
withPhoneNumber: true,
2626
withPassword: false,
2727
});
@@ -60,7 +60,7 @@ test.describe('sign up and sign in with WhatsApp phone code @generic', () => {
6060
const request = route.request();
6161
const body = await request.postDataJSON();
6262
expect(body.strategy).toBe('phone_code');
63-
expect(body.channel).toBe('sms');
63+
expect(body.channel).toBeUndefined();
6464
await route.continue();
6565
});
6666

@@ -98,7 +98,7 @@ test.describe('sign up and sign in with WhatsApp phone code @generic', () => {
9898
const request = route.request();
9999
const body = await request.postDataJSON();
100100
expect(body.strategy).toBe('phone_code');
101-
expect(body.channel).toBe('sms');
101+
expect(body.channel).toBeUndefined();
102102
await route.continue();
103103
});
104104

@@ -137,7 +137,7 @@ test.describe('sign up and sign in with WhatsApp phone code @generic', () => {
137137
const request = route.request();
138138
const body = await request.postDataJSON();
139139
expect(body.strategy).toBe('phone_code');
140-
expect(body.channel).toBe('sms');
140+
expect(body.channel).toBeUndefined();
141141
await route.continue();
142142
});
143143

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"devDependencies": {
6060
"@actions/core": "^1.11.1",
6161
"@arethetypeswrong/cli": "0.17.4",
62-
"@changesets/cli": "^2.29.2",
62+
"@changesets/cli": "^2.29.4",
6363
"@changesets/get-github-info": "^0.6.0",
6464
"@clerk/backend": "workspace:*",
6565
"@clerk/shared": "workspace:*",
@@ -68,7 +68,7 @@
6868
"@commitlint/config-conventional": "^19.8.0",
6969
"@emotion/jest": "^11.13.0",
7070
"@eslint/eslintrc": "^3.3.1",
71-
"@eslint/js": "9.24.0",
71+
"@eslint/js": "9.27.0",
7272
"@faker-js/faker": "^8.1.0",
7373
"@jest/globals": "29.7.0",
7474
"@octokit/rest": "^20.1.2",
@@ -79,7 +79,7 @@
7979
"@testing-library/user-event": "^14.5.2",
8080
"@types/cross-spawn": "^6.0.6",
8181
"@types/jest": "^29.3.1",
82-
"@types/node": "^22.14.1",
82+
"@types/node": "^22.15.21",
8383
"@types/react": "catalog:react",
8484
"@types/react-dom": "catalog:react",
8585
"@vitest/coverage-v8": "3.0.2",
@@ -89,21 +89,21 @@
8989
"cpy-cli": "^5.0.0",
9090
"cross-spawn": "^7.0.6",
9191
"dotenv": "^16.5.0",
92-
"eslint": "9.24.0",
93-
"eslint-config-prettier": "10.1.2",
94-
"eslint-config-turbo": "2.5.0",
95-
"eslint-import-resolver-typescript": "3.10.0",
92+
"eslint": "9.27.0",
93+
"eslint-config-prettier": "10.1.5",
94+
"eslint-config-turbo": "2.5.3",
95+
"eslint-import-resolver-typescript": "3.10.1",
9696
"eslint-plugin-import": "2.31.0",
9797
"eslint-plugin-jest": "28.11.0",
98-
"eslint-plugin-jsdoc": "50.6.9",
98+
"eslint-plugin-jsdoc": "50.6.17",
9999
"eslint-plugin-jsx-a11y": "6.10.2",
100100
"eslint-plugin-playwright": "2.2.0",
101101
"eslint-plugin-react": "7.37.5",
102102
"eslint-plugin-react-hooks": "5.2.0",
103103
"eslint-plugin-simple-import-sort": "12.1.1",
104-
"eslint-plugin-turbo": "2.5.0",
104+
"eslint-plugin-turbo": "2.5.3",
105105
"eslint-plugin-unused-imports": "4.1.4",
106-
"eslint-plugin-yml": "1.17.0",
106+
"eslint-plugin-yml": "1.18.0",
107107
"execa": "^5.1.1",
108108
"expect-type": "^0.20.0",
109109
"fs-extra": "^11.3.0",
@@ -120,7 +120,7 @@
120120
"jsonwebtoken": "9.0.2",
121121
"lint-staged": "^14.0.1",
122122
"prettier": "^3.5.3",
123-
"prettier-plugin-packagejson": "^2.5.10",
123+
"prettier-plugin-packagejson": "^2.5.14",
124124
"prettier-plugin-tailwindcss": "^0.6.11",
125125
"publint": "^0.3.12",
126126
"react": "catalog:react",
@@ -130,13 +130,13 @@
130130
"tree-kill": "^1.2.2",
131131
"ts-jest": "29.2.5",
132132
"tsup": "catalog:repo",
133-
"turbo": "^2.5.2",
134-
"turbo-ignore": "^2.5.2",
135-
"typedoc": "0.28.3",
133+
"turbo": "^2.5.3",
134+
"turbo-ignore": "^2.5.3",
135+
"typedoc": "0.28.4",
136136
"typedoc-plugin-markdown": "4.6.3",
137137
"typedoc-plugin-replace-text": "4.2.0",
138138
"typescript": "catalog:repo",
139-
"typescript-eslint": "8.30.1",
139+
"typescript-eslint": "8.32.1",
140140
"uuid": "8.3.2",
141141
"verdaccio": "^5.33.0",
142142
"vitest": "3.0.5",

packages/agent-toolkit/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# @clerk/agent-toolkit
22

3+
## 0.0.39
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`6ed3dfc`](https://github.com/clerk/javascript/commit/6ed3dfc1bc742ac9d9a2307fe8e4733411cbc0d7), [`22c3363`](https://github.com/clerk/javascript/commit/22c33631f7f54b4f2179bf16f548fee1a237976e), [`ac6b231`](https://github.com/clerk/javascript/commit/ac6b23147e5e0aa21690cc20a109ed9a8c8f6e5b)]:
8+
- @clerk/types@4.59.2
9+
- @clerk/backend@1.33.1
10+
- @clerk/shared@3.9.4
11+
12+
## 0.0.38
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [[`ced8912`](https://github.com/clerk/javascript/commit/ced8912e8c9fb7eb7846de6ca9a872e794d9e15d), [`f237d76`](https://github.com/clerk/javascript/commit/f237d7617e5398ca0ba981e4336cac2191505b00), [`5f1375b`](https://github.com/clerk/javascript/commit/5f1375ba7cc50cccb11d5aee03bfd4c3d1bf462f)]:
17+
- @clerk/backend@1.33.0
18+
- @clerk/shared@3.9.3
19+
320
## 0.0.37
421

522
### Patch Changes

packages/agent-toolkit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/agent-toolkit",
3-
"version": "0.0.37",
3+
"version": "0.0.39",
44
"description": "Clerk Toolkit for AI Agents",
55
"homepage": "https://clerk.com/",
66
"bugs": {

packages/astro/CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,49 @@
11
# @clerk/astro
22

3+
## 2.8.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`6ed3dfc`](https://github.com/clerk/javascript/commit/6ed3dfc1bc742ac9d9a2307fe8e4733411cbc0d7), [`22c3363`](https://github.com/clerk/javascript/commit/22c33631f7f54b4f2179bf16f548fee1a237976e), [`ac6b231`](https://github.com/clerk/javascript/commit/ac6b23147e5e0aa21690cc20a109ed9a8c8f6e5b)]:
8+
- @clerk/types@4.59.2
9+
- @clerk/backend@1.33.1
10+
- @clerk/shared@3.9.4
11+
12+
## 2.8.0
13+
14+
### Minor Changes
15+
16+
- Introduce `treatPendingAsSignedOut` option to `getAuth` and `auth` from `clerkMiddleware` ([#5757](https://github.com/clerk/javascript/pull/5757)) by [@LauraBeatris](https://github.com/LauraBeatris)
17+
18+
By default, `treatPendingAsSignedOut` is set to `true`, which means pending sessions are treated as signed-out. You can set this option to `false` to treat pending sessions as authenticated.
19+
20+
```ts
21+
// `pending` sessions will be treated as signed-out by default
22+
const { userId } = getAuth(req, locals);
23+
```
24+
25+
```ts
26+
// Both `active` and `pending` sessions will be treated as authenticated when `treatPendingAsSignedOut` is false
27+
const { userId } = getAuth(req, locals, { treatPendingAsSignedOut: false });
28+
```
29+
30+
```ts
31+
clerkMiddleware((auth, context) => {
32+
const { redirectToSignIn, userId } = auth({ treatPendingAsSignedOut: false });
33+
34+
// Both `active` and `pending` sessions will be treated as authenticated when `treatPendingAsSignedOut` is false
35+
if (!userId && isProtectedRoute(context.request)) {
36+
return redirectToSignIn();
37+
}
38+
});
39+
```
40+
41+
### Patch Changes
42+
43+
- Updated dependencies [[`ced8912`](https://github.com/clerk/javascript/commit/ced8912e8c9fb7eb7846de6ca9a872e794d9e15d), [`f237d76`](https://github.com/clerk/javascript/commit/f237d7617e5398ca0ba981e4336cac2191505b00), [`5f1375b`](https://github.com/clerk/javascript/commit/5f1375ba7cc50cccb11d5aee03bfd4c3d1bf462f)]:
44+
- @clerk/backend@1.33.0
45+
- @clerk/shared@3.9.3
46+
347
## 2.7.5
448

549
### Patch Changes

packages/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@clerk/astro",
3-
"version": "2.7.5",
3+
"version": "2.8.1",
44
"description": "Clerk SDK for Astro",
55
"keywords": [
66
"auth",

0 commit comments

Comments
 (0)