mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 23:47:33 +00:00
Merge pull request #472 from zitadel/fix-idp-options-handling
fix(idps): JWT Idp, do not consider allowed options
This commit is contained in:
@@ -65,7 +65,7 @@ You can already use the current state, and extend it with your needs.
|
||||
- [x] Apple
|
||||
- [x] Generic OIDC
|
||||
- [x] Generic OAuth
|
||||
- [ ] Generic JWT
|
||||
- [x] Generic JWT
|
||||
- [ ] LDAP
|
||||
- [ ] SAML SP
|
||||
- Multifactor Registration an Login
|
||||
@@ -73,7 +73,7 @@ You can already use the current state, and extend it with your needs.
|
||||
- [x] TOTP
|
||||
- [x] OTP: Email Code
|
||||
- [x] OTP: SMS Code
|
||||
- [ ] Password Change/Reset
|
||||
- [x] Password Change/Reset
|
||||
- [x] Domain Discovery
|
||||
- [x] Branding
|
||||
- OIDC Standard
|
||||
|
@@ -120,7 +120,7 @@ export default async function Page(props: {
|
||||
}
|
||||
|
||||
// search for potential user via username, then link
|
||||
if (options?.isLinkingAllowed) {
|
||||
if (options?.autoLinking) {
|
||||
let foundUser;
|
||||
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 newUser;
|
||||
|
||||
|
@@ -53,6 +53,7 @@ export function SignInWithIdp({
|
||||
[IdentityProviderType.GITLAB]: SignInWithGitlab,
|
||||
[IdentityProviderType.GITLAB_SELF_HOSTED]: SignInWithGitlab,
|
||||
[IdentityProviderType.SAML]: SignInWithGeneric,
|
||||
[IdentityProviderType.JWT]: SignInWithGeneric,
|
||||
};
|
||||
|
||||
const Component = components[type];
|
||||
|
@@ -24,6 +24,8 @@ export function idpTypeToSlug(idpType: IdentityProviderType) {
|
||||
return "oauth";
|
||||
case IdentityProviderType.OIDC:
|
||||
return "oidc";
|
||||
case IdentityProviderType.JWT:
|
||||
return "jwt";
|
||||
default:
|
||||
throw new Error("Unknown identity provider type");
|
||||
}
|
||||
@@ -64,6 +66,9 @@ export function idpTypeToIdentityProviderType(
|
||||
case IDPType.IDP_TYPE_OIDC:
|
||||
return IdentityProviderType.OIDC;
|
||||
|
||||
case IDPType.IDP_TYPE_JWT:
|
||||
return IdentityProviderType.JWT;
|
||||
|
||||
default:
|
||||
throw new Error("Unknown identity provider type");
|
||||
}
|
||||
|
Reference in New Issue
Block a user