Skip to content

fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zourzouvillys wants to merge 1 commit into
base:main
Choose a base branch
from
+59 −10
Draft

fix(shared): run a sign-up challenge before the enterprise hand-off #9622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/signup-challenge-before-sso.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.
41 changes: 40 additions & 1 deletion packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
});

it('prioritizes enterprise_sso over protect_check', async () => {
it('prioritizes protect_check over enterprise_sso', async () => {
const mockSignUp = {
status: 'missing_requirements',
missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
redirectUrlComplete: 'https://example.com/done',
});

expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
});

it('hands off to the connection once no challenge is left', async () => {
const mockSignUp = {
status: 'missing_requirements',
missingFields: ['enterprise_sso'] as SignUpField[],
authenticateWithRedirect: mockAuthenticateWithRedirect,
} as unknown as SignUpResource;

await completeSignUpFlow({
signUp: mockSignUp,
protectCheckPath: 'protect-check',
handleComplete: mockHandleComplete,
navigate: mockNavigate,
redirectUrl: 'https://example.com/acs',
redirectUrlComplete: 'https://example.com/done',
});

expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
expect(mockNavigate).not.toHaveBeenCalled();
});

it('still hands off to the connection when the caller has no challenge route', async () => {
const mockSignUp = {
status: 'missing_requirements',
missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
authenticateWithRedirect: mockAuthenticateWithRedirect,
} as unknown as SignUpResource;

await completeSignUpFlow({
signUp: mockSignUp,
handleComplete: mockHandleComplete,
navigate: mockNavigate,
redirectUrl: 'https://example.com/acs',
redirectUrlComplete: 'https://example.com/done',
});

expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
expect(mockNavigate).not.toHaveBeenCalled();
});
Expand Down
23 changes: 14 additions & 9 deletions packages/shared/src/internal/clerk-js/completeSignUpFlow.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
removeClerkQueryParam('__clerk_invitation_token');
return handleComplete && handleComplete();
} else if (signUp.status === 'missing_requirements') {
const params = forwardClerkQueryParams();

// The protect_check field is the authoritative gating signal. Sign-up also surfaces it
// via a missing_fields entry; treat either as equivalent.
//
// This runs before the enterprise SSO hand-off below, which is the order
// `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
// the sign-up to the identity provider first defers the challenge until the round trip is
// over. Resolving it here returns to this function with only the hand-off left to do.
const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
if (isProtectGated && protectCheckPath) {
return navigate(protectCheckPath, { searchParams: params });
}

if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
if (!redirectUrl || !redirectUrlComplete) {
throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
});
}

const params = forwardClerkQueryParams();

// The protect_check field is the authoritative gating signal. Sign-up also surfaces it
// via a missing_fields entry; treat either as equivalent.
const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
if (isProtectGated && protectCheckPath) {
return navigate(protectCheckPath, { searchParams: params });
}

if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
return navigate(verifyEmailPath, { searchParams: params });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(shared): run a sign-up challenge before the enterprise hand-off by zourzouvillys · Pull Request #9622 · clerk/javascript · GitHub
Skip to content
fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

zourzouvillys
wants to merge
1
commit into

base:main
Choose a base branch

from


+59

−10

 Draft


fix(shared): run a sign-up challenge before the enterprise hand-off
#9622
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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/signup-challenge-before-sso.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.

41 changes: 40 additions & 1 deletion
packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
 expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
 });

 it('prioritizes enterprise_sso over protect_check', async () => {
 it('prioritizes protect_check over enterprise_sso', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
 expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
 });

 it('hands off to the connection once no challenge is left', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 protectCheckPath: 'protect-check',
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });

 it('still hands off to the connection when the caller has no challenge route', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });
Expand Down

23 changes: 14 additions & 9 deletions
packages/shared/src/internal/clerk-js/completeSignUpFlow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
 removeClerkQueryParam('__clerk_invitation_token');
 return handleComplete && handleComplete();
 } else if (signUp.status === 'missing_requirements') {
 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 //
 // This runs before the enterprise SSO hand-off below, which is the order
 // `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
 // the sign-up to the identity provider first defers the challenge until the round trip is
 // over. Resolving it here returns to this function with only the hand-off left to do.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
 if (!redirectUrl || !redirectUrlComplete) {
 throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
 });
 }

 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
 return navigate(verifyEmailPath, { searchParams: params });
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(shared): run a sign-up challenge before the enterprise hand-off by zourzouvillys · Pull Request #9622 · clerk/javascript · GitHub
Skip to content
fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

zourzouvillys
wants to merge
1
commit into

