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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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/beige-sloths-provide.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
"@clerk/clerk-js": minor
"@clerk/shared": minor
---

Introduce ProtectConfig resource and Protect loader integration.
76 changes: 76 additions & 0 deletions integration/tests/protect-service.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
import type { ProtectConfigJSON } from '@clerk/shared/types';
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

const mockProtectSettings = async (page: Page, config?: ProtectConfigJSON) => {
await page.route('*/**/v1/environment*', async route => {
const response = await route.fetch();
const json = await response.json();
const newJson = {
...json,
...(config ? { protect_config: config } : {}),
};
await route.fulfill({ response, json: newJson });
});
};

testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('Clerk Protect checks @generic', ({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('should add loader script when protect_config.loader is set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 1.0,
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-1', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-1')).toHaveAttribute('type', 'module');
});

test('should not add loader script when protect_config.loader is set and rollout 0.00', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page, {
object: 'protect_config',
id: 'n',
loaders: [
{
rollout: 0, // force 0% rollout, should not materialize
type: 'script',
target: 'body',
attributes: { id: 'test-protect-loader-2', type: 'module', src: 'data:application/json;base64,Cgo=' },
},
],
});
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

await expect(page.locator('#test-protect-loader-2')).toHaveCount(0);
});

test('should not create loader element when protect_config.loader is not set', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await mockProtectSettings(page);
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();

// Playwright locators are always objects, never undefined
await expect(page.locator('#test-protect-loader')).toHaveCount(0);
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.channel.browser.js", "maxSize": "81KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "123KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "63.2KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
{ "path": "./dist/vendors*.js", "maxSize": "47KB" },
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,6 +158,7 @@ import { createClientFromJwt } from './jwt-client';
import { APIKeys } from './modules/apiKeys';
import { Billing } from './modules/billing';
import { createCheckoutInstance } from './modules/checkout/instance';
import { Protect } from './protect';
import { BaseResource, Client, Environment, Organization, Waitlist } from './resources/internal';
import { getTaskEndpoint, navigateIfTaskExists, warnMissingPendingTaskHandlers } from './sessionTasks';
import { State } from './state';
Expand DownExpand Up@@ -227,6 +228,7 @@ export class Clerk implements ClerkInterface {
#domain: DomainOrProxyUrl['domain'];
#proxyUrl: DomainOrProxyUrl['proxyUrl'];
#authService?: AuthCookieService;
#protect?: Protect;
#captchaHeartbeat?: CaptchaHeartbeat;
#broadcastChannel: BroadcastChannel | null = null;
#componentControls?: ReturnType<MountComponentRenderer> | null;
Expand DownExpand Up@@ -429,6 +431,7 @@ export class Clerk implements ClerkInterface {

// This line is used for the piggy-backing mechanism
BaseResource.clerk = this;
this.#protect = new Protect();
}

public getFapiClient = (): FapiClient => this.#fapiClient;
Expand DownExpand Up@@ -516,6 +519,7 @@ export class Clerk implements ClerkInterface {
...(telemetryEnabled && this.telemetry ? { telemetryCollector: this.telemetry } : {}),
});
}
this.#protect?.load(this.environment as Environment);
debugLogger.info('load() complete', {}, 'clerk');
} catch (error) {
this.#publicEventBus.emit(clerkEvents.Status, 'error');
Expand Down
97 changes: 97 additions & 0 deletions packages/clerk-js/src/core/protect.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
import { inBrowser } from '@clerk/shared/browser';
import { logger } from '@clerk/shared/logger';
import type { ProtectLoader } from '@clerk/shared/types';

import type { Environment } from './resources';
export class Protect {
#initialized: boolean = false;

load(env: Environment): void {
const config = env?.protectConfig;

if (!config?.loaders || !Array.isArray(config.loaders) || config.loaders.length === 0) {
// not enabled or no protect config available
return;
} else if (this.#initialized) {
// already initialized - do nothing
return;
} else if (!inBrowser()) {
// no document: not running browser?
return;
}
Comment thread
zourzouvillys marked this conversation as resolved.

// here rather than at end to mark as initialized even if load fails.
this.#initialized = true;

for (const loader of config.loaders) {
try {
this.applyLoader(loader);
} catch (error) {
logger.warnOnce(`[protect] failed to apply loader: ${error}`);
}
}
}

// apply individual loader
applyLoader(loader: ProtectLoader) {
// we use rollout for percentage based rollouts (as the environment file is cached)
if (loader.rollout !== undefined) {
const rollout = loader.rollout;
if (typeof rollout !== 'number' || rollout < 0) {
// invalid rollout percentage - do nothing
logger.warnOnce(`[protect] loader rollout value is invalid: ${rollout}`);
return;
}
if (rollout === 0 || Math.random() > rollout) {
// not in rollout percentage - do nothing
return;
}
}

const type = loader.type || 'script';
const target = loader.target || 'body';

const element = document.createElement(type);

if (loader.attributes) {
for (const [key, value] of Object.entries(loader.attributes)) {
switch (typeof value) {
case 'string':
case 'number':
case 'boolean':
element.setAttribute(key, String(value));
break;
default:
// illegal to set.
logger.warnOnce(`[protect] loader attribute is invalid type: ${key}=${value}`);
break;
}
}
}

if (loader.textContent && typeof loader.textContent === 'string') {
element.textContent = loader.textContent;
}

switch (target) {
case 'head':
document.head.appendChild(element);
break;
case 'body':
document.body.appendChild(element);
break;
default:
if (target?.startsWith('#')) {
const targetElement = document.getElementById(target.substring(1));
if (!targetElement) {
logger.warnOnce(`[protect] loader target element not found: ${target}`);
return;
}
targetElement.appendChild(element);
return;
}
logger.warnOnce(`[protect] loader target is invalid: ${target}`);
break;
}
}
}
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/Environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,12 +6,13 @@ import type {
EnvironmentJSONSnapshot,
EnvironmentResource,
OrganizationSettingsResource,
ProtectConfigResource,
UserSettingsResource,
} from '@clerk/shared/types';

import { eventBus, events } from '../../core/events';
import { APIKeySettings } from './APIKeySettings';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, UserSettings } from './internal';
import { AuthConfig, BaseResource, CommerceSettings, DisplayConfig, ProtectConfig, UserSettings } from './internal';
import { OrganizationSettings } from './OrganizationSettings';

