github-starred/better-auth
2
0
Fork 0
mirror of https://github.com/better-auth/better-auth.git synced 2026-06-03 12:57:09 -05:00
Code Issues 2.5k Packages Projects Releases 112 Wiki Activity

fix(email-otp): apply user configration for expiresIn properly (#1033)

Browse Source
This commit is contained in:
Bereket Engida
2024-12-27 08:05:39 +03:00
committed by GitHub
parent 5a7af5f574
commit f9fdf3b547
2 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
packages/better-auth/src/plugins/email-otp/email-otp.test.ts
View File

@@ -236,6 +236,45 @@ describe("email-otp", async () => {
},
});
});
it("should work with custom options", async () => {
const { client, testUser, auth } = await getTestInstance(
{
plugins: [
bearer(),
emailOTP({
async sendVerificationOTP({ email, otp: _otp, type }) {
otp = _otp;
otpFn(email, _otp, type);
},
sendVerificationOnSignUp: true,
expiresIn: 10,
otpLength: 8,
}),
],
emailVerification: {
autoSignInAfterVerification: true,
},
},
{
clientOptions: {
plugins: [emailOTPClient()],
},
},
);
await client.emailOtp.sendVerificationOtp({
type: "email-verification",
email: testUser.email,
});
expect(otp.length).toBe(8);
vi.useFakeTimers();
await vi.advanceTimersByTimeAsync(11 * 1000);
const verifyRes = await client.emailOtp.verifyEmail({
email: testUser.email,
otp,
});
expect(verifyRes.error?.code).toBe("OTP_EXPIRED");
});
});
describe("email-otp-verify", async () => {

16
packages/better-auth/src/plugins/email-otp/index.ts
View File

@@ -19,10 +19,14 @@ interface EmailOTPOptions {
) => Promise<void>;
/**
* Length of the OTP
*
* @default 6
*/
otpLength?: number;
/**
* Expiry time of the OTP in seconds
*
* @default 300 (5 minutes)
*/
expiresIn?: number;
/**
@@ -44,7 +48,7 @@ const types = ["email-verification", "sign-in", "forget-password"] as const;
export const emailOTP = (options: EmailOTPOptions) => {
const opts = {
expireIn: 5 * 60,
expiresIn: 5 * 60,
otpLength: 6,
...options,
};
@@ -113,7 +117,7 @@ export const emailOTP = (options: EmailOTPOptions) => {
.createVerificationValue({
value: otp,
identifier: `${ctx.body.type}-otp-${email}`,
expiresAt: getDate(opts.expireIn, "sec"),
expiresAt: getDate(opts.expiresIn, "sec"),
})
.catch(async (error) => {
// might be duplicate key error
@@ -124,7 +128,7 @@ export const emailOTP = (options: EmailOTPOptions) => {
await ctx.context.internalAdapter.createVerificationValue({
value: otp,
identifier: `${ctx.body.type}-otp-${email}`,
expiresAt: getDate(opts.expireIn, "sec"),
expiresAt: getDate(opts.expiresIn, "sec"),
});
});
await options.sendVerificationOTP(
@@ -177,7 +181,7 @@ export const emailOTP = (options: EmailOTPOptions) => {
await ctx.context.internalAdapter.createVerificationValue({
value: otp,
identifier: `${ctx.body.type}-otp-${email}`,
expiresAt: getDate(opts.expireIn, "sec"),
expiresAt: getDate(opts.expiresIn, "sec"),
});
return otp;
},
@@ -493,7 +497,7 @@ export const emailOTP = (options: EmailOTPOptions) => {
await ctx.context.internalAdapter.createVerificationValue({
value: otp,
identifier: `forget-password-otp-${email}`,
expiresAt: getDate(opts.expireIn, "sec"),
expiresAt: getDate(opts.expiresIn, "sec"),
});
await options.sendVerificationOTP(
{
@@ -638,7 +642,7 @@ export const emailOTP = (options: EmailOTPOptions) => {
await ctx.context.internalAdapter.createVerificationValue({
value: otp,
identifier: `email-verification-otp-${email}`,
expiresAt: getDate(opts.expireIn, "sec"),
expiresAt: getDate(opts.expiresIn, "sec"),
});
await options.sendVerificationOTP(
{