Skip to content

fix(auth): resolve the conflict markers left in the verification OTP path #595

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

Closed
AbdullahM07 wants to merge 1 commit into from
+0 −4
Closed

fix(auth): resolve the conflict markers left in the verification OTP path #595

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
4 changes: 0 additions & 4 deletions apps/api/src/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,17 +415,13 @@ export const auth = betterAuth({
// types are not enabled, so they fall through and send nothing.
if (type === "email-verification") {
const tmpl = verifyOtpEmailTemplate(otp, { expiresMinutes: 10 });
<<<<<<< HEAD
await sendMail({ to: email, ...tmpl });
=======
if (!(await sendMail({ to: email, ...tmpl }))) {
throw new APIError("SERVICE_UNAVAILABLE", {
message:
"Could not send the verification code — this instance has no working " +
"email transport. Configure SMTP in Settings → Email.",
});
}
>>>>>>> a52e2566 (patch v0.6.6)
return;
}
// Password reset. This replaced the link flow (`sendResetPassword` in the
Expand Down