Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
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
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf1164d
feat(clerk-js): allow initialization with defaults
jacekradko Mar 13, 2025
1c454b7
add captchaOauthBypess default
jacekradko Mar 13, 2025
8f20fda
wip
jacekradko Mar 13, 2025
32ca7c5
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 14, 2025
b591c92
Update packages/clerk-js/src/core/clerk.ts
jacekradko Mar 14, 2025
f28ab02
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 16, 2025
3c7ea37
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
8979e81
wip: withDefault helper
jacekradko Mar 17, 2025
ed5e1dd
typedoc
jacekradko Mar 17, 2025
a45783c
authconfig
jacekradko Mar 17, 2025
b9da1b9
displayconfig
jacekradko Mar 17, 2025
2be6547
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
e9d3a80
Update userSettings
jacekradko Mar 17, 2025
5471c2e
wip
jacekradko Mar 17, 2025
fc0b9f6
snappies
jacekradko Mar 17, 2025
b20008d
authconfig test
jacekradko Mar 17, 2025
077a26f
wip
jacekradko Mar 17, 2025
3195ab0
wip
jacekradko Mar 17, 2025
e793ae0
wip
jacekradko Mar 17, 2025
2be4276
wip
jacekradko Mar 17, 2025
f5bfe87
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 17, 2025
b9435f6
wip
jacekradko Mar 17, 2025
e08bff0
wip
jacekradko Mar 17, 2025
95c2542
Merge branch 'main' into feat/initialize-clerk-js-with-defaults
jacekradko Mar 18, 2025
fb8654b
PR feedback from @LekoArts
jacekradko Mar 18, 2025
1d9edbf
feedback
jacekradko Mar 18, 2025
e098603
wip
jacekradko Mar 18, 2025
0115dcf
Apply suggestions from code review
jacekradko Mar 18, 2025
ecf070a
wip
jacekradko Mar 18, 2025
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
5 changes: 5 additions & 0 deletions .changeset/dirty-lizards-count.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': minor
---

Improve the resilience of the SDK against situations where the /v1/environment endpoint is not reachable. This is achieved by allowing the initialization of the environment with default values.
2 changes: 1 addition & 1 deletion integration/tests/reverification.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withReverification] })(
fictionalEmail: true,
withPhoneNumber: true,
});
const bapiFakeUser = await u.services.users.createBapiUser({
await u.services.users.createBapiUser({
...delFakeUser,
username: undefined,
phoneNumber: undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "577kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.js", "maxSize": "577.5kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78.5kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "51KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
Expand All@@ -12,7 +12,7 @@
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "12.4KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.5KB" },
{ "path": "./dist/signup*.js", "maxSize": "6.55KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "15KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
Expand Down
20 changes: 12 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -326,9 +326,6 @@ export class Clerk implements ClerkInterface {
public constructor(key: string, options?: DomainOrProxyUrl) {
key = (key || '').trim();

this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;

if (!key) {
return errorThrower.throwMissingPublishableKeyError();
}
Expand All@@ -339,8 +336,11 @@ export class Clerk implements ClerkInterface {
return errorThrower.throwInvalidPublishableKeyError({ key });
}

this.#publishableKey = key;
this.#domain = options?.domain;
this.#proxyUrl = options?.proxyUrl;
this.environment = Environment.getInstance();
this.#instanceType = publishableKey.instanceType;
this.#publishableKey = key;

this.#fapiClient = createFapiClient({
domain: this.domain,
Expand DownExpand Up@@ -2085,16 +2085,20 @@ export class Clerk implements ClerkInterface {
}
};

await Promise.all([initEnvironmentPromise, initClient()]).catch(async e => {
// limit the changes for this specific error for now
const [envResult, clientResult] = await Promise.allSettled([initEnvironmentPromise, initClient()]);
Comment thread
jacekradko marked this conversation as resolved.
if (clientResult.status === 'rejected') {
const e = clientResult.reason;

if (isClerkAPIResponseError(e) && e.errors[0].code === 'requires_captcha') {
await initEnvironmentPromise;
if (envResult.status === 'rejected') {
await initEnvironmentPromise;
}
initComponents();
await initClient();
} else {
throw e;
}
});
}

this.#authService?.setClientUatCookieForDevelopmentInstances();

Expand Down
24 changes: 14 additions & 10 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,29 +4,33 @@ import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './internal';

export class AuthConfig extends BaseResource implements AuthConfigResource {
singleSessionMode!: boolean;
claimedAt: Date | null = null;
reverification!: boolean;
reverification: boolean = false;
singleSessionMode: boolean = false;

public constructor(data: AuthConfigJSON) {
public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();

this.fromJSON(data);
}

protected fromJSON(data: AuthConfigJSON | null): this {
this.singleSessionMode = data ? data.single_session_mode : true;
this.claimedAt = data?.claimed_at ? unixEpochToDate(data.claimed_at) : null;
this.reverification = data ? data.reverification : true;
protected fromJSON(data: Partial<AuthConfigJSON> | null): this {
if (!data) {
return this;
}
this.claimedAt = this.withDefault(data.claimed_at ? unixEpochToDate(data.claimed_at) : null, this.claimedAt);
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
return this;
}

public __internal_toSnapshot(): AuthConfigJSONSnapshot {
return {
object: 'auth_config',
id: this.id || '',
single_session_mode: this.singleSessionMode,
claimed_at: this.claimedAt ? this.claimedAt.getTime() : null,
id: this.id ?? '',
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
};
}
}
12 changes: 12 additions & 0 deletions packages/clerk-js/src/core/resources/Base.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,6 +166,18 @@ export abstract class BaseResource {

protected abstract fromJSON(data: ClerkResourceJSON | null): this;

/**
* Returns the provided value if it is not `undefined` or `null`, otherwise returns the default value.
*
* @template T - The type of the value.
* @param value - The value to check.
* @param defaultValue - The default value to return if the provided value is `undefined` or `null`.
* @returns The provided value if it is not `undefined` or `null`, otherwise the default value.
*/
protected withDefault<T>(value: T | undefined | null, defaultValue: T): T {
return value ?? defaultValue;
}

Comment thread
jacekradko marked this conversation as resolved.
protected async _baseGet<J extends ClerkResourceJSON | null>(opts: BaseFetchOptions = {}): Promise<this> {
const json = await BaseResource._fetch<J>(
{
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/core/resources/CommerceSettings.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,11 @@ import { BaseResource } from './internal';
* @internal
*/
export class __experimental_CommerceSettings extends BaseResource implements __experimental_CommerceSettingsResource {
stripePublishableKey!: string;
stripePublishableKey: string = '';

public constructor(data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot) {
public constructor(
data: __experimental_CommerceSettingsJSON | __experimental_CommerceSettingsJSONSnapshot | null = null,
) {
super();
this.fromJSON(data);
}
Expand Down
Loading