Skip to content

Commit 57b4e0b

Browse files
authored
fix(ui): keep the SSO callback error after bouncing to the sign-in start screen (#10774)
1 parent 584a369 commit 57b4e0b

56 files changed

Lines changed: 438 additions & 28 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@clerk/localizations': patch
3+
'@clerk/shared': patch
4+
---
5+
6+
Show "Too many requests. Please try again in a bit." for both `too_many_requests` and `signup_rate_limit_exceeded` errors in the prebuilt components. Replace "The External Account was not found." with "Account not found. Please sign up or try signing in to a different account."
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@clerk/ui': patch
3+
---
4+
5+
Fix `<SignIn />` showing "The External Account was not found." to new users when the sign-up transfer after an OAuth sign-in fails, for example when a firewall, rate limit or Protect blocks the request. The start screen now keeps the error shown on the SSO callback screen, and a Protect block shows the blocked screen with its reference. The account not found message still appears when transfers are turned off with `transferable={false}`.

‎integration/tests/oauth-flows.test.ts‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,5 +635,74 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withLegalConsent] })(
635635
await u.services.users.deleteIfExists({ email: newUser.email });
636636
}
637637
});
638+
639+
const blockedTransferResponses = [
640+
{
641+
name: 'a non-Clerk HTML response',
642+
response: { status: 429, contentType: 'text/html', body: '<html><body>Blocked</body></html>' },
643+
error: /Unable to complete action at this time/,
644+
},
645+
{
646+
name: 'a Clerk-shaped WAF response',
647+
response: {
648+
status: 429,
649+
contentType: 'application/json',
650+
body: JSON.stringify({
651+
errors: [{ code: 'too_many_requests', message: 'Too many requests. Please try again in a bit.' }],
652+
}),
653+
},
654+
error: /Too many requests\. Please try again in a bit\./,
655+
},
656+
];
657+
658+
for (const { name, response, error } of blockedTransferResponses) {
659+
test(`keeps the transfer error on the start screen when the sign-up transfer is blocked by ${name}`, async ({
660+
page,
661+
context,
662+
}) => {
663+
const providerKeys = await resolveInstanceKeys('oauth-provider');
664+
const providerClient = createClerkClient({ secretKey: providerKeys.sk, publishableKey: providerKeys.pk });
665+
const users = createUserService(withRetry(providerClient));
666+
const newUser = users.createFakeUser(test, { withUsername: true });
667+
await users.createBapiUser(newUser);
668+
669+
const u = await createTestUtils({ app, page, context });
670+
671+
await page.route('**/v1/client/sign_ups*', route => {
672+
const request = route.request();
673+
const isTransfer =
674+
request.method() === 'POST' &&
675+
(new URL(request.url()).searchParams.get('transfer') === 'true' ||
676+
request.postData()?.includes('transfer=true'));
677+
if (!isTransfer) {
678+
return route.continue();
679+
}
680+
return route.fulfill(response);
681+
});
682+
683+
try {
684+
await u.po.signIn.goTo();
685+
await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
686+
await u.page.getByText(/Sign in to .*oauth-provider/).waitFor();
687+
688+
await u.po.signIn.setIdentifier(newUser.email);
689+
await u.po.signIn.continue();
690+
await u.po.signIn.enterTestOtpCode();
691+
692+
const transferError = u.page.getByText(error);
693+
await transferError.waitFor();
694+
await u.page.waitForURL(url => url.pathname === '/sign-in');
695+
await u.po.signIn.waitForMounted();
696+
697+
await expect(transferError).toBeVisible();
698+
await expect(
699+
u.page.getByText(/Account not found\. Please sign up or try signing in to a different account\./),
700+
).toBeHidden();
701+
} finally {
702+
await newUser.deleteIfExists();
703+
await u.services.users.deleteIfExists({ email: newUser.email });
704+
}
705+
});
706+
}
638707
},
639708
);

