diff --git a/pods/authProviders/src/utils.ts b/pods/authProviders/src/utils.ts index e20d6bf413..7a7561885b 100644 --- a/pods/authProviders/src/utils.ts +++ b/pods/authProviders/src/utils.ts @@ -67,7 +67,7 @@ export async function handleProviderAuth ( providerType: string, rawState: string | undefined, user: any, - email: string, + email: string | undefined, first: string, last: string, socialKey: SocialKey, diff --git a/server/account/src/utils.ts b/server/account/src/utils.ts index d749727f37..95fc8b8f0e 100644 --- a/server/account/src/utils.ts +++ b/server/account/src/utils.ts @@ -1170,14 +1170,14 @@ export async function loginOrSignUpWithProvider ( ctx: MeasureContext, db: AccountDB, branding: Branding | null, - email: string, + email: string | undefined, first: string, last: string, socialId: SocialKey, signUpDisabled = false ): Promise { try { - const normalizedEmail = cleanEmail(email) + const normalizedEmail = email != null ? cleanEmail(email) : '' // Find if any of the target/email social ids exist const targetSocialId = await db.socialId.findOne(socialId) @@ -1248,7 +1248,7 @@ export async function loginOrSignUpWithProvider ( await confirmHulyIds(ctx, db, personUuid as AccountUuid) const extraToken: Record = isAdminEmail(normalizedEmail) ? { admin: 'true' } : {} - ctx.info('Provider login succeeded', { email, normalizedEmail, emailSocialId, ...extraToken }) + ctx.info('Provider login succeeded', { email, normalizedEmail, emailSocialId, socialId, ...extraToken }) return { account: personUuid as AccountUuid, @@ -1267,14 +1267,14 @@ export async function joinWithProvider ( ctx: MeasureContext, db: AccountDB, branding: Branding | null, - email: string, + email: string | undefined, first: string, last: string, inviteId: string, socialId: SocialKey, signUpDisabled = false ): Promise { - const normalizedEmail = cleanEmail(email) + const normalizedEmail = email != null ? cleanEmail(email) : '' const invite = await getWorkspaceInvite(db, inviteId) if (invite == null) { throw new PlatformError(new Status(Severity.ERROR, platform.status.Forbidden, {}))