Repository navigation
fix: use idp variant for resource auth login page icons - #3790
Merged
Merged
Conversation
Add domain validation for inference mode in resource forms
Improve license billing
The resource auth login page (auth/resource/[resourceGuid]) loads IdPs via the global /idp list in the non-saas/non-org path and passed idp.type as the icon variant. Since type is always 'oidc' for OIDC-backed providers (Google, Azure), the branded logos were never selected, showing the generic OIDC icon instead. Use idp.variant (with type as fallback), matching the fix already applied to the main login page (auth/login) and org login page (auth/org/[orgId]). Fixes fosrl#3631
Bolex80
requested review from
miloschwartz and
oschwartz10612
as code owners
September 19, 2026 10:29
Member
|
Thanks! |
oschwartz10612
approved these changes
Sep 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bug Description
The resource auth login page (
auth/resource/[resourceGuid]) — used for per-site / custom-branded logins like "Authenticate to access [resource]" — shows the generic OIDC icon on the Google and Microsoft SSO buttons instead of their branded logos.The main login page and the org login page were already fixed, but the resource auth page's
elsebranch was missed.Fixes #3631
Root Cause
src/app/auth/resource/[resourceGuid]/page.tsx, in the non-SaaS / non-org path (lines ~282-287):This path passes
idp.typeas the iconvariant. For OIDC-backed providers the brand lives in the separateidpOidcConfig.variantcolumn ("google"/"azure"), whileidp.typeis always"oidc". SoIdpTypeIconalways resolves to the generic/idp/openid.png.The
/idplist API already returnsvariant(server/routers/idp/listIdps.tsselects bothtypeandvariant). This path simply wasn't using it.Fix
This mirrors the identical fix already applied to the main login page (
src/app/auth/login/page.tsx) and the org login page (src/app/auth/org/[orgId]/page.tsx) in PR #3637 — the resource-auth page'selsebranch was the one place left unfixed.idp.variantis nullable in the API schema, so?? idp.typepreserves the previous fallback behavior for providers without a branded variant.How to Verify
idp.type = "oidc"butidpOidcConfig.variant = "google"/"azure").https://<resource>/auth/login, the branded "Authenticate to access X" page).Test Plan
main; the fix matches the already-merged approach in PR Fix: Use variant instead of type only for the Org login IDPs #3637)auth/loginRisk Assessment
Low — cosmetic-only change to which logo PNG is rendered. It does not affect authentication, redirect URLs, or IdP configuration. The fallback
?? idp.typepreserves current behavior for any provider wherevariantis null.