Skip to content

fix: thread referrer through OIDC state so signup records acquisition… #2939

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

Closed
jelveh wants to merge 4 commits into from
Closed

fix: thread referrer through OIDC state so signup records acquisition… #2939

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
545cee7
fix: thread referrer through OIDC state so signup records acquisition…
jelveh May 6, 2026
3c5036b
Merge branch 'main' into oidc-referrer
jelveh May 7, 2026
3d5df1a
Merge branch 'main' into oidc-referrer
jelveh May 7, 2026
fb5dda8
Merge branch 'main' into oidc-referrer
jelveh May 7, 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
17 changes: 17 additions & 0 deletions src/backend/controllers/oidc/OIDCController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,19 @@ export class OIDCController extends PuterController {
}
}

const rawReferrer = Array.isArray(req.query.referrer)
? req.query.referrer[0]
: req.query.referrer;
const referrer =
rawReferrer != null && rawReferrer !== ''
? String(rawReferrer)
: null;

const statePayload: Record<string, unknown> = {
provider,
redirect_uri: appRedirectUri,
};
if (referrer) statePayload.referrer = referrer;
if (embeddedInPopup && msgId) {
statePayload.embedded_in_popup = true;
statePayload.msg_id = msgId;
Expand Down Expand Up @@ -228,6 +237,7 @@ export class OIDCController extends PuterController {
const resolved = await this.#resolveOrCreateOIDCUser(
provider,
userinfo,
stateDecoded,
);
if ('error' in resolved) {
console.warn(
Expand Down Expand Up @@ -288,6 +298,7 @@ export class OIDCController extends PuterController {
const resolved = await this.#resolveOrCreateOIDCUser(
provider,
userinfo,
stateDecoded,
);
if ('error' in resolved) {
return res.redirect(
Expand Down Expand Up @@ -431,6 +442,7 @@ if (window.opener) {
async #resolveOrCreateOIDCUser(
provider: string,
userinfo: { sub: string; email?: unknown; [k: string]: unknown },
stateDecoded: Record<string, unknown>,
): Promise<
| { error: string }
| {
Expand Down Expand Up @@ -472,9 +484,14 @@ if (window.opener) {
}

// 3. Fresh account.
const referrer =
typeof stateDecoded.referrer === 'string'
? stateDecoded.referrer
: null;
const outcome = await this.services.oidc.createUserFromOIDC(
provider,
userinfo as { sub: string; email?: string },
{ referrer },
);
if (!outcome.success || !outcome.user) {
return { error: outcome.error ?? 'Account creation failed.' };
Expand Down
3 changes: 2 additions & 1 deletion src/backend/services/auth/OIDCService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ export class OIDCService extends PuterService {
async createUserFromOIDC(
providerId: string,
claims: OIDCUserInfo,
options?: { referrer?: string | null },
): Promise<{ success: boolean; user?: UserRow; error?: string }> {
if (claims.email_verified === false) {
return {
Expand Down Expand Up @@ -477,7 +478,7 @@ export class OIDCService extends PuterService {
signup_user_agent: req?.headers?.['user-agent'] ?? null,
signup_origin: req?.headers?.origin,
signup_server: this.config.serverId,
referrer: req?.body?.referrer ?? null,
referrer: options?.referrer ?? null,
});

if (!created) {
Expand Down
4 changes: 4 additions & 0 deletions src/gui/src/UI/UIWindowSignup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ function UIWindowSignup (options) {
$(el_window).find(btnClass).css('display', 'flex');
$(el_window).find(btnClass).on('click', function () {
let url = `${window.gui_origin}/auth/oidc/${provider}/start?flow=signup`;
const referrer = options.referrer ?? window.referrerStr;
if ( referrer ) {
url += `&referrer=${encodeURIComponent(referrer)}`;
}
if ( window.embedded_in_popup && window.url_query_params?.get('msg_id') ) {
url += `&embedded_in_popup=true&msg_id=${encodeURIComponent(window.url_query_params.get('msg_id'))}`;
if ( window.openerOrigin ) {
Expand Down