base:main
Choose a base branch

from


+59

−10

 Draft


fix(shared): run a sign-up challenge before the enterprise hand-off
#9622
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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/signup-challenge-before-sso.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.

41 changes: 40 additions & 1 deletion
packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
 expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
 });

 it('prioritizes enterprise_sso over protect_check', async () => {
 it('prioritizes protect_check over enterprise_sso', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
 expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
 });

 it('hands off to the connection once no challenge is left', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 protectCheckPath: 'protect-check',
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });

 it('still hands off to the connection when the caller has no challenge route', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });
Expand Down

23 changes: 14 additions & 9 deletions
packages/shared/src/internal/clerk-js/completeSignUpFlow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
 removeClerkQueryParam('__clerk_invitation_token');
 return handleComplete && handleComplete();
 } else if (signUp.status === 'missing_requirements') {
 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 //
 // This runs before the enterprise SSO hand-off below, which is the order
 // `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
 // the sign-up to the identity provider first defers the challenge until the round trip is
 // over. Resolving it here returns to this function with only the hand-off left to do.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
 if (!redirectUrl || !redirectUrlComplete) {
 throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
 });
 }

 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
 return navigate(verifyEmailPath, { searchParams: params });
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(shared): run a sign-up challenge before the enterprise hand-off by zourzouvillys · Pull Request #9622 · clerk/javascript · GitHub
Skip to content
fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

zourzouvillys
wants to merge
1
commit into

base:main
Choose a base branch

from


+59

−10

 Draft


fix(shared): run a sign-up challenge before the enterprise hand-off
#9622
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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/signup-challenge-before-sso.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.

41 changes: 40 additions & 1 deletion
packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
 expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
 });

 it('prioritizes enterprise_sso over protect_check', async () => {
 it('prioritizes protect_check over enterprise_sso', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
 expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
 });

 it('hands off to the connection once no challenge is left', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 protectCheckPath: 'protect-check',
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });

 it('still hands off to the connection when the caller has no challenge route', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });
Expand Down

23 changes: 14 additions & 9 deletions
packages/shared/src/internal/clerk-js/completeSignUpFlow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
 removeClerkQueryParam('__clerk_invitation_token');
 return handleComplete && handleComplete();
 } else if (signUp.status === 'missing_requirements') {
 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 //
 // This runs before the enterprise SSO hand-off below, which is the order
 // `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
 // the sign-up to the identity provider first defers the challenge until the round trip is
 // over. Resolving it here returns to this function with only the hand-off left to do.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
 if (!redirectUrl || !redirectUrlComplete) {
 throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
 });
 }

 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
 return navigate(verifyEmailPath, { searchParams: params });
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(shared): run a sign-up challenge before the enterprise hand-off by zourzouvillys · Pull Request #9622 · clerk/javascript · GitHub
Skip to content
fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

zourzouvillys
wants to merge
1
commit into

base:main
Choose a base branch

from


+59

−10

 Draft


fix(shared): run a sign-up challenge before the enterprise hand-off
#9622
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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/signup-challenge-before-sso.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.

41 changes: 40 additions & 1 deletion
packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
 expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
 });

 it('prioritizes enterprise_sso over protect_check', async () => {
 it('prioritizes protect_check over enterprise_sso', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
 expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
 });

 it('hands off to the connection once no challenge is left', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 protectCheckPath: 'protect-check',
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });

 it('still hands off to the connection when the caller has no challenge route', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });
Expand Down

23 changes: 14 additions & 9 deletions
packages/shared/src/internal/clerk-js/completeSignUpFlow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
 removeClerkQueryParam('__clerk_invitation_token');
 return handleComplete && handleComplete();
 } else if (signUp.status === 'missing_requirements') {
 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 //
 // This runs before the enterprise SSO hand-off below, which is the order
 // `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
 // the sign-up to the identity provider first defers the challenge until the round trip is
 // over. Resolving it here returns to this function with only the hand-off left to do.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
 if (!redirectUrl || !redirectUrlComplete) {
 throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
 });
 }

 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
 return navigate(verifyEmailPath, { searchParams: params });
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(shared): run a sign-up challenge before the enterprise hand-off by zourzouvillys · Pull Request #9622 · clerk/javascript · GitHub
Skip to content
fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

zourzouvillys
wants to merge
1
commit into

base:main
Choose a base branch

from


+59

−10

 Draft


fix(shared): run a sign-up challenge before the enterprise hand-off
#9622
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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/signup-challenge-before-sso.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.

