Merge branch 'apis'

Author: OmkarPh

server/models/OwnerSchema.js

@@ -14,12 +14,12 @@ const ownerSchema = new mongoose.Schema({
   phone: {
     type: String,
     required: true,
-    unique: true,
+    // unique: true,
   },
   gstin: {
     type: String,
     required: true,
-    unique: true,
+    // unique: true,
   },
   password: {
     type: String,

server/models/PersonSchema.js

@@ -74,7 +74,7 @@ const personSchema = new mongoose.Schema({
   recommends: [
     {
       employer: {
-        type: String,
+        type: String, // gstin
         required: false,
       },
       message: {

server/routes/auth.js

@@ -6,6 +6,21 @@ const jwt = require('jsonwebtoken');
 const { Owner } = require("../models/OwnerSchema");
 const { JWT_SECRET } = require('../constants/config');
 
+
+function prepareJWT(owner){
+  return jwt.sign(
+    {
+      _id: owner._id,
+      restaurant_name: owner.restaurant_name,
+      address: owner.address,
+      phone: owner.phone,
+      gstin: owner.gstin,
+    },
+    JWT_SECRET,
+    { expiresIn: '2d' }
+  );
+}
+
 router.post('/api/auth/signup', async (req, res) => {
   try {
     // Check for mandatory fields
@@ -19,12 +34,35 @@ router.post('/api/auth/signup', async (req, res) => {
 
     // Create new owner object
     const owner = new Owner(req.body);
+
+    console.log("New owner", owner);
 
     // Save owner to database
     const savedOwner = await owner.save();
-    
-    // Return success response with ID of new owner
-    res.status(201).json({ message: 'New owner created successfully', id: savedOwner._id });
+
+    // Prepare the JWT with the owner's fields
+    const token = prepareJWT(savedOwner);
+
+    // Send the JWT in a cookie
+    // res.cookie('jwt', token, {
+    //   // httpOnly: true,
+    //   maxAge: 2 * 24 * 60 * 60 * 1000, // 2 days
+    //   sameSite: 'lax',
+    // });
+
+    // Return a success response with the owner's fields
+    return res.status(201).json({
+      success: true,
+      message: "New owner created successfully",
+      profile: {
+        _id: savedOwner._id,
+        restaurant_name: savedOwner.restaurant_name,
+        address: savedOwner.address,
+        phone: savedOwner.phone,
+        gstin: savedOwner.gstin,
+      },
+      token,
+    });
   } catch (err) {
     // Handle errors
     console.error(err);
@@ -64,17 +102,7 @@ router.post('/api/auth/login', async (req, res) => {
     }
 
     // Prepare the JWT with the owner's fields
-    const token = jwt.sign(
-      {
-        _id: owner._id,
-        restaurant_name: owner.restaurant_name,
-        address: owner.address,
-        phone: owner.phone,
-        gstin: owner.gstin,
-      },
-      JWT_SECRET,
-      { expiresIn: '2d' }
-    );
+    const token = prepareJWT(owner);
 
     // Send the JWT in a cookie
     // res.cookie('jwt', token, {

server/routes/sms.js

@@ -5,6 +5,7 @@ const { sendOTP, verifyOTP } = require("../services/smsAPI");
 
 // OTP routes
 router.post("/apis/sendOTP", (req, res) => {
+  console.log(req.body);
   const phone = `+91${req.body.phone}`;
 
   if (!phone)
@@ -28,7 +29,6 @@ router.post("/apis/sendOTP", (req, res) => {
         message: "Server error, contact administrator",
         phone,
         success: false,
-        err,
       });
     });
 });
@@ -38,7 +38,7 @@ router.post("/apis/verifyOTP", (req, res) => {
   const phone = `+91${req.body.phone}`;
   const code = req.body.code;
 
-  if (!phone || code.length != CODE_LENGTH)
+  if (!phone || !code.length)
     return res.status(400).send({
       message: "Invalid phone number or code :(",
       success: false,

server/services/smsAPI.js

@@ -11,7 +11,6 @@ console.log("Twilio params", {
 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
@@ -23,7 +22,7 @@ exports.sendOTP = (phone) => {
 
 exports.verifyOTP = (phone, code) => {
     return new Promise((resolve, reject) => {
-        client.verify.v2.services(SERVICE_ID)
+        twilioClient.verify.v2.services(SERVICE_ID)
         .verificationChecks
         .create({to: phone, code: code})
         .then(resolve)

src/components/otpVerification.jsx

@@ -1,19 +1,38 @@
+import axios from 'axios';
 import React, { useState } from 'react'
 import { Button } from 'flowbite-react'
 import OtpInput from 'react-otp-input';
+import { toast } from 'react-toastify';
+import { SERVER_URL } from '../constants/config';
 
-const OTPVerification = () => {
+const OTPVerification = (props) => {
   const [otp, setOtp] = useState('');
 
   const verifyOTPHandler = () => {
-    console.log(otp)
+    console.log("Verify otp:", otp);
+    // props.postVerification();
+
+    axios
+      .post(`${SERVER_URL}/apis/verifyOTP`, { phone: props.phone, code: otp })
+      .then((res) => {
+        if(res.data.success){
+          toast.success("Verified OTP successfuly !");
+          props.postVerification();
+        } else {
+          toast.error("Invalid OTP !");
+        }
+      })
+    //   .catch((err) => {
+    //     console.error(err);
+    //     toast.error("Some error verifying OTP");
+    //   });
   }
 
   return (
     <div className='flex flex-col mt-[40px]'>
       <div>
         <span className='text-[20px]'>We have sent you an OTP on</span><br/>
-        <span className='text-gray-600 dark:text-gray-200 mt-[10px]'>+91 9137357003</span>
+        <span className='text-gray-600 dark:text-gray-200 mt-[10px]'>+91 {props.phone}</span>
       </div>
 
       <div className='flex flex-col justify-center items-center'>

src/constants/config.js

@@ -1 +1 @@
-export const SERVER_URL = process.env.NEXT_APP_SERVER_URL || "http://localhost:5001";
+export const SERVER_URL = process.env.NEXT_APP_SERVER_URL || "http://localhost:5001";