auth-verify 1.13.4 → 1.13.5

package/package.json

@@ -19,7 +19,7 @@
     "uuid": "^9.0.1"
   },
   "name": "auth-verify",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "A simple Node.js library for sending and verifying OTP via email, SMS and Telegram bot. And generating TOTP codes and QR codes. And handling JWT with Cookies. And also handling passwordless logins with passkeys/webauth. And handling magiclink passwordless logins",
   "main": "index.js",
   "scripts": {

package/readme.md

@@ -495,16 +495,18 @@ await otp.set("user@example.com");
  - Can also use **callback style** for memory storage
 
 ### 📤 Send OTP
+First way
 ```js
 await otp.send("user@example.com", {
     subject: "Your OTP Code",
-    text: "Your OTP is 123456",
-    html: "<b>123456</b>"
+    text: code => `Your OTP is ${code}`,
+    html: code => `<b>${code}</b>`
 });
 
 // or simply
 await otp.send("user@example.com");
 ```
+
 Supports channels:
 | `via`    | Notes                                    |
 | -------- | ---------------------------------------- |

package/src/otp/index.js

@@ -6,6 +6,7 @@ const sgMail = require('@sendgrid/mail')
 const formData = require('form-data');
 const Mailgun = require('mailgun.js');
 const { Resend } = require('resend');
+const mail = require('@sendgrid/mail');
 
 class OTPManager {
     constructor(otpOptions = {}){
@@ -253,14 +254,33 @@ class OTPManager {
                     throw new Error(`Unsupported email service: ${this.senderConfig.service}`);
                 }
 
+                // const mail = {
+                //     from: this.senderConfig.sender,
+                //     to,
+                //     subject: subject || 'Your OTP Code',
+                //     text: text || `Your OTP is ${this.code}`,
+                //     html: html || `<p>Your OTP is <b>${this.code}</b></p>`,
+                // };
+
                 const mail = {
-                    from: this.senderConfig.sender,
                     to,
+                    from: this.senderConfig.sender,
                     subject: subject || 'Your OTP Code',
-                    text: text || `Your OTP is ${this.code}`,
-                    html: html || `<p>Your OTP is <b>${this.code}</b></p>`,
                 };
 
+                if (text !== undefined) {
+                    mail.text = text;
+                }
+
+                if (html !== undefined) {
+                    mail.html = html;
+                }
+
+                // fallback only if NOTHING provided
+                if (text === undefined && html === undefined) {
+                    mail.text = `Your OTP is ${this.code}`;
+                }
+
                 if (typeof callback === 'function') {
                     transporter.sendMail(mail, (err, info) => {
                         if (err) return callback(err);
@@ -622,7 +642,47 @@ class OTPManager {
             // console.log(otpCode);
             if(this.senderConfig.via === 'email'){
                 if(this.senderConfig.service === 'smtp' || this.senderConfig.service === 'gmail'){
-                    await this.#sendEmail(reciever, mailOption);
+                    // await this.#sendEmail(reciever, mailOption);
+                    this.generate(mailOption.otpLen);
+                    await this.set(reciever);
+
+                    const resolvedHtml =
+                        typeof mailOption.html === 'function'
+                            ? mailOption.html(this.code)
+                            : mailOption.html;
+
+                    const resolvedText =
+                        typeof mailOption.text === 'function'
+                            ? mailOption.text(this.code)
+                            : mailOption.text;
+
+                    const mail = {
+                        from: this.senderConfig.sender,
+                        to: reciever,
+                        subject: mailOption.subject || 'Your OTP Code',
+                    };
+
+                    if (mailOption.text) {
+                        mail.text = resolvedText;
+                    }
+
+                    if (mailOption.html) {
+                        mail.html = resolvedHtml;
+                    }
+
+                    // fallback if neither provided
+                    if (!mailOption.text && !mailOption.html) {
+                        mail.text = `Your OTP is ${this.code}`;
+                    }
+
+                    // this.message({
+                    //     to: reciever,
+                    //     subject: mailOption.subject || "Email verification",
+                    //     html: resolvedHtml || `Your OTP code is <b>${this.code}</b>`,
+                    //     text: resolvedText || `Your OTP code is ${this.code}`,
+                    // });
+
+                    this.message(mail);
                     return true;
                 }else{
                     return await this.#sendEmailApi(reciever, mailOption);
@@ -644,17 +704,16 @@ class OTPManager {
         else return sendProcess();
     }
 
-    #sendEmail(reciever, mailOption){
-        return this.generate(mailOption.otpLen).set(reciever, (err)=>{
-            if(err) throw err;
+    async #sendEmail(reciever, mailOption) {
+        await this.generate(mailOption.otpLen).set(reciever);
 
-            this.message({
-                to: reciever,
-                subject: mailOption.subject || "Your OTP code",
-                text: mailOption.text || `Your OTP code is ${this.code}`,
-                html: mailOption.html || `Your OTP code is ${this.code}`
-                });
-            });
+    
+        return await this.message({
+            to: reciever,
+            subject: mailOption.subject || "Your OTP code",
+            text: mailOption.text || `Your OTP code is ${this.code}`,
+            html: mailOption.html || `<p>Your OTP code is <b>${this.code}</b></p>`
+        });
     }
 
     #sendSMS(reciever, smsOption){