Skip to content

fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

Merged
anagstef merged 4 commits into from
Mar 29, 2024
Merged

fix(clerk-js,types): Fix the redirection that happens when SSO fails #2955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe7b3cb
fix(clerk-js,types): Fix the redirection that happens when SSO fails
Mar 7, 2024
d20717e
chore(clerk-js): Add comments as to why we access `path` prop for sig…
Mar 29, 2024
211bf8a
Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…
anagstef Mar 29, 2024
017c68b
Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…
anagstef Mar 29, 2024
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/tame-coats-repeat.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp
4 changes: 2 additions & 2 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

const makeNavigate = (to: string) => () => navigate(to);

const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

const navigateToFactorOne = makeNavigate(
params.firstFactorUrl ||
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignIn.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
</Route>
<Route path='sso-callback'>
<SignInSSOCallback
signUpUrl={signInContext.signUpUrl}
signInUrl={signInContext.signInUrl}
afterSignInUrl={signInContext.afterSignInUrl}
afterSignUpUrl={signInContext.afterSignUpUrl}
redirectUrl={signInContext.redirectUrl}
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/ui/components/SignUp/SignUp.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
</Route>
<Route path='sso-callback'>
<SignUpSSOCallback
signUpUrl={signUpContext.signUpUrl}
signInUrl={signUpContext.signInUrl}
afterSignUpUrl={signUpContext.afterSignUpUrl}
afterSignInUrl={signUpContext.afterSignInUrl}
redirectUrl={signUpContext.redirectUrl}
Expand Down
14 changes: 12 additions & 2 deletions packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
displayConfig: displayConfig,
});

let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
// The `ctx` object here refers to the SignUp component's props.
// SignUp's own options won't have a `signUpUrl` property, so we have to get the value
// from the `path` prop instead, when the routing is set to 'path'.
let signUpUrl =
(ctx.routing === 'path' ? ctx.path : undefined) ||
pickRedirectionProp('signUpUrl', { options, displayConfig }, false);
Comment on lines +97 to +99

@anagstefanagstefMar 7, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:

  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.

cc @nikosdouvlis@dimkl

@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.
I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?

@anagstefanagstefMar 11, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:

pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.

if (authQs && ctx.routing !== 'virtual') {
signUpUrl += `#/?${authQs}`;
}
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
signUpUrl += `#/?${authQs}`;
}

