Skip to content
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

feat(clerk-js): Fallback to invisible CAPTCHA if the element is not found #3191

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/itchy-onions-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Fallback to invisible CAPTCHA if the element to render to is not found in the DOM
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/DisplayConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export class DisplayConfig extends BaseResource implements DisplayConfigResource
branded!: boolean;
captchaPublicKey: string | null = null;
captchaWidgetType: CaptchaWidgetType = null;
captchaPublicKeyInvisible: string | null = null;
homeUrl!: string;
instanceEnvironmentType!: string;
faviconImageUrl!: string;
Expand Down Expand Up @@ -68,6 +69,7 @@ export class DisplayConfig extends BaseResource implements DisplayConfigResource
this.branded = data.branded;
this.captchaPublicKey = data.captcha_public_key;
this.captchaWidgetType = data.captcha_widget_type;
this.captchaPublicKeyInvisible = data.captcha_public_key_invisible;
this.supportEmail = data.support_email || '';
this.clerkJSVersion = data.clerk_js_version;
this.organizationProfileUrl = data.organization_profile_url;
Expand Down
10 changes: 7 additions & 3 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,19 @@ export class SignUp extends BaseResource implements SignUpResource {

create = async (params: SignUpCreateParams): Promise<SignUpResource> => {
const paramsWithCaptcha: Record<string, unknown> = params;
const { captchaSiteKey, canUseCaptcha, captchaURL, captchaWidgetType } = retrieveCaptchaInfo(SignUp.clerk);
const { captchaSiteKey, canUseCaptcha, captchaURL, captchaWidgetType, captchaPublicKeyInvisible } =
retrieveCaptchaInfo(SignUp.clerk);

if (canUseCaptcha && captchaSiteKey && captchaURL) {
if (canUseCaptcha && captchaSiteKey && captchaURL && captchaPublicKeyInvisible) {
try {
paramsWithCaptcha.captchaToken = await getCaptchaToken({
const { captchaToken, captchaWidgetTypeUsed } = await getCaptchaToken({
siteKey: captchaSiteKey,
widgetType: captchaWidgetType,
invisibleSiteKey: captchaPublicKeyInvisible,
scriptUrl: captchaURL,
});
paramsWithCaptcha.captchaToken = captchaToken;
paramsWithCaptcha.captchaWidgetType = captchaWidgetTypeUsed;
} catch (e) {
if (e.captchaError) {
paramsWithCaptcha.captchaError = e.captchaError;
Expand Down
42 changes: 32 additions & 10 deletions packages/clerk-js/src/utils/captcha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ interface RenderOptions {
* @param errorCode string
*/
'error-callback'?: (errorCode: string) => void;
/**
* A JavaScript callback invoked when a given client/browser is not supported by the widget.
*/
'unsupported-callback'?: () => boolean;
/**
* Appearance controls when the widget is visible.
* It can be always (default), execute, or interaction-only.
Expand Down Expand Up @@ -80,32 +84,46 @@ export async function loadCaptcha(url: string) {
return window.turnstile;
}

/*
* How this function works:
* The widgetType is either 'invisible' or 'smart'.
* - If the widgetType is 'invisible', the captcha widget is rendered in a hidden div at the bottom of the body.
* - If the widgetType is 'smart', the captcha widget is rendered in a div with the id 'clerk-captcha'. If the div does
* not exist, the invisibleSiteKey is used as a fallback and the widget is rendered in a hidden div at the bottom of the body.
*/
export const getCaptchaToken = async (captchaOptions: {
siteKey: string;
scriptUrl: string;
widgetType: CaptchaWidgetType;
invisibleSiteKey: string;
}) => {
const { siteKey: sitekey, scriptUrl, widgetType } = captchaOptions;
const { siteKey, scriptUrl, widgetType, invisibleSiteKey } = captchaOptions;
let captchaToken = '',
id = '';
const invisibleWidget = !widgetType || widgetType === 'invisible';
let invisibleWidget = !widgetType || widgetType === 'invisible';
let turnstileSiteKey = siteKey;

let widgetDiv: HTMLElement | null = null;

if (invisibleWidget) {
const createInvisibleDOMElement = () => {
const div = document.createElement('div');
div.classList.add(CAPTCHA_INVISIBLE_CLASSNAME);
document.body.appendChild(div);
widgetDiv = div;
return div;
};

if (invisibleWidget) {
widgetDiv = createInvisibleDOMElement();
} else {
const visibleDiv = document.getElementById(CAPTCHA_ELEMENT_ID);
if (visibleDiv) {
visibleDiv.style.display = 'block';
widgetDiv = visibleDiv;
} else {
throw {
captchaError: 'Element to render the captcha not found',
};
console.error('Captcha DOM element not found. Using invisible captcha widget.');
widgetDiv = createInvisibleDOMElement();
invisibleWidget = true;
turnstileSiteKey = invisibleSiteKey;
}
}

Expand All @@ -117,8 +135,8 @@ export const getCaptchaToken = async (captchaOptions: {
return new Promise((resolve, reject) => {
try {
const id = captcha.render(invisibleWidget ? `.${CAPTCHA_INVISIBLE_CLASSNAME}` : `#${CAPTCHA_ELEMENT_ID}`, {
sitekey,
appearance: widgetType === 'always_visible' ? 'always' : 'interaction-only',
sitekey: turnstileSiteKey,
appearance: 'interaction-only',
retry: 'never',
'refresh-expired': 'auto',
callback: function (token: string) {
Expand All @@ -139,6 +157,10 @@ export const getCaptchaToken = async (captchaOptions: {
}
reject([errorCodes.join(','), id]);
},
'unsupported-callback': function () {
reject(['This browser is not supported by the CAPTCHA.', id]);
return true;
},
});
} catch (e) {
/**
Expand Down Expand Up @@ -171,5 +193,5 @@ export const getCaptchaToken = async (captchaOptions: {
}
}

return captchaToken;
return { captchaToken, captchaWidgetTypeUsed: invisibleWidget ? 'invisible' : 'smart' };
};
1 change: 1 addition & 0 deletions packages/clerk-js/src/utils/retrieveCaptchaInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const retrieveCaptchaInfo = (clerk: Clerk) => {
return {
captchaSiteKey: _environment ? _environment.displayConfig.captchaPublicKey : null,
captchaWidgetType: _environment ? _environment.displayConfig.captchaWidgetType : null,
captchaPublicKeyInvisible: _environment ? _environment.displayConfig.captchaPublicKeyInvisible : null,
canUseCaptcha: _environment
? _environment.userSettings.signUp.captcha_enabled &&
clerk.isStandardBrowser &&
Expand Down
4 changes: 3 additions & 1 deletion packages/types/src/displayConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { DisplayThemeJSON } from './json';
import type { ClerkResource } from './resource';

export type PreferredSignInStrategy = 'password' | 'otp';
export type CaptchaWidgetType = 'smart' | 'always_visible' | 'invisible' | null;
dimkl marked this conversation as resolved.
Show resolved Hide resolved
export type CaptchaWidgetType = 'smart' | 'invisible' | null;

export interface DisplayConfigJSON {
object: 'display_config';
Expand All @@ -16,6 +16,7 @@ export interface DisplayConfigJSON {
branded: boolean;
captcha_public_key: string | null;
captcha_widget_type: CaptchaWidgetType;
captcha_public_key_invisible: string | null;
home_url: string;
instance_environment_type: string;
logo_image_url: string;
Expand Down Expand Up @@ -46,6 +47,7 @@ export interface DisplayConfigResource extends ClerkResource {
branded: boolean;
captchaPublicKey: string | null;
captchaWidgetType: CaptchaWidgetType;
captchaPublicKeyInvisible: string | null;
homeUrl: string;
instanceEnvironmentType: string;
logoImageUrl: string;
Expand Down
Loading