‎packages/localizations/src/ar-SA.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,6 +2084,7 @@ export const arSA: LocalizationResource = {
20842084
'لا يمكن تسجيل الحساب بسبب مشاكل تحقق أمنية. الرجاء تحديث الصفحة للمحاولة مرة أخرى أو تواصل معنا للمزيد من المساعدة',
20852085
captcha_unavailable:
20862086
'التسجيل غير ناجح بسبب فشل التحقق من صحة الروبوت. يُرجى تحديث الصفحة للمحاولة مرة أخرى أو التواصل مع فريق الدعم للحصول على مزيد من المساعدة',
2087+
external_account_not_found: undefined,
20872088
form_code_incorrect: undefined,
20882089
form_email_address_blocked:
20892090
'خدمات البريد الإلكتروني المؤقتة غير مدعومة. يرجى استخدام عنوان بريدك الإلكتروني العادي لإنشاء حساب.',
@@ -2157,9 +2158,11 @@ export const arSA: LocalizationResource = {
21572158
protect_check_timed_out: undefined,
21582159
protect_check_unsupported_environment: undefined,
21592160
session_exists: 'لقد قمت بتسجيل الدخول بالفعل',
2161+
signup_rate_limit_exceeded: undefined,
21602162
sso_bypass_domain_not_served: undefined,
21612163
ticket_expired_code: undefined,
21622164
ticket_invalid_code: undefined,
2165+
too_many_requests: undefined,
21632166
too_many_unverified_identifications: undefined,
21642167
web3_missing_identifier: undefined,
21652168
web3_signature_request_rejected: 'لقد رفضت طلب التوقيع. يرجى المحاولة مرة أخرى للمتابعة.',

‎packages/localizations/src/be-BY.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,6 +2094,7 @@ export const beBY: LocalizationResource = {
20942094
'Рэгістрацыя не ўдалася з-за памылак бяспекі. Калі ласка, абнавіце старонку, каб паспрабаваць яшчэ раз, або звяжыцеся са службай падтрымкі для атрымання дапамогі.',
20952095
captcha_unavailable:
20962096
'Рэгістрацыя не ўдалася з-за памылак праверкі ботаў. Калі ласка, абнавіце старонку, каб паспрабаваць яшчэ раз або звяжыцеся са службай падтрымкі для атрымання дапамогі.',
2097+
external_account_not_found: undefined,
20972098
form_code_incorrect: 'Невядомы код. Пераканайцеся, што вы ўвялі правільны код.',
20982099
form_email_address_blocked:
20992100
'Часовая пошта не падтрымліваецца. Калі ласка, выкарыстоўвайце свой звычайны адрас электроннай пошты для стварэння акаўнта.',
@@ -2168,9 +2169,11 @@ export const beBY: LocalizationResource = {
21682169
protect_check_timed_out: undefined,
21692170
protect_check_unsupported_environment: undefined,
21702171
session_exists: 'Вы ўжо ўвайшлі.',
2172+
signup_rate_limit_exceeded: undefined,
21712173
sso_bypass_domain_not_served: undefined,
21722174
ticket_expired_code: undefined,
21732175
ticket_invalid_code: undefined,
2176+
too_many_requests: undefined,
21742177
too_many_unverified_identifications: undefined,
21752178
web3_missing_identifier: undefined,
21762179
web3_signature_request_rejected: 'Вы адхілілі запыт на подпіс. Калі ласка, паспрабуйце яшчэ раз, каб працягнуць.',

‎packages/localizations/src/bg-BG.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,6 +2088,7 @@ export const bgBG: LocalizationResource = {
20882088
'Типът на файла не се поддържа. Моля, качете изображение във формат JPG, PNG, GIF или WEBP.',
20892089
captcha_invalid: undefined,
20902090
captcha_unavailable: undefined,
2091+
external_account_not_found: undefined,
20912092
form_code_incorrect: 'Невалиден код. Моля, опитайте отново.',
20922093
form_email_address_blocked:
20932094
'Временните имейл услуги не се поддържат. Моля, използвайте вашия обикновен имейл адрес, за да създадете акаунт.',
@@ -2161,9 +2162,11 @@ export const bgBG: LocalizationResource = {
21612162
protect_check_timed_out: undefined,
21622163
protect_check_unsupported_environment: undefined,
21632164
session_exists: 'Вече сте влезнали.',
2165+
signup_rate_limit_exceeded: undefined,
21642166
sso_bypass_domain_not_served: undefined,
21652167
ticket_expired_code: undefined,
21662168
ticket_invalid_code: undefined,
2169+
too_many_requests: undefined,
21672170
too_many_unverified_identifications: undefined,
21682171
web3_missing_identifier: undefined,
21692172
web3_signature_request_rejected: 'Отхвърлихте заявката за подпис. Моля, опитайте отново, за да продължите.',

‎packages/localizations/src/bn-IN.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,6 +2106,7 @@ export const bnIN: LocalizationResource = {
21062106
'নিরাপত্তা যাচাইকরণ ব্যর্থ হওয়ার কারণে সাইন আপ ব্যর্থ হয়েছে। আবার চেষ্টা করতে দয়া করে পৃষ্ঠাটি রিফ্রেশ করুন বা আরও সাহায্যের জন্য সাপোর্টের সাথে যোগাযোগ করুন।',
21072107
captcha_unavailable:
21082108
'বট যাচাইকরণ ব্যর্থ হওয়ার কারণে সাইন আপ ব্যর্থ হয়েছে। আবার চেষ্টা করতে দয়া করে পৃষ্ঠাটি রিফ্রেশ করুন বা আরও সাহায্যের জন্য সাপোর্টের সাথে যোগাযোগ করুন।',
2109+
external_account_not_found: undefined,
21092110
form_code_incorrect: undefined,
21102111
form_email_address_blocked:
21112112
'অস্থায়ী ইমেইল পরিষেবাগুলি সমর্থিত নয়। অনুগ্রহ করে অ্যাকাউন্ট তৈরি করতে আপনার নিয়মিত ইমেইল ঠিকানা ব্যবহার করুন।',
@@ -2186,9 +2187,11 @@ export const bnIN: LocalizationResource = {
21862187
protect_check_timed_out: undefined,
21872188
protect_check_unsupported_environment: undefined,
21882189
session_exists: undefined,
2190+
signup_rate_limit_exceeded: undefined,
21892191
sso_bypass_domain_not_served: undefined,
21902192
ticket_expired_code: undefined,
21912193
ticket_invalid_code: undefined,
2194+
too_many_requests: undefined,
21922195
too_many_unverified_identifications: undefined,
21932196
web3_missing_identifier: 'একটি Web3 ওয়ালেট এক্সটেনশন পাওয়া যায়নি। চালিয়ে যেতে দয়া করে একটি ইনস্টল করুন।',
21942197
web3_signature_request_rejected:

‎packages/localizations/src/ca-ES.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,6 +2098,7 @@ export const caES: LocalizationResource = {
20982098
"El registre no ha estat exitós a causa de validacions de seguretat fallides. Si us plau, actualitza la pàgina per tornar-ho a intentar o posa't en contacte amb el suport per obtenir més assistència.",
20992099
captcha_unavailable:
21002100
"El registre no ha estat exitós a causa de la validació fallida de bot. Si us plau, actualitza la pàgina per tornar-ho a intentar o posa't en contacte amb el suport per obtenir més assistència.",
2101+
external_account_not_found: undefined,
21012102
form_code_incorrect: 'El codi introduït no és vàlid. Si us plau, comprova el codi i torna-ho a intentar.',
21022103
form_email_address_blocked:
21032104
'Els serveis de correu electrònic temporal no estan suportats. Si us plau, utilitzeu la vostra adreça de correu electrònic habitual per crear un compte.',
@@ -2174,9 +2175,11 @@ export const caES: LocalizationResource = {
21742175
protect_check_timed_out: undefined,
21752176
protect_check_unsupported_environment: undefined,
21762177
session_exists: 'Ja estàs connectat.',
2178+
signup_rate_limit_exceeded: undefined,
21772179
sso_bypass_domain_not_served: undefined,
21782180
ticket_expired_code: undefined,
21792181
ticket_invalid_code: undefined,
2182+
too_many_requests: undefined,
21802183
too_many_unverified_identifications: undefined,
21812184
web3_missing_identifier: undefined,
21822185
web3_signature_request_rejected: 'Has rebutjat la sol·licitud de signatura. Torna-ho a provar per continuar.',

‎packages/localizations/src/cs-CZ.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,6 +2100,7 @@ export const csCZ: LocalizationResource = {
21002100
'Registrace neúspěšná kvůli neúspěšným bezpečnostním validacím. Prosím, obnovte stránku a zkuste to znovu nebo kontaktujte podporu.',
21012101
captcha_unavailable:
21022102
'Registrace nebyla úspěšná kvůli neúspěšné validaci bota. Prosím obnovte stránku a zkuste to znovu, nebo se obraťte na podporu pro další pomoc.',
2103+
external_account_not_found: undefined,
21032104
form_code_incorrect: 'Kód je nesprávný.',
21042105
form_email_address_blocked:
21052106
'Dočasné e-mailové služby nejsou podporovány. Pro vytvoření účtu použijte prosím svou běžnou e-mailovou adresu.',
@@ -2173,9 +2174,11 @@ export const csCZ: LocalizationResource = {
21732174
protect_check_timed_out: undefined,
21742175
protect_check_unsupported_environment: undefined,
21752176
session_exists: 'Jste již přihlášen.',
2177+
signup_rate_limit_exceeded: undefined,
21762178
sso_bypass_domain_not_served: undefined,
21772179
ticket_expired_code: undefined,
21782180
ticket_invalid_code: undefined,
2181+
too_many_requests: undefined,
21792182
too_many_unverified_identifications: undefined,
21802183
web3_missing_identifier: 'Rozšíření peněženky Web3 nebylo nalezeno. Pro pokračování prosím nainstalujte jednu.',
21812184
web3_signature_request_rejected: 'Odmítli jste žádost o podpis. Chcete-li pokračovat, zkuste to prosím znovu.',

‎packages/localizations/src/da-DK.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,6 +2085,7 @@ export const daDK: LocalizationResource = {
20852085
'Tilmelding mislykkedes på grund af fejlede sikkerhedsvalideringer. Opdater siden for at prøve igen, eller kontakt support for yderligere assistance.',
20862086
captcha_unavailable:
20872087
'Tilmelding mislykkedes på grund af fejlet botvalidering. Opdater siden for at prøve igen, eller kontakt support for yderligere assistance.',
2088+
external_account_not_found: undefined,
20882089
form_code_incorrect: 'Koden er forkert.',
20892090
form_email_address_blocked:
20902091
'Midlertidige e-mailtjenester understøttes ikke. Brug venligst din almindelige e-mailadresse til at oprette en konto.',
@@ -2158,9 +2159,11 @@ export const daDK: LocalizationResource = {
21582159
protect_check_timed_out: undefined,
21592160
protect_check_unsupported_environment: undefined,
21602161
session_exists: 'Du er allerede logget ind.',
2162+
signup_rate_limit_exceeded: undefined,
21612163
sso_bypass_domain_not_served: undefined,
21622164
ticket_expired_code: undefined,
21632165
ticket_invalid_code: undefined,
2166+
too_many_requests: undefined,
21642167
too_many_unverified_identifications: undefined,
21652168
web3_missing_identifier: undefined,
21662169
web3_signature_request_rejected: 'Du har afvist signaturanmodningen. Prøv igen for at fortsætte.',

0 commit comments

Comments
 (0)