export class Environment extends BaseResource implements EnvironmentResource {
Expand All@@ -26,6 +27,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
organizationSettings: OrganizationSettingsResource = new OrganizationSettings();
commerceSettings: CommerceSettingsResource = new CommerceSettings();
apiKeysSettings: APIKeySettings = new APIKeySettings();
protectConfig: ProtectConfigResource = new ProtectConfig();

public static getInstance(): Environment {
if (!Environment.instance) {
Expand DownExpand Up@@ -54,6 +56,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
this.userSettings = new UserSettings(data.user_settings);
this.commerceSettings = new CommerceSettings(data.commerce_settings);
this.apiKeysSettings = new APIKeySettings(data.api_keys_settings);
this.protectConfig = new ProtectConfig(data.protect_config);

return this;
}
Expand DownExpand Up@@ -95,6 +98,7 @@ export class Environment extends BaseResource implements EnvironmentResource {
user_settings: this.userSettings.__internal_toSnapshot(),
commerce_settings: this.commerceSettings.__internal_toSnapshot(),
api_keys_settings: this.apiKeysSettings.__internal_toSnapshot(),
protect_config: this.protectConfig.__internal_toSnapshot(),
};
}
}
39 changes: 39 additions & 0 deletions packages/clerk-js/src/core/resources/ProtectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type {
ProtectConfigJSON,
ProtectConfigJSONSnapshot,
ProtectConfigResource,
ProtectLoader,
} from '@clerk/shared/types';

import { BaseResource } from './internal';

