Merge branch 'master' of https://github.com/code-squads/djcsi_code_squad into Vansh

Author: Vansh-Baghel

package-lock.json

@@ -29,6 +29,7 @@
     "react-dom": "18.2.0",
     "react-otp-input": "^3.0.0",
     "react-spinners": "^0.13.8",
+    "react-toastify": "^9.1.2",
     "tailwind-datepicker-react": "^1.2.3"
   },
   "devDependencies": {

package.json

@@ -11,6 +11,7 @@ if (process.env.NODE_ENV !== "production") {
 const { MONGODB_SRV_STRING, PORT } = require("./constants/config");
 const newEntity = require('./routes/newEntity');
 const auth = require('./routes/auth');
+const sms = require('./routes/sms');
 
 // Setting the MongoDB
 mongoose.set('strictQuery', true);
@@ -35,7 +36,7 @@ app.listen(PORT, () => console.log(`Server is running on ${PORT}`));
 
 
 // Preparing routers
-app.use(newEntity, auth);
+app.use(newEntity, auth, sms);
 
 
 

server/index.js

@@ -0,0 +1,79 @@
+const express = require('express');
+const router = express.Router();
+
+const { sendOTP, verifyOTP } = require("../services/smsAPI");
+
+// OTP routes
+router.post("/apis/sendOTP", (req, res) => {
+  const phone = `+91${req.body.phone}`;
+
+  if (!phone)
+    return res.status(400).send({
+      message: "Wrong phone number :(",
+      phone,
+      success: false,
+      data,
+    });
+
+    sendOTP(phone)
+    .then(() => {
+        res.status(200).send({
+            message: `OTP sent to ${phone}`
+        })
+    })
+    .catch((err) => {
+      console.log(err);
+      console.log(`Some err sending OTP to ${phone}`);
+      res.status(500).send({
+        message: "Server error, contact administrator",
+        phone,
+        success: false,
+        err,
+      });
+    });
+});
+
+// Verify Endpoint
+router.post("/apis/verifyOTP", (req, res) => {
+  const phone = `+91${req.body.phone}`;
+  const code = req.body.code;
+
+  if (!phone || code.length != CODE_LENGTH)
+    return res.status(400).send({
+      message: "Invalid phone number or code :(",
+      success: false,
+      phone,
+      code,
+    });
+
+  verifyOTP(phone, code)
+    .then((valid) => {
+      if (valid) {
+        console.log(`OTP approved  for ${phone}`);
+        return res.status(200).send({
+          message: "OTP is Verified successfuly!!",
+          success: true,
+        });
+      }
+      return res.status(203).send({
+        message: "Wrong code",
+        success: false,
+      });
+    })
+    .catch((error) => {
+      console.log(error);
+      console.log(
+        `Some err verifying OTP ${code} for ${phone}, maybe it is already verified`
+      );
+      res.status(500).send({
+        message: "Server error, contact administrator",
+        phone,
+        code,
+        success: false,
+        error,
+      });
+    });
+});
+
+
+module.exports = router;

server/routes/sms.js

@@ -0,0 +1,32 @@
+const TWILIO_ACCOUNT_SID = process.env.TWILIO_ACCOUNT_SID;
+const AUTH_TOKEN = process.env.AUTH_TOKEN;
+const SERVICE_ID = process.env.SERVICE_ID;
+
+console.log("Twilio params", {
+    TWILIO_ACCOUNT_SID,
+    AUTH_TOKEN,
+    SERVICE_ID
+});
+
+const twilioClient = require('twilio')(TWILIO_ACCOUNT_SID, AUTH_TOKEN);
+
+exports.sendOTP = (phone) => {
+    console.log("Hello")
+    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) => {
+        client.verify.v2.services(SERVICE_ID)
+        .verificationChecks
+        .create({to: phone, code: code})
+        .then(resolve)
+        .catch(reject);
+    })
+}