Skip to content

fix(clerk-js): Fix FAPI initiated redirect flow for OAuth2 IDP flow with email_link verification #2677

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
mzhong9723 merged 1 commit into from
Jan 31, 2024
Merged

fix(clerk-js): Fix FAPI initiated redirect flow for OAuth2 IDP flow with email_link verification #2677

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/twenty-lamps-rule.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Fix redirect flow for OAuth2 IDP flow with email_link verification.
8 changes: 5 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,11 +1613,13 @@ export class Clerk implements ClerkInterface {
}

const userSignedIn = this.session;
const signInUrl = this.#environment?.displayConfig.signInUrl;
const signInUrl = this.#options.signInUrl || this.#environment?.displayConfig.signInUrl;
const referrerIsSignInUrl = signInUrl && window.location.href.startsWith(signInUrl);
const signUpUrl = this.#options.signUpUrl || this.#environment?.displayConfig.signUpUrl;
const referrerIsSignUpUrl = signUpUrl && window.location.href.startsWith(signUpUrl);

// don't redirect if user is not signed in and referrer is sign in url
if (requiresUserInput(redirectUrl) && !userSignedIn && referrerIsSignInUrl) {
// don't redirect if user is not signed in and referrer is sign in/up url
if (requiresUserInput(redirectUrl) && !userSignedIn && (referrerIsSignInUrl || referrerIsSignUpUrl)) {
return false;
}

Expand Down