Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 470
feat(clerk-js,types): Introduce captcha appearance property for the CAPTCHA widget#5184
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
anagstef
merged 18 commits into
main
from
stefanos/fraud-377-expose-more-options-for-turnstile-appearanceFeb 26, 2025
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
ef61a8a
feat(clerk-js): Introduce layout configuration options for Turnstile …
414dfb4
Use dark captcha for the dark and shadesOfPurple themes
8ce08e0
Merge branch 'main' into stefanos/fraud-377-expose-more-options-for-t…
anagstef 21ef19a
fix default captcha language
40e936e
Merge branch 'main' into stefanos/fraud-377-expose-more-options-for-t…
anagstef 521afc3
use auto for language default
5ec09c5
Update packages/clerk-js/src/utils/captcha/turnstile.ts
anagstef 08167d6
Update packages/clerk-js/src/utils/captcha/turnstile.ts
anagstef 080cbd9
change default theme to 'auto'
55b6a53
Adjust min-height of Turnstile widget if captcha size is `compact`
6bc3227
Merge branch 'main' into stefanos/fraud-377-expose-more-options-for-t…
c81d99d
Merge branch 'main' into stefanos/fraud-377-expose-more-options-for-t…
anagstef 6008795
Merge branch 'main' into stefanos/fraud-377-expose-more-options-for-t…
anagstef 69b7ff0
Refactor the captcha properties to exist directly under the appearance
2db9a50
add tests for parsedCaptcha
1f80c34
Merge branch 'main' into stefanos/fraud-377-expose-more-options-for-t…
anagstef 8bf643b
increase bundlewatch maxSize
4a482c7
Update .changeset/fluffy-hairs-thank.md
anagstef File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| '@clerk/clerk-js': minor | ||
| '@clerk/types': minor | ||
| --- | ||
| Introduce the `appearance.captcha` property for the CAPTCHA widget |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 13 additions & 2 deletions
15 packages/clerk-js/src/ui/components/BlankCaptchaModal/index.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84 packages/clerk-js/src/ui/customizables/__tests__/parseAppearance.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { waitForElement } from '@clerk/shared/dom'; | ||
| import { loadScript } from '@clerk/shared/loadScript'; | ||
| import type { CaptchaWidgetType } from '@clerk/types'; | ||
| import type { CaptchaAppearanceOptions, CaptchaWidgetType } from '@clerk/types'; | ||
| import { CAPTCHA_ELEMENT_ID, CAPTCHA_INVISIBLE_CLASSNAME } from './constants'; | ||
| import type { CaptchaOptions } from './types'; | ||
| @@ -9,6 +9,12 @@ import type { CaptchaOptions } from './types'; | ||
| // CF docs: https://developers.cloudflare.com/turnstile/get-started/client-side-rendering/#disable-implicit-rendering | ||
| const CLOUDFLARE_TURNSTILE_ORIGINAL_URL = 'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit'; | ||
| type CaptchaAttributes = { | ||
| theme?: RenderOptions['theme']; | ||
| language?: RenderOptions['language']; | ||
| size: RenderOptions['size']; | ||
| }; | ||
| interface RenderOptions { | ||
| /** | ||
| * Every widget has a sitekey. This sitekey is associated with the corresponding widget configuration and is created upon the widget creation. | ||
| @@ -58,6 +64,24 @@ interface RenderOptions { | ||
| * @default 'always' | ||
| */ | ||
| appearance?: 'always' | 'execute' | 'interaction-only'; | ||
| /** | ||
| * The widget theme. Can take the following values: light, dark, auto. | ||
| * The default is auto, which respects the user preference. This can be forced to light or dark by setting the theme accordingly. | ||
| * @default 'auto' | ||
| */ | ||
| theme?: CaptchaAppearanceOptions['theme']; | ||
| /** | ||
| * The widget size. Can take the following values: normal, flexible, compact. | ||
| * @default 'normal' | ||
| */ | ||
| size?: CaptchaAppearanceOptions['size']; | ||
| /** | ||
| * Language to display, must be either: auto (default) to use the language that the visitor has chosen, | ||
| * or an ISO 639-1 two-letter language code (e.g. en) or language and country code (e.g. en-US). | ||
| * Refer to the list of supported languages for more information. | ||
| * https://developers.cloudflare.com/turnstile/reference/supported-languages | ||
| */ | ||
| language?: CaptchaAppearanceOptions['language']; | ||
| /** | ||
| * A custom value that can be used to differentiate widgets under the same sitekey | ||
| * in analytics and which is returned upon validation. This can only contain up to | ||
| @@ -109,6 +133,14 @@ async function loadCaptchaFromCloudflareURL() { | ||
| } | ||
| } | ||
| function getCaptchaAttibutesFromElemenet(element: HTMLElement): CaptchaAttributes { | ||
| const theme = (element.getAttribute('data-cl-theme') as RenderOptions['theme']) || undefined; | ||
| const language = (element.getAttribute('data-cl-language') as RenderOptions['language']) || undefined; | ||
| const size = (element.getAttribute('data-cl-size') as RenderOptions['size']) || undefined; | ||
| return { theme, language, size }; | ||
| } | ||
| /* | ||
| * How this function works: | ||
| * The widgetType is either 'invisible' or 'smart'. | ||
| @@ -125,6 +157,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => { | ||
| let captchaToken = ''; | ||
| let id = ''; | ||
| let turnstileSiteKey = siteKey; | ||
| let captchaTheme: RenderOptions['theme']; | ||
| let captchaSize: RenderOptions['size']; | ||
| let captchaLanguage: RenderOptions['language']; | ||
| let retries = 0; | ||
| let widgetContainerQuerySelector: string | undefined; | ||
| // The backend uses this to determine which Turnstile site-key was used in order to verify the token | ||
| @@ -138,7 +173,13 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => { | ||
| captchaWidgetType = widgetType; | ||
| widgetContainerQuerySelector = modalContainerQuerySelector; | ||
| await openModal?.(); | ||
| await waitForElement(modalContainerQuerySelector); | ||
| const modalContainderEl = await waitForElement(modalContainerQuerySelector); | ||
| if (modalContainderEl) { | ||
| const { theme, language, size } = getCaptchaAttibutesFromElemenet(modalContainderEl); | ||
| captchaTheme = theme; | ||
| captchaLanguage = language; | ||
| captchaSize = size; | ||
| } | ||
| } | ||
| // smart widget with container provided by user | ||
| @@ -148,6 +189,10 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => { | ||
| captchaWidgetType = 'smart'; | ||
| widgetContainerQuerySelector = `#${CAPTCHA_ELEMENT_ID}`; | ||
| visibleDiv.style.maxHeight = '0'; // This is to prevent the layout shift when the render method is called | ||
| const { theme, language, size } = getCaptchaAttibutesFromElemenet(visibleDiv); | ||
| captchaTheme = theme; | ||
| captchaLanguage = language; | ||
| captchaSize = size; | ||
| } else { | ||
| console.error( | ||
| 'Cannot initialize Smart CAPTCHA widget because the `clerk-captcha` DOM element was not found; falling back to Invisible CAPTCHA widget. If you are using a custom flow, visit https://clerk.com/docs/custom-flows/bot-sign-up-protection for instructions', | ||
| @@ -172,6 +217,9 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => { | ||
| const id = captcha.render(widgetContainerQuerySelector, { | ||
| sitekey: turnstileSiteKey, | ||
| appearance: 'interaction-only', | ||
| theme: captchaTheme || 'auto', | ||
anagstef marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| size: captchaSize || 'normal', | ||
| language: captchaLanguage || 'auto', | ||
| action: opts.action, | ||
| retry: 'never', | ||
| 'refresh-expired': 'auto', | ||
| @@ -192,7 +240,7 @@ export const getTurnstileToken = async (opts: CaptchaOptions) => { | ||
| // We set the min-height to the height of the Turnstile widget | ||
| // because the widget initially does a small layout shift | ||
| // and then expands to the correct height | ||
| visibleWidget.style.minHeight = '68px'; | ||
| visibleWidget.style.minHeight = captchaSize === 'compact' ? '140px' : '68px'; | ||
| visibleWidget.style.marginBottom = '1.5rem'; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.