Skip to content

fix: does not send email confirmation when signup with otp #6292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2024
Merged

fix: does not send email confirmation when signup with otp #6292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions server/account/src/operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,7 @@ export async function createAcc (
first: string,
last: string,
confirmed: boolean = false,
shouldConfirm: boolean = true,
extra?: Record<string, string>
): Promise<Account> {
const email = cleanEmail(_email)
Expand Down Expand Up @@ -933,7 +934,7 @@ export async function createAcc (
throw new PlatformError(new Status(Severity.ERROR, platform.status.AccountAlreadyExists, { account: email }))
}
const sesURL = getMetadata(accountPlugin.metadata.SES_URL)
if (!confirmed) {
if (!confirmed && shouldConfirm) {
if (sesURL !== undefined && sesURL !== '') {
await sendConfirmation(productId, branding, newAccount)
} else {
Expand Down Expand Up @@ -994,7 +995,7 @@ export async function signUpOtp (
const first = email.split('@', 1)[0] ?? ''
const last = ''

await createAcc(ctx, db, productId, branding, email, null, first, last, false)
await createAcc(ctx, db, productId, branding, email, null, first, last, false, false)

return await sendOtp(ctx, db, productId, branding, _email)
}
Expand Down Expand Up @@ -2525,7 +2526,7 @@ export async function joinWithProvider (
await useInvite(db, inviteId)
return result
}
const newAccount = await createAcc(ctx, db, productId, branding, email, null, first, last, true, extra)
const newAccount = await createAcc(ctx, db, productId, branding, email, null, first, last, true, true, extra)
const token = generateToken(email, getWorkspaceId('', productId), getExtra(newAccount))
const ws = await assignWorkspace(
ctx,
Expand Down Expand Up @@ -2589,7 +2590,7 @@ export async function loginWithProvider (
}
return result
}
const newAccount = await createAcc(ctx, db, productId, branding, email, null, first, last, true, extra)
const newAccount = await createAcc(ctx, db, productId, branding, email, null, first, last, true, true, extra)

const result = {
endpoint: '',
Expand Down