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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
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/fruity-rivers-say.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

[Experimental] Add support for sign-up via modal in signals implementation
4 changes: 3 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -910,7 +910,8 @@ class SignInFuture implements SignInFutureResource {
}

async sso(params: SignInFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId } = params;
const { strategy, redirectUrl, redirectCallbackUrl, popup, oidcPrompt, enterpriseConnectionId, identifier } =
params;
return runAsyncResourceTask(this.resource, async () => {
let actionCompleteRedirectUrl = redirectUrl;
try {
Expand All@@ -932,6 +933,7 @@ class SignInFuture implements SignInFutureResource {
await this._create({
strategy,
...routes,
identifier,
});

if (strategy === 'enterprise_sso') {
Expand Down
78 changes: 62 additions & 16 deletions packages/clerk-js/src/core/resources/SignUp.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,7 +55,11 @@ import {
getOKXWalletIdentifier,
windowNavigate,
} from '../../utils';
import { _authenticateWithPopup } from '../../utils/authenticateWithPopup';
import {
_authenticateWithPopup,
_futureAuthenticateWithPopup,
wrapWithPopupRoutes,
} from '../../utils/authenticateWithPopup';
import { CaptchaChallenge } from '../../utils/captcha/CaptchaChallenge';
import { createValidatePassword } from '../../utils/passwords/password';
import { normalizeUnsafeMetadata } from '../../utils/resourceParams';
Expand DownExpand Up@@ -789,7 +793,17 @@ class SignUpFuture implements SignUpFutureResource {
}

async sso(params: SignUpFutureSSOParams): Promise<{ error: ClerkError | null }> {
const { strategy, redirectUrl, redirectCallbackUrl } = params;
const {
strategy,
redirectUrl,
redirectCallbackUrl,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
popup,
} = params;
return runAsyncResourceTask(this.resource, async () => {
const { captchaToken, captchaWidgetType, captchaError } = await this.getCaptchaToken();

Expand All@@ -800,24 +814,56 @@ class SignUpFuture implements SignUpFutureResource {
redirectUrlComplete = window.location.origin + redirectUrl;
}

await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
redirectUrlComplete,
captchaToken,
captchaWidgetType,
captchaError,
},
const routes = {
redirectUrl: SignUp.clerk.buildUrlWithAuth(redirectCallbackUrl),
actionCompleteRedirectUrl: redirectUrlComplete,
};
if (popup) {
const wrappedRoutes = wrapWithPopupRoutes(SignUp.clerk, {
redirectCallbackUrl: routes.redirectUrl,
redirectUrl: redirectUrlComplete,
});
routes.redirectUrl = wrappedRoutes.redirectCallbackUrl;
routes.actionCompleteRedirectUrl = wrappedRoutes.redirectUrl;
}

const authenticateFn = () => {
return this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: {
strategy,
...routes,
unsafeMetadata,
legalAccepted,
oidcPrompt,
enterpriseConnectionId,
emailAddress,
captchaToken,
captchaWidgetType,
captchaError,
},
});
};

await authenticateFn().catch(async e => {
if (isClerkAPIResponseError(e) && isCaptchaError(e)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
await SignUp.clerk.__unstable__environment!.reload();
return authenticateFn();
}
throw e;
});

const { status, externalVerificationRedirectURL } = this.resource.verifications.externalAccount;

if (status === 'unverified' && !!externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
} else {
clerkInvalidFAPIResponse(status, SignUp.fapiClient.buildEmailAddress('support'));
if (status === 'unverified' && externalVerificationRedirectURL) {
if (popup) {
await _futureAuthenticateWithPopup(SignUp.clerk, { popup, externalVerificationRedirectURL });
// Pick up the modified SignUp resource
await this.resource.reload();
} else {
windowNavigate(externalVerificationRedirectURL);
}
}
});
}
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/types/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ export interface SignInFutureSSOParams {
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: { location: { href: string } };
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
Expand All@@ -203,6 +203,10 @@ export interface SignInFutureSSOParams {
* @experimental
*/
enterpriseConnectionId?: string;
/**
* The unique identifier of the user. Only supported with the `enterprise_sso` strategy.
*/
identifier?: string;
}

export interface SignInFutureMFAPhoneCodeVerifyParams {
Expand Down
30 changes: 29 additions & 1 deletion packages/shared/src/types/signUpFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -188,7 +188,7 @@ export interface SignUpFuturePhoneCodeVerifyParams {
code: string;
}

export interface SignUpFutureSSOParams {
export interface SignUpFutureSSOParams extends SignUpFutureAdditionalParams {
/**
* The strategy to use for authentication.
*/
Expand All@@ -202,6 +202,34 @@ export interface SignUpFutureSSOParams {
* TODO @revamp-hooks: This should be handled by FAPI instead.
*/
redirectCallbackUrl: string;
/**
* If provided, a `Window` to use for the OAuth flow. Useful in instances where you cannot navigate to an
* OAuth provider.
*
* @example
* ```ts
* const popup = window.open('about:blank', '', 'width=600,height=800');
* if (!popup) {
* throw new Error('Failed to open popup');
* }
* await signIn.sso({ popup, strategy: 'oauth_google', redirectUrl: '/dashboard' });
* ```
*/
popup?: Window;
/**
* Optional for `oauth_<provider>` or `enterprise_sso` strategies. The value to pass to the
* [OIDC prompt parameter](https://openid.net/specs/openid-connect-core-1_0.html#:~:text=prompt,reauthentication%20and%20consent.)
* in the generated OAuth redirect URL.
*/
oidcPrompt?: string;
/**
* @experimental
*/
enterpriseConnectionId?: string;
/**
* Email address to use for targeting an enterprise connection at sign-up.
*/
emailAddress?: string;
}

export interface SignUpFutureTicketParams extends SignUpFutureAdditionalParams {
Expand Down
Loading