Merge pull request #68 from LinThit27/feature/auth

Bug:login for admin and staff

Author: Antaraes

controllers/authController.js

@@ -61,8 +61,11 @@ const signupForVerification = async (req, res) => {
 const loginForOrganzier = async (req, res) => {
   await login(req.body, Role.organzier, res, req);
 };
+const loginForStaff = async (req, res) => {
+  await login(req.body, Role.staff, res, req);
+};
 const loginForAdmin = async (req, res) => {
-  await login(req.body, Role.staff, res);
+  await login(req.body, Role.superAdmin, res, req);
 };
 const generateToken = (req, res) => {
   const refreshToken = req.cookies.refreshToken;
@@ -118,6 +121,7 @@ module.exports = {
   logout,
   otpGenerate,
   loginForAdmin,
+  loginForStaff,
   generateToken,
   loginForOrganzier,
   signupForStaff,

routers/authRouter.js

@@ -5,6 +5,7 @@ const {
   signupForVerification,
   loginForAdmin,
   loginForOrganzier,
+  loginForStaff,
   generateToken,
   otpGenerate,
   verifyOtp,
@@ -14,8 +15,9 @@ const {
 router.post("/signup_staff", signupForStaff);
 router.post("/signup_organizer", signupForOrganizer);
 router.get("/verify/:userId/:token", signupForVerification);
-router.post("/login_staff", loginForAdmin);
+router.post("/login_staff", loginForStaff);
 router.post("/login_organizer", loginForOrganzier);
+router.post("/login_admin", loginForAdmin);
 router.post("/refresh", generateToken);
 router.post("/get_otpcode", otpGenerate);
 router.post("/verify_otpcode", verifyOtp);

server.js

@@ -29,10 +29,10 @@ require("./config/db")();
 app.use("/api/v1", router);
 
 //Error Handler Middleware
-app.use(badRequestHandler);
-app.use(internalServerErrorHandler);
-app.use(methodNotAllowedHandler);
-app.use(notFoundHandler);
+// app.use(badRequestHandler);
+// app.use(internalServerErrorHandler);
+// app.use(methodNotAllowedHandler);
+// app.use(notFoundHandler);
 
 app.listen(process.env.PORT, function () {
   console.log("Server listening on", process.env.PORT);

services/loginService.js

@@ -17,10 +17,12 @@ const login = async (data, role, res, req) => {
     const schema = await loginSchema.validateAsync(data);
     const { email, password } = data;
     let foundUser;
+    console.log("email: " + email + " password: " + password);
     if (role === Role.organzier) {
       foundUser = await Organizer.findOne({ email: email });
     } else {
       foundUser = await Admin.findOne({ email: email });
+      console.log("foundUser", foundUser);
     }
 
     if (!foundUser) {
@@ -73,7 +75,7 @@ const login = async (data, role, res, req) => {
         user: {
           ...foundUser._doc,
         },
-        accessToken: `Bearer ${accessToken}`,
+        accessToken: `${accessToken}`,
         refreshToken: refreshToken,
         expiresIn: "30s",
       };

services/registerServices.js

@@ -101,18 +101,20 @@ const register = async (data, role, res) => {
     const userId = user._id;
 
     const send_message = `http://localhost:${process.env.CLIENT_PORT}/verification/${userId}/${token}`;
-    const paymentData = data.payment;
-    const response = [];
-    for (const payment of paymentData) {
-      try {
-        const addedPayment = await add_payment({
-          ...payment,
-          organizer: userId,
-        });
+    if (role == Role.organzier) {
+      const paymentData = data.payment;
+      const response = [];
+      for (const payment of paymentData) {
+        try {
+          const addedPayment = await add_payment({
+            ...payment,
+            organizer: userId,
+          });
 
-        response.push(addedPayment);
-      } catch (error) {
-        return res.json(error);
+          response.push(addedPayment);
+        } catch (error) {
+          return res.json(error);
+        }
       }
     }
     await sendEmail(data.email, "Verify Email", send_message);
@@ -138,8 +140,14 @@ const verification = async (req, res) => {
       (await Organizer.findOne({ _id: req.params.userId })) ||
       (await Admin.findOne({ _id: req.params.userId }));
     if (!user) return res.status(400).send("Invalid link");
-    await Organizer.updateOne({ _id: req.params.userId }, { $set: { isVerify: true, accountStatus:'active' } });
-    await Admin.updateOne({ _id: req.params.userId }, { $set: { isVerify: true ,accountStatus:'active'} });
+    await Organizer.updateOne(
+      { _id: req.params.userId },
+      { $set: { isVerify: true, accountStatus: "active" } }
+    );
+    await Admin.updateOne(
+      { _id: req.params.userId },
+      { $set: { isVerify: true, accountStatus: "active" } }
+    );
     res.send({ message: "Email Verified Successfully", success: true });
   } catch (error) {
     console.log(error);