TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 23:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #472 from zitadel/fix-idp-options-handling

Browse Source 
fix(idps): JWT Idp, do not consider allowed options
This commit is contained in:
Max Peintner
2025-06-05 13:28:42 +02:00
committed by GitHub
parent 0c87f077fa 924f0c39d1
commit 43e920a1f5
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -65,7 +65,7 @@ You can already use the current state, and extend it with your needs.
- [x] Apple - [x] Apple
- [x] Generic OIDC - [x] Generic OIDC
- [x] Generic OAuth - [x] Generic OAuth
- [ ] Generic JWT - [x] Generic JWT
- [ ] LDAP - [ ] LDAP
- [ ] SAML SP - [ ] SAML SP
- Multifactor Registration an Login - Multifactor Registration an Login
@@ -73,7 +73,7 @@ You can already use the current state, and extend it with your needs.
- [x] TOTP - [x] TOTP
- [x] OTP: Email Code - [x] OTP: Email Code
- [x] OTP: SMS Code - [x] OTP: SMS Code
- [ ] Password Change/Reset - [x] Password Change/Reset
- [x] Domain Discovery - [x] Domain Discovery
- [x] Branding - [x] Branding
- OIDC Standard - OIDC Standard

4
apps/login/src/app/(login)/idp/[provider]/success/page.tsx
View File

@@ -120,7 +120,7 @@ export default async function Page(props: {
} }
// search for potential user via username, then link // search for potential user via username, then link
if (options?.isLinkingAllowed) { if (options?.autoLinking) {
let foundUser; let foundUser;
const email = addHumanUser?.email?.email; const email = addHumanUser?.email?.email;
@@ -176,7 +176,7 @@ export default async function Page(props: {
} }
} }
if (options?.isCreationAllowed && options.isAutoCreation) { if (options?.isAutoCreation) {
let orgToRegisterOn: string | undefined = organization; let orgToRegisterOn: string | undefined = organization;
let newUser; let newUser;

1
apps/login/src/components/sign-in-with-idp.tsx
View File

@@ -53,6 +53,7 @@ export function SignInWithIdp({
[IdentityProviderType.GITLAB]: SignInWithGitlab, [IdentityProviderType.GITLAB]: SignInWithGitlab,
[IdentityProviderType.GITLAB_SELF_HOSTED]: SignInWithGitlab, [IdentityProviderType.GITLAB_SELF_HOSTED]: SignInWithGitlab,
[IdentityProviderType.SAML]: SignInWithGeneric, [IdentityProviderType.SAML]: SignInWithGeneric,
[IdentityProviderType.JWT]: SignInWithGeneric,
}; };
const Component = components[type]; const Component = components[type];

5
apps/login/src/lib/idp.ts
View File

@@ -24,6 +24,8 @@ export function idpTypeToSlug(idpType: IdentityProviderType) {
return "oauth"; return "oauth";
case IdentityProviderType.OIDC: case IdentityProviderType.OIDC:
return "oidc"; return "oidc";
case IdentityProviderType.JWT:
return "jwt";
default: default:
throw new Error("Unknown identity provider type"); throw new Error("Unknown identity provider type");
} }
@@ -64,6 +66,9 @@ export function idpTypeToIdentityProviderType(
case IDPType.IDP_TYPE_OIDC: case IDPType.IDP_TYPE_OIDC:
return IdentityProviderType.OIDC; return IdentityProviderType.OIDC;
case IDPType.IDP_TYPE_JWT:
return IdentityProviderType.JWT;
default: default:
throw new Error("Unknown identity provider type"); throw new Error("Unknown identity provider type");
} }