Skip to content

feat: enhance redirect logic in auth controller to include onboarding parameter #2476

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
JivusAyrus merged 5 commits into from
Jan 29, 2026
+17 −7
Merged

feat: enhance redirect logic in auth controller to include onboarding parameter #2476

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd5e474
feat: enhance redirect logic in auth controller to include onboarding…
JivusAyrus Jan 29, 2026
cabaec9
feat: refine redirect URL validation in auth controller to ensure ori…
JivusAyrus Jan 29, 2026
874f6e5
Merge branch 'main' into suvij/eng-8829-cosmo-sign-up-migratetrue-fla…
JivusAyrus Jan 29, 2026
55776e9
Merge branch 'main' into suvij/eng-8829-cosmo-sign-up-migratetrue-fla…
JivusAyrus Jan 29, 2026
c4496cc
Merge branch 'main' into suvij/eng-8829-cosmo-sign-up-migratetrue-fla…
JivusAyrus Jan 29, 2026
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
20 changes: 11 additions & 9 deletions controlplane/src/core/controllers/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,16 +400,18 @@ const plugin: FastifyPluginCallback<AuthControllerOptions> = function Auth(fasti
// Set the sso cookie.
opts.authUtils.createSsoCookie(res, ssoSlug);
}
if (redirectURL) {
if (redirectURL.startsWith(opts.webBaseUrl)) {
res.redirect(redirectURL);
} else {
res.redirect(opts.webBaseUrl);
}
} else if (orgs === 0) {
res.redirect(opts.webBaseUrl + '?migrate=true');
// Determine the target URL
let targetUrl = opts.webBaseUrl;
if (redirectURL && redirectURL.startsWith(opts.webBaseUrl)) {
targetUrl = redirectURL;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// Append onboarding parameter if the user has no orgs
if (orgs === 0) {
const separator = targetUrl.includes('?') ? '&' : '?';
res.redirect(targetUrl + separator + 'onboarding=true');
Comment thread
JivusAyrus marked this conversation as resolved.
Dismissed
} else {
res.redirect(opts.webBaseUrl);
res.redirect(targetUrl);
Comment thread
JivusAyrus marked this conversation as resolved.
}
} catch (err: any) {
if (err instanceof AuthenticationError) {
Expand Down
Loading