41 changes: 40 additions & 1 deletion
packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
 expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
 });

 it('prioritizes enterprise_sso over protect_check', async () => {
 it('prioritizes protect_check over enterprise_sso', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
 expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
 });

 it('hands off to the connection once no challenge is left', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 protectCheckPath: 'protect-check',
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });

 it('still hands off to the connection when the caller has no challenge route', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });
Expand Down

23 changes: 14 additions & 9 deletions
packages/shared/src/internal/clerk-js/completeSignUpFlow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
 removeClerkQueryParam('__clerk_invitation_token');
 return handleComplete && handleComplete();
 } else if (signUp.status === 'missing_requirements') {
 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 //
 // This runs before the enterprise SSO hand-off below, which is the order
 // `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
 // the sign-up to the identity provider first defers the challenge until the round trip is
 // over. Resolving it here returns to this function with only the hand-off left to do.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
 if (!redirectUrl || !redirectUrlComplete) {
 throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
 });
 }

 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
 return navigate(verifyEmailPath, { searchParams: params });
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
fix(shared): run a sign-up challenge before the enterprise hand-off by zourzouvillys · Pull Request #9622 · clerk/javascript · GitHub
Skip to content
fix(shared): run a sign-up challenge before the enterprise hand-off#9622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

zourzouvillys
wants to merge
1
commit into

base:main
Choose a base branch

from


+59

−10

 Draft


fix(shared): run a sign-up challenge before the enterprise hand-off
#9622
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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/signup-challenge-before-sso.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/shared': patch
---

Run a sign-up's verification challenge before handing off to an enterprise connection, matching the order used elsewhere in the flow.

41 changes: 40 additions & 1 deletion
packages/shared/src/internal/clerk-js/__tests__/completeSignUpFlow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -175,7 +175,7 @@ describe('completeSignUpFlow', () => {
 expect(mockNavigate).toHaveBeenCalledWith('verify-email', { searchParams: new URLSearchParams() });
 });

 it('prioritizes enterprise_sso over protect_check', async () => {
 it('prioritizes protect_check over enterprise_sso', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
Expand All@@ -191,6 +191,45 @@ describe('completeSignUpFlow', () => {
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockNavigate).toHaveBeenCalledWith('protect-check', { searchParams: new URLSearchParams() });
 expect(mockAuthenticateWithRedirect).not.toHaveBeenCalled();
 });

 it('hands off to the connection once no challenge is left', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 protectCheckPath: 'protect-check',
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });

 it('still hands off to the connection when the caller has no challenge route', async () => {
 const mockSignUp = {
 status: 'missing_requirements',
 missingFields: ['enterprise_sso', 'protect_check'] as SignUpField[],
 authenticateWithRedirect: mockAuthenticateWithRedirect,
 } as unknown as SignUpResource;

 await completeSignUpFlow({
 signUp: mockSignUp,
 handleComplete: mockHandleComplete,
 navigate: mockNavigate,
 redirectUrl: 'https://example.com/acs',
 redirectUrlComplete: 'https://example.com/done',
 });

 expect(mockAuthenticateWithRedirect).toHaveBeenCalled();
 expect(mockNavigate).not.toHaveBeenCalled();
 });
Expand Down

23 changes: 14 additions & 9 deletions
packages/shared/src/internal/clerk-js/completeSignUpFlow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,20 @@ export const completeSignUpFlow = ({
 removeClerkQueryParam('__clerk_invitation_token');
 return handleComplete && handleComplete();
 } else if (signUp.status === 'missing_requirements') {
 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 //
 // This runs before the enterprise SSO hand-off below, which is the order
 // `navigateToNextStepSignUp` already uses: both fields can be missing at once, and handing
 // the sign-up to the identity provider first defers the challenge until the round trip is
 // over. Resolving it here returns to this function with only the hand-off left to do.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.missingFields.some(mf => mf === 'enterprise_sso')) {
 if (!redirectUrl || !redirectUrlComplete) {
 throw new Error(
Expand All@@ -47,15 +61,6 @@ export const completeSignUpFlow = ({
 });
 }

 const params = forwardClerkQueryParams();

 // The protect_check field is the authoritative gating signal. Sign-up also surfaces it
 // via a missing_fields entry; treat either as equivalent.
 const isProtectGated = !!signUp.protectCheck || signUp.missingFields.some(mf => mf === 'protect_check');
 if (isProtectGated && protectCheckPath) {
 return navigate(protectCheckPath, { searchParams: params });
 }

 if (signUp.unverifiedFields?.includes('email_address') && verifyEmailPath) {
 return navigate(verifyEmailPath, { searchParams: params });
 }
Expand Down
Loading