export class ProtectConfig extends BaseResource implements ProtectConfigResource {
id: string = '';
loaders?: ProtectLoader[];
rollout?: number;

public constructor(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: ProtectConfigJSON | ProtectConfigJSONSnapshot | null): this {
if (!data) {
return this;
}

this.id = this.withDefault(data.id, this.id);
this.loaders = this.withDefault(data.loaders, this.loaders);

return this;
}

public __internal_toSnapshot(): ProtectConfigJSONSnapshot {
return {
object: 'protect_config',
id: this.id,
loaders: this.loaders,
};
}
}
1 change: 1 addition & 0 deletions packages/clerk-js/src/core/resources/internal.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './OrganizationSuggestion';
export * from './SamlAccount';
export * from './Session';
export * from './Passkey';
export * from './ProtectConfig';
export * from './PublicUserData';
export * from './SessionWithActivities';
export * from './SignIn';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/environment.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import type { AuthConfigResource } from './authConfig';
import type { CommerceSettingsResource } from './commerceSettings';
import type { DisplayConfigResource } from './displayConfig';
import type { OrganizationSettingsResource } from './organizationSettings';
import type { ProtectConfigResource } from './protectConfig';
import type { ClerkResource } from './resource';
import type { EnvironmentJSONSnapshot } from './snapshots';
import type { UserSettingsResource } from './userSettings';
Expand All@@ -14,6 +15,7 @@ export interface EnvironmentResource extends ClerkResource {
displayConfig: DisplayConfigResource;
commerceSettings: CommerceSettingsResource;
apiKeysSettings: APIKeysSettingsResource;
protectConfig: ProtectConfigResource;
isSingleSession: () => boolean;
isProduction: () => boolean;
isDevelopmentOrStaging: () => boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ export type * from './permission';
export type * from './phoneCodeChannel';
export type * from './phoneNumber';
export type * from './protect';
export type * from './protectConfig';
export type * from './redirects';
export type * from './resource';
export type * from './role';
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ import type { OrganizationCustomRoleKey, OrganizationPermissionKey } from './org
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { OrganizationSuggestionStatus } from './organizationSuggestion';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { ProtectConfigJSON } from './protectConfig';
import type { SamlIdpSlug } from './saml';
import type { SessionStatus, SessionTask } from './session';
import type { SessionVerificationLevel, SessionVerificationStatus } from './sessionVerification';
Expand DownExpand Up@@ -90,6 +91,7 @@ export interface EnvironmentJSON extends ClerkResourceJSON {
maintenance_mode: boolean;
organization_settings: OrganizationSettingsJSON;
user_settings: UserSettingsJSON;
protect_config: ProtectConfigJSON;
}

export type LastAuthenticationStrategy =
Expand Down
22 changes: 22 additions & 0 deletions packages/shared/src/types/protectConfig.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
import type { ClerkResource } from './resource';
import type { ProtectConfigJSONSnapshot } from './snapshots';

export interface ProtectLoader {
rollout?: number;
target: 'head' | 'body' | `#${string}`;
type: string;
attributes?: Record<string, string | number | boolean>;
textContent?: string;
}

export interface ProtectConfigJSON {
object: 'protect_config';
id: string;
loaders?: ProtectLoader[];
}

export interface ProtectConfigResource extends ClerkResource {
id: string;
loaders?: ProtectLoader[];
__internal_toSnapshot: () => ProtectConfigJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/shared/src/types/snapshots.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ import type {
Web3WalletJSON,
} from './json';
import type { OrganizationSettingsJSON } from './organizationSettings';
import type { ProtectConfigJSON } from './protectConfig';
import type { SignInJSON } from './signIn';
import type { UserSettingsJSON } from './userSettings';
import type { Nullable, Override } from './utils';
Expand DownExpand Up@@ -119,6 +120,8 @@ export type EnvironmentJSONSnapshot = EnvironmentJSON;

export type DisplayConfigJSONSnapshot = DisplayConfigJSON;

export type ProtectConfigJSONSnapshot = ProtectConfigJSON;

export type EmailAddressJSONSnapshot = Override<
EmailAddressJSON,
{
Expand Down
Loading