sms api server

Author: Vansh-Baghel

server/src/routes/sms.js

@@ -1,15 +1,7 @@
-<<<<<<< HEAD:server/routes/sms.js
-const express = require("express");
-const router = express.Router();
-
-const { sendOTP, verifyOTP, sendMail } = require("../services/smsAPI");
-const Email = require("../models/EmailSchema");
-=======
 import express from 'express';
 const router = express.Router();
 
-import { sendOTP, verifyOTP } from "../services/smsAPI.js";
->>>>>>> ee1f1288657640caca736f3d99baca0b1767621b:server/src/routes/sms.js
+import { sendOTP, verifyOTP, sendMail } from "../services/smsAPI.js";
 
 // OTP routes
 router.post("/apis/sendOTP", (req, res) => {
@@ -86,9 +78,4 @@ router.post("/apis/verifyOTP", (req, res) => {
     });
 });
 
-<<<<<<< HEAD:server/routes/sms.js
-module.exports = router;
-=======
-
 export default router;
->>>>>>> ee1f1288657640caca736f3d99baca0b1767621b:server/src/routes/sms.js

server/src/services/smsAPI.js

@@ -1,8 +1,10 @@
 const TWILIO_ACCOUNT_SID = process.env.TWILIO_ACCOUNT_SID;
 const AUTH_TOKEN = process.env.AUTH_TOKEN;
 const SERVICE_ID = process.env.SERVICE_ID;
-const sgMail = require("@sendgrid/mail");
-const Email = require("../models/EmailSchema");
+import sgMail from "@sendgrid/mail";
+import Email from "../models/EmailSchema";
+import twilio from 'twilio';
+const twilioClient = twilio(TWILIO_ACCOUNT_SID, AUTH_TOKEN);
 
 sgMail.setApiKey(process.env.SENDGRID_API_KEY);
 
@@ -12,31 +14,28 @@ console.log("Twilio params", {
   SERVICE_ID,
 });
 
-<<<<<<< HEAD:server/services/smsAPI.js
-const twilioClient = require("twilio")(TWILIO_ACCOUNT_SID, AUTH_TOKEN);
-
-exports.sendOTP = (phone) => {
-  return new Promise((resolve, reject) => {
-    twilioClient.verify.v2
-      .services(SERVICE_ID)
-      .verifications.create({ to: phone, channel: "sms" })
-      .then(resolve)
-      .catch(reject);
-  });
-};
+export const sendOTP = (phone) => {
+    return new Promise((resolve, reject) => {
+        twilioClient.verify.v2.services(SERVICE_ID)
+            .verifications
+            .create({to: phone, channel: 'sms'})
+            .then(resolve)
+            .catch(reject)
+    })
+}
 
-exports.verifyOTP = (phone, code) => {
-  return new Promise((resolve, reject) => {
-    twilioClient.verify.v2
-      .services(SERVICE_ID)
-      .verificationChecks.create({ to: phone, code: code })
-      .then(resolve)
-      .catch(reject);
-  });
-};
+export const verifyOTP = (phone, code) => {
+    return new Promise((resolve, reject) => {
+        twilioClient.verify.v2.services(SERVICE_ID)
+        .verificationChecks
+        .create({to: phone, code: code})
+        .then(resolve)
+        .catch(reject);
+    })
+}
 
 // Email through sendGrid
-exports.sendMail = async (req, res) => {
+export const sendMail = async (req, res) => {
   const ownerEmails = await Email.create({ emails: req.body.emails , stringMsg : req.body.stringMsg});
 
   try {
@@ -63,27 +62,3 @@ exports.sendMail = async (req, res) => {
     return res.json({ statusMessage: "Message not sent!!", emails: ownerEmails.emails });
   }
 };
-=======
-import twilio from 'twilio';
-const twilioClient = twilio(TWILIO_ACCOUNT_SID, AUTH_TOKEN);
-
-export const sendOTP = (phone) => {
-    return new Promise((resolve, reject) => {
-        twilioClient.verify.v2.services(SERVICE_ID)
-            .verifications
-            .create({to: phone, channel: 'sms'})
-            .then(resolve)
-            .catch(reject)
-    })
-}
-
-export const verifyOTP = (phone, code) => {
-    return new Promise((resolve, reject) => {
-        twilioClient.verify.v2.services(SERVICE_ID)
-        .verificationChecks
-        .create({to: phone, code: code})
-        .then(resolve)
-        .catch(reject);
-    })
-}
->>>>>>> ee1f1288657640caca736f3d99baca0b1767621b:server/src/services/smsAPI.js