Skip to content

Fix: RAR not showing project selector #3102

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
Meldiron merged 1 commit into from
Jul 2, 2026
Merged

Fix: RAR not showing project selector #3102

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
35 changes: 24 additions & 11 deletions src/routes/(public)/oauth2/consent-card.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
resolveOrganizationNames,
PROJECT_RAR_TYPE,
ORGANIZATION_RAR_TYPE,
WILDCARD_IDENTIFIER,
type ResolvedResource,
type ResourceNameMap
} from '$lib/helpers/oauth2-authorization-details';
Expand Down Expand Up @@ -80,18 +81,30 @@
// binding is the only thing the user narrows here.
const scopeModel = $derived(splitConsentScopes(grant.scopes ?? []));
const details = $derived(parseAuthorizationDetails(grant.authorizationDetails));
const projectIdentifiers = $derived(mergeIdentifiers(details, PROJECT_RAR_TYPE));
const organizationIdentifiers = $derived(mergeIdentifiers(details, ORGANIZATION_RAR_TYPE));

// A tier is shown only when the client requested both permissions for it AND
// resources to bind them to — either half alone grants nothing.
const projectRequested = $derived(
(scopeModel.project.all || scopeModel.project.scopes.length > 0) &&
projectIdentifiers.length > 0

const projectScopesRequested = $derived(
scopeModel.project.all || scopeModel.project.scopes.length > 0
);
const organizationScopesRequested = $derived(
scopeModel.organization.all || scopeModel.organization.scopes.length > 0
);

// When a tier's scopes are requested but left unbound, fall back to the
// wildcard so the user still gets the full resource picker.
const projectIdentifiers = $derived.by(() => {
const bound = mergeIdentifiers(details, PROJECT_RAR_TYPE);
if (bound.length > 0) return bound;
return projectScopesRequested ? [WILDCARD_IDENTIFIER] : [];
});
const organizationIdentifiers = $derived.by(() => {
const bound = mergeIdentifiers(details, ORGANIZATION_RAR_TYPE);
if (bound.length > 0) return bound;
return organizationScopesRequested ? [WILDCARD_IDENTIFIER] : [];
});

const projectRequested = $derived(projectScopesRequested && projectIdentifiers.length > 0);
const organizationRequested = $derived(
(scopeModel.organization.all || scopeModel.organization.scopes.length > 0) &&
organizationIdentifiers.length > 0
organizationScopesRequested && organizationIdentifiers.length > 0
);

const redirectHost = $derived(hostnameOf(grant.redirectUri));
Expand Down Expand Up @@ -179,7 +192,7 @@
// Scopes are not downscoped — omit `scope` so the server keeps what
// the client requested. Only the resource binding is narrowed.
authorizationDetails:
details.length > 0
projectRequested || organizationRequested
? serializeGrantedDetails({
project: projectGranted ? projectSelected : undefined,
organization: organizationGranted ? organizationSelected : undefined
Expand Down