let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
// The `ctx` object here refers to the SignIn component's props.
// SignIn's own options won't have a `signInUrl` property, so we have to get the value
// from the `path` prop instead, when the routing is set to 'path'.
let signInUrl =
(ctx.routing === 'path' ? ctx.path : undefined) ||
pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.
if (authQs && ctx.routing !== 'virtual') {
signInUrl += `#/?${authQs}`;
}
Expand Down
2 changes: 2 additions & 0 deletions packages/elements/src/internals/machines/third-party/actors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
secondFactorUrl: ClerkJSNavigationEvent.signIn,
verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
signUpUrl: ClerkJSNavigationEvent.signUp,
signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.
} satisfies Required<HandleOAuthCallbackParams>,
customNavigate,
);
Expand Down
8 changes: 8 additions & 0 deletions packages/types/src/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
/**
* Full URL or path where the SignIn component is mounted.
*/
signInUrl?: string;
/**
* Full URL or path where the SignUp component is mounted.
*/
signUpUrl?: string;
/**
* Full URL or path to navigate after successful sign in
* or sign up.
Expand Down
, '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(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down

, '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(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down

, '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(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down

, '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(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down

, '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(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down

, '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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(clerk-js,types): Fix the redirection that happens when SSO fails by anagstef · Pull Request #2955 · clerk/javascript · GitHub
Skip to content
fix(clerk-js,types): Fix the redirection that happens when SSO fails#2955

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

 Merged

anagstef
merged 4 commits into

from

Mar 29, 2024
 Merged


fix(clerk-js,types): Fix the redirection that happens when SSO fails
#2955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fe7b3cb

fix(clerk-js,types): Fix the redirection that happens when SSO fails

Mar 7, 2024
d20717e

chore(clerk-js): Add comments as to why we access `path` prop for sig…

Mar 29, 2024
211bf8a

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024
017c68b

Merge branch 'main' into stefanos/sdk-1475-sso-callback-redirects-to-…


anagstef Mar 29, 2024

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/tame-coats-repeat.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Return to localhost when SSO callback fails on SignIn or SignUp

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1019,9 +1019,9 @@ export class Clerk implements ClerkInterface {

 const makeNavigate = (to: string) => () => navigate(to);

 const navigateToSignIn = makeNavigate(displayConfig.signInUrl);
 const navigateToSignIn = makeNavigate(params.signInUrl || displayConfig.signInUrl);

 const navigateToSignUp = makeNavigate(displayConfig.signUpUrl);
 const navigateToSignUp = makeNavigate(params.signUpUrl || displayConfig.signUpUrl);

 const navigateToFactorOne = makeNavigate(
 params.firstFactorUrl ||
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignIn/SignIn.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,8 @@ function SignInRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignInSSOCallback
 signUpUrl={signInContext.signUpUrl}
 signInUrl={signInContext.signInUrl}
 afterSignInUrl={signInContext.afterSignInUrl}
 afterSignUpUrl={signInContext.afterSignUpUrl}
 redirectUrl={signInContext.redirectUrl}
Expand Down

2 changes: 2 additions & 0 deletions
packages/clerk-js/src/ui/components/SignUp/SignUp.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ function SignUpRoutes(): JSX.Element {
 </Route>
 <Route path='sso-callback'>
 <SignUpSSOCallback
 signUpUrl={signUpContext.signUpUrl}
 signInUrl={signUpContext.signInUrl}
 afterSignUpUrl={signUpContext.afterSignUpUrl}
 afterSignInUrl={signUpContext.afterSignInUrl}
 redirectUrl={signUpContext.redirectUrl}
Expand Down

14 changes: 12 additions & 2 deletions
packages/clerk-js/src/ui/contexts/ClerkUIComponentsContext.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,12 @@ export const useSignUpContext = (): SignUpContextType => {
 displayConfig: displayConfig,
 });

 let signUpUrl = pickRedirectionProp('signUpUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignUp component's props.
 // SignUp's own options won't have a `signUpUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signUpUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signUpUrl', { options, displayConfig }, false);

Comment on lines

+97
 to 
+99

@anagstefanagstefMar 7, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the ctx from passing it inside the pickRedirectionProp here, as it never contains a signUpUrl prop from the SignUp component. The priority now is:
  • The ctx.path is the path prop that user passes to the SignUp component, when using routing=path.
  • The options passed in pickRedirectionProp is the ClerkProvider signUpUrl prop or the NEXT_PUBLIC_CLERK_SIGN_UP_URL env var, with that order.
  • Lastly, the displayConfig that has the Account Portal value.
cc @nikosdouvlis@dimkl
@nikosdouvlisnikosdouvlisMar 11, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit skeptical because the logic here has become somewhat complicated.

I think the reason you're not moving the path check inside pickRedirectionProp is that pickRedirectionProp is too generic for that?
@anagstefanagstefMar 11, 2024

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikosdouvlis Exactly! The first argument of the pickRedirectionProp utility is the key to search for. If I wanted to use it I should to something like:
pickRedirectionProp('path', { ctx }, false) || pickRedirectionProp('signUpUrl', { options, displayConfig }, false)

which looks even more confusing.
 if (authQs && ctx.routing !== 'virtual') {
 signUpUrl += `#/?${authQs}`;
 }
Expand DownExpand Up@@ -175,7 +180,12 @@ export const useSignInContext = (): SignInContextType => {
 signUpUrl += `#/?${authQs}`;
 }

 let signInUrl = pickRedirectionProp('signInUrl', { ctx, options, displayConfig }, false);
 // The `ctx` object here refers to the SignIn component's props.
 // SignIn's own options won't have a `signInUrl` property, so we have to get the value
 // from the `path` prop instead, when the routing is set to 'path'.
 let signInUrl =
 (ctx.routing === 'path' ? ctx.path : undefined) ||
 pickRedirectionProp('signInUrl', { options, displayConfig }, false);
Comment thread
nikosdouvlis marked this conversation as resolved.

 if (authQs && ctx.routing !== 'virtual') {
 signInUrl += `#/?${authQs}`;
 }
Expand Down

2 changes: 2 additions & 0 deletions
packages/elements/src/internals/machines/third-party/actors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ export const handleRedirectCallback = fromCallback<AnyEventObject, HandleRedirec
 secondFactorUrl: ClerkJSNavigationEvent.signIn,
 verifyEmailAddressUrl: ClerkJSNavigationEvent.verification,
 verifyPhoneNumberUrl: ClerkJSNavigationEvent.verification,
 signUpUrl: ClerkJSNavigationEvent.signUp,
 signInUrl: ClerkJSNavigationEvent.signIn,
Comment thread
anagstef marked this conversation as resolved.

 } satisfies Required<HandleOAuthCallbackParams>,
 customNavigate,
 );
Expand Down

8 changes: 8 additions & 0 deletions
packages/types/src/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -451,6 +451,14 @@ export interface Clerk {
}

export type HandleOAuthCallbackParams = AfterActionURLs & {
 /**
 * Full URL or path where the SignIn component is mounted.
 */
 signInUrl?: string;
 /**
 * Full URL or path where the SignUp component is mounted.
 */
 signUpUrl?: string;
 /**
 * Full URL or path to navigate after successful sign in
 * or sign up.
Expand Down