diff --git a/client/src/contexts/authContext/index.jsx b/client/src/contexts/authContext/index.jsx
index ecc4d83..6727e29 100644
--- a/client/src/contexts/authContext/index.jsx
+++ b/client/src/contexts/authContext/index.jsx
@@ -52,7 +52,8 @@ export function AuthProvider({ children }) {
isEmailUser,
isGoogleUser,
currentUser,
- setCurrentUser
+ setCurrentUser,
+ setUserLoggedIn
};
return (
diff --git a/client/src/firebase/auth.js b/client/src/firebase/auth.js
index 63cf30b..9c02876 100644
--- a/client/src/firebase/auth.js
+++ b/client/src/firebase/auth.js
@@ -1,4 +1,4 @@
-import { auth } from "./firebase";
+import { auth } from "./firebase.js";
import {
createUserWithEmailAndPassword,
signInWithEmailAndPassword,
diff --git a/server/.env.sample b/server/.env.sample
index e69fe55..dd13ce7 100644
--- a/server/.env.sample
+++ b/server/.env.sample
@@ -23,7 +23,8 @@ EMAIL_USER = ""
EMAIL_PASS = ""
GOOGLE_CLIENT_ID = ""
JWT_SECRET = ""
-
+TWILIO_ACCOUNT_SID=""
+TWILIO_AUTH_TOKEN=""
EMAIL_ID=
PASS_KEY=
-ADMIN_EMAIL_ID=
\ No newline at end of file
+ADMIN_EMAIL_ID=
diff --git a/server/Controllers/auth.js b/server/Controllers/auth.js
index 1e084cb..87b9cf1 100644
--- a/server/Controllers/auth.js
+++ b/server/Controllers/auth.js
@@ -4,6 +4,8 @@ const nodemailer = require("nodemailer");
const crypto = require("crypto");
require('dotenv').config(); // Load environment variables from .env file
+const client = require('twilio')(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN);
+
// Signup route
const createUser = async (req, res) => {
const VITE_CLIENT_PORT = process.env.VITE_CLIENT_PORT || "https://bitbox-in.netlify.app";
@@ -16,9 +18,9 @@ const createUser = async (req, res) => {
const image = `https://api.dicebear.com/5.x/initials/svg?seed=${name}`;
// Create a new user (save in your database)
- const user = new User({ image: image, name, email, password: hashedPassword, verified: false });
+ const user = new User({ imageUrl: image, name, email, password: hashedPassword, verified: false });
await user.save();
-
+
const verificationToken = crypto.randomBytes(32).toString("hex");
user.verificationToken = verificationToken;
await user.save();
@@ -52,6 +54,7 @@ const createUser = async (req, res) => {
}
});
} catch (error) {
+ console.log(error);
res.status(500).json({ success: false, message: 'An error occurred during signup' });
}
};
@@ -174,9 +177,48 @@ const forgetpassword = async (req, res) => {
}
};
+const sendOtp = async (req, res)=> {
+ const { number } = req.body;
+
+ const otp = Math.floor(100000 + Math.random() * 900000).toString();
+
+ const result = await client.messages.create({
+ body: `Yout OTP is ${otp}`,
+ messagingServiceSid: "MG6cd72a2fcb56205180ce4878359484cc",
+ to: "+91" + number
+ })
+
+ res.cookie('otp', otp, {
+ maxAge: 24 * 60 * 60 * 1000,
+ httpOnly: true,
+ secure: true,
+ sameSite: 'None',
+ });
+
+ return res.status(200).json({success: true, message: "OTP sent successfully"})
+}
+
+const verifyOtp = async (req, res)=>{
+ const {otp} = req.body;
+
+ console.log(req.cookies);
+
+ const correctOtp = await req.cookies.otp
+
+ if(correctOtp != otp){
+ return res.status(400).json({success: false, message: "Incorrect OTP"})
+ }
+
+ res.clearCookie('otp');
+
+ return res.status(200).json({success: true, message: "OTP verified successfully"})
+}
+
module.exports = {
forgetpassword,
createUser,
verifyToken,
ResetPasswordByEmail,
+ sendOtp,
+ verifyOtp
};
diff --git a/server/index.js b/server/index.js
index db4c039..300c76a 100644
--- a/server/index.js
+++ b/server/index.js
@@ -4,12 +4,14 @@ const connectToMongo = require("./db");
const cors = require("cors");
const helmet = require("helmet");
const Avatar = require("./Models/Avatar");
+const cookieParser = require('cookie-parser');
require("dotenv").config(); // Load environment variables from .env file
// Connect to MongoDB
connectToMongo();
const app = express();
+app.use(cookieParser());
const httpServer = require("http").createServer(app);
const io = new Server(httpServer, {
cors: {
@@ -33,6 +35,7 @@ app.use(
cors({
origin: "*", // Update to specific origins in production
methods: ["GET", "POST", "OPTIONS", "PUT"],
+ credentials: true,
})
);
diff --git a/server/package-lock.json b/server/package-lock.json
index 8634f66..6d583cf 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -11,6 +11,7 @@
"dependencies": {
"bcrypt": "^5.1.1",
"bcryptjs": "^2.4.3",
+ "cookie-parser": "^1.4.7",
"cors": "^2.8.5",
"dotenv": "^16.4.4",
"express": "^4.18.2",
@@ -26,7 +27,8 @@
"multer": "^1.4.5-lts.1",
"nodemailer": "^6.9.15",
"opensource-backend": "file:",
- "socket.io": "^4.7.5"
+ "socket.io": "^4.7.5",
+ "twilio": "^5.3.5"
},
"devDependencies": {
"nodemon": "^3.1.7"
@@ -902,6 +904,23 @@
"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
"license": "MIT"
},
+ "node_modules/asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+ "license": "MIT"
+ },
+ "node_modules/axios": {
+ "version": "1.7.7",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+ "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
+ "license": "MIT",
+ "dependencies": {
+ "follow-redirects": "^1.15.6",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
+ }
+ },
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1161,6 +1180,18 @@
"color-support": "bin.js"
}
},
+ "node_modules/combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "license": "MIT",
+ "dependencies": {
+ "delayed-stream": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1218,6 +1249,28 @@
"node": ">= 0.6"
}
},
+ "node_modules/cookie-parser": {
+ "version": "1.4.7",
+ "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz",
+ "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==",
+ "license": "MIT",
+ "dependencies": {
+ "cookie": "0.7.2",
+ "cookie-signature": "1.0.6"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/cookie-parser/node_modules/cookie": {
+ "version": "0.7.2",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+ "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/cookie-signature": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -1243,6 +1296,12 @@
"node": ">= 0.10"
}
},
+ "node_modules/dayjs": {
+ "version": "1.11.13",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+ "license": "MIT"
+ },
"node_modules/debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1269,6 +1328,15 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
"node_modules/delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -1607,6 +1675,40 @@
"@firebase/vertexai-preview": "0.0.4"
}
},
+ "node_modules/follow-redirects": {
+ "version": "1.15.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+ "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/RubenVerborgh"
+ }
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=4.0"
+ },
+ "peerDependenciesMeta": {
+ "debug": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/form-data": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+ "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+ "license": "MIT",
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/forwarded": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -2987,6 +3089,12 @@
"node": ">= 0.10"
}
},
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+ "license": "MIT"
+ },
"node_modules/pstree.remy": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
@@ -3127,6 +3235,12 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
"license": "MIT"
},
+ "node_modules/scmp": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/scmp/-/scmp-2.1.0.tgz",
+ "integrity": "sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q==",
+ "license": "BSD-3-Clause"
+ },
"node_modules/semver": {
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -3528,6 +3642,24 @@
"integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
"license": "0BSD"
},
+ "node_modules/twilio": {
+ "version": "5.3.5",
+ "resolved": "https://registry.npmjs.org/twilio/-/twilio-5.3.5.tgz",
+ "integrity": "sha512-f/sA1Yd6TyIzfcq0u4QDGU+93afwswsJB+rf3T08tvBAMobBDVR3DfGREwJr5jp8xUic0qWa7GbJidk16NA4bg==",
+ "license": "MIT",
+ "dependencies": {
+ "axios": "^1.7.4",
+ "dayjs": "^1.11.9",
+ "https-proxy-agent": "^5.0.0",
+ "jsonwebtoken": "^9.0.2",
+ "qs": "^6.9.4",
+ "scmp": "^2.1.0",
+ "xmlbuilder": "^13.0.2"
+ },
+ "engines": {
+ "node": ">=14.0"
+ }
+ },
"node_modules/type-is": {
"version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -3716,6 +3848,15 @@
}
}
},
+ "node_modules/xmlbuilder": {
+ "version": "13.0.2",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
+ "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0"
+ }
+ },
"node_modules/xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/server/package.json b/server/package.json
index 7f35ab6..0bf0e4e 100644
--- a/server/package.json
+++ b/server/package.json
@@ -19,6 +19,7 @@
"dependencies": {
"bcrypt": "^5.1.1",
"bcryptjs": "^2.4.3",
+ "cookie-parser": "^1.4.7",
"cors": "^2.8.5",
"dotenv": "^16.4.4",
"express": "^4.18.2",
@@ -34,7 +35,8 @@
"multer": "^1.4.5-lts.1",
"nodemailer": "^6.9.15",
"opensource-backend": "file:",
- "socket.io": "^4.7.5"
+ "socket.io": "^4.7.5",
+ "twilio": "^5.3.5"
},
"devDependencies": {
"nodemon": "^3.1.7"
diff --git a/server/routes/auth.js b/server/routes/auth.js
index 7cd79fc..198118d 100644
--- a/server/routes/auth.js
+++ b/server/routes/auth.js
@@ -15,6 +15,8 @@ const {
verifyToken,
createUser,
ResetPasswordByEmail,
+ verifyOtp,
+ sendOtp
} = require("../Controllers/auth");
// Configure Firebase OAuth2Client
@@ -161,5 +163,7 @@ router.post("/forget", forgetpassword);
router.post("/createUser", createUser);
router.post("/verify/:token", verifyToken);
router.post("/ResetByEmail", ResetPasswordByEmail);
+router.post("/sendotp", sendOtp);
+router.post("/verifyotp", verifyOtp);
module.exports = router;