Skip to content

Commit 18750ab

Browse files
authored
Merge branch 'main' into tm/eco-661-keychain-access-expo-secure-store
2 parents b3105eb + 7fe30b4 commit 18750ab

7 files changed

Lines changed: 25 additions & 7 deletions

File tree

‎.changeset/fuzzy-bags-tease.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.changeset/three-olives-start.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/clerk-js': patch
3+
---
4+
5+
Add support for the signup_rate_limit_exceeded error on OAuth flows

‎integration/cleanup/cleanup.setup.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
import { createClerkClient } from '@clerk/backend';
2+
import { parsePublishableKey } from '@clerk/shared/keys';
3+
import { isStaging } from '@clerk/shared/utils';
24
import { test as setup } from '@playwright/test';
35

46
import { appConfigs } from '../presets/';
57

68
setup('cleanup instances ', async () => {
79
const entries = Array.from(appConfigs.secrets.instanceKeys.values())
8-
.map(({ sk }) => {
10+
.map(({ pk, sk }) => {
911
const secretKey = sk;
1012
if (!secretKey) {
1113
return null;
1214
}
13-
return { secretKey };
15+
const parsedPk = parsePublishableKey(pk);
16+
const apiUrl = isStaging(parsedPk.frontendApi) ? 'https://api.clerkstage.dev' : 'https://api.clerk.com';
17+
return { secretKey, apiUrl };
1418
})
1519
.filter(Boolean);
1620

1721
for (const entry of entries) {
1822
console.log(`Cleanup for ${entry.secretKey.replace(/(sk_(test|live)_)(.+)(...)/, '$1***$4')}`);
19-
const clerkClient = createClerkClient({ secretKey: entry.secretKey });
23+
const clerkClient = createClerkClient({ secretKey: entry.secretKey, apiUrl: entry.apiUrl });
2024
const { data: usersWithEmail } = await clerkClient.users.getUserList({
2125
orderBy: '-created_at',
2226
query: 'clerkcookie',
@@ -45,11 +49,13 @@ setup('cleanup instances ', async () => {
4549
await Promise.all(
4650
batch.map(user => {
4751
console.log(
48-
`Cleaning up user ${user.id} (${user.emailAddresses[0]?.emailAddress}) (${new Date(
52+
`Cleaning up user ${user.id} (${user.emailAddresses?.[0]?.emailAddress || user.phoneNumbers?.[0]?.phoneNumber}) (${new Date(
4953
user.createdAt,
5054
).toISOString()})`,
5155
);
52-
return clerkClient.users.deleteUser(user.id);
56+
return clerkClient.users.deleteUser(user.id).catch(error => {
57+
console.error(`Error deleting user ${user.id}:`, error);
58+
});
5359
}),
5460
);
5561
await new Promise(r => setTimeout(r, 1000));
@@ -60,7 +66,9 @@ setup('cleanup instances ', async () => {
6066
await Promise.all(
6167
batch.map(org => {
6268
console.log(`Cleaning up org ${org.id} (${org.name}) (${new Date(org.createdAt).toISOString()})`);
63-
return clerkClient.organizations.deleteOrganization(org.id);
69+
return clerkClient.organizations.deleteOrganization(org.id).catch(error => {
70+
console.error(`Error deleting org ${org.id}:`, error);
71+
});
6472
}),
6573
);
6674
await new Promise(r => setTimeout(r, 1000));

‎packages/clerk-js/bundlewatch.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"files": [
3-
{ "path": "./dist/clerk.js", "maxSize": "598kB" },
3+
{ "path": "./dist/clerk.js", "maxSize": "599kB" },
44
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
55
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
66
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },

‎packages/clerk-js/src/core/constants.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const ERROR_CODES = {
3838
CAPTCHA_INVALID: 'captcha_invalid',
3939
FRAUD_DEVICE_BLOCKED: 'device_blocked',
4040
FRAUD_ACTION_BLOCKED: 'action_blocked',
41+
SIGNUP_RATE_LIMIT_EXCEEDED: 'signup_rate_limit_exceeded',
4142
} as const;
4243

4344
export const SIGN_IN_INITIAL_VALUE_KEYS = ['email_address', 'phone_number', 'username'];

‎packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ function SignInStartInternal(): JSX.Element {
275275
case ERROR_CODES.CAPTCHA_INVALID:
276276
case ERROR_CODES.FRAUD_DEVICE_BLOCKED:
277277
case ERROR_CODES.FRAUD_ACTION_BLOCKED:
278+
case ERROR_CODES.SIGNUP_RATE_LIMIT_EXCEEDED:
278279
card.setError(error);
279280
break;
280281
default:

‎packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ function SignUpStartInternal(): JSX.Element {
194194
case ERROR_CODES.CAPTCHA_INVALID:
195195
case ERROR_CODES.FRAUD_DEVICE_BLOCKED:
196196
case ERROR_CODES.FRAUD_ACTION_BLOCKED:
197+
case ERROR_CODES.SIGNUP_RATE_LIMIT_EXCEEDED:
197198
card.setError(error);
198199
break;
199200
default:

0 commit comments

Comments
 (0)