From 321007cee34470df3231e92811a7918e35f88fcb Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 3 Jun 2025 09:28:47 +0200 Subject: [PATCH 1/3] fix(idps): do not consider allowed options --- apps/login/src/app/(login)/idp/[provider]/success/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/login/src/app/(login)/idp/[provider]/success/page.tsx b/apps/login/src/app/(login)/idp/[provider]/success/page.tsx index 2c9724f13a..1cee8b587c 100644 --- a/apps/login/src/app/(login)/idp/[provider]/success/page.tsx +++ b/apps/login/src/app/(login)/idp/[provider]/success/page.tsx @@ -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; From 4b38a7a64b4a89fe2727316ad40c8e2fd98f6486 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Thu, 5 Jun 2025 13:15:17 +0200 Subject: [PATCH 2/3] add jwt IDP type --- apps/login/src/components/sign-in-with-idp.tsx | 1 + apps/login/src/lib/idp.ts | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/apps/login/src/components/sign-in-with-idp.tsx b/apps/login/src/components/sign-in-with-idp.tsx index 7632a29cc1..9c1d339ffa 100644 --- a/apps/login/src/components/sign-in-with-idp.tsx +++ b/apps/login/src/components/sign-in-with-idp.tsx @@ -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]; diff --git a/apps/login/src/lib/idp.ts b/apps/login/src/lib/idp.ts index 1d4b82951a..a62889efa3 100644 --- a/apps/login/src/lib/idp.ts +++ b/apps/login/src/lib/idp.ts @@ -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"); } From 924f0c39d11fb3dd3bc9d6068e3ddd22f2211f9b Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Thu, 5 Jun 2025 13:20:02 +0200 Subject: [PATCH 3/3] readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 67aef1f959..5007ddf2ab 100644 --- a/README.md +++ b/README.md @@ -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