From 2d0a0d567b53dbc98ab4beee3c84d6f2189ed914 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Tue, 18 Mar 2025 08:34:27 +0100 Subject: [PATCH] fix build --- .../(login)/idp/[provider]/success/page.tsx | 22 ++++++++++--------- packages/zitadel-proto/package.json | 2 +- 2 files changed, 13 insertions(+), 11 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 844a11e84a..193622fa20 100644 --- a/apps/login/src/app/(login)/idp/[provider]/success/page.tsx +++ b/apps/login/src/app/(login)/idp/[provider]/success/page.tsx @@ -54,7 +54,8 @@ export default async function Page(props: { token, }); - const { idpInformation, userId, addHumanUser } = intent; + const { idpInformation, userId } = intent; + let { addHumanUser } = intent; // sign in user. If user should be linked continue if (userId && !link) { @@ -121,7 +122,7 @@ export default async function Page(props: { // search for potential user via username, then link if (options?.isLinkingAllowed) { let foundUser; - const email = addHumanUser.email?.email; + const email = addHumanUser?.email?.email; if (options.autoLinking === AutoLinkingOption.EMAIL && email) { foundUser = await listUsers({ serviceUrl, email }).then((response) => { @@ -177,10 +178,11 @@ export default async function Page(props: { if (options?.isCreationAllowed && options.isAutoCreation) { let orgToRegisterOn: string | undefined = organization; + let newUser; if ( !orgToRegisterOn && - addHumanUser.username && // username or email? + addHumanUser?.username && // username or email? ORG_SUFFIX_REGEX.test(addHumanUser.username) ) { const matched = ORG_SUFFIX_REGEX.exec(addHumanUser.username); @@ -203,21 +205,21 @@ export default async function Page(props: { } } - if (orgToRegisterOn) { + if (addHumanUser && orgToRegisterOn) { const organizationSchema = create(OrganizationSchema, { org: { case: "orgId", value: orgToRegisterOn }, }); - addHumanUser = create(AddHumanUserRequestSchema, { + const addHumanUserWithOrganization = create(AddHumanUserRequestSchema, { ...addHumanUser, organization: organizationSchema, }); - } - const newUser = await addHuman({ - serviceUrl, - request: addHumanUser, - }); + newUser = await addHuman({ + serviceUrl, + request: addHumanUserWithOrganization, + }); + } if (newUser) { return ( diff --git a/packages/zitadel-proto/package.json b/packages/zitadel-proto/package.json index dcfa9b3f22..50c8342287 100644 --- a/packages/zitadel-proto/package.json +++ b/packages/zitadel-proto/package.json @@ -14,7 +14,7 @@ ], "sideEffects": false, "scripts": { - "generate": "buf generate https://github.com/zitadel/zitadel.git#tag=v2.71.1 --path ./proto/zitadel", + "generate": "buf generate https://github.com/zitadel/zitadel.git --path ./proto/zitadel", "clean": "rm -rf zitadel .turbo node_modules google protoc-gen-openapiv2 validate" }, "dependencies": {