Merge pull request #109 from hngx-org/dev_correction

Dev correction

app.js

@@ -24,6 +24,7 @@ app.use(express.urlencoded({ extended: true }));
 
 app.use(
   cookieSession({
+    name: "server",
     key: process.env.KEY, // The name of the cookie to store the session data
     secret: process.env.SECRET, // A secret string used to sign and encrypt the cookie
     maxAge: 24 * 60 * 60 * 1000, // The maximum age of the cookie in milliseconds

controllers/userController/methods/loginGoogle.js

@@ -1,9 +1,11 @@
-function authGoogle(req, res,next) {
-    if(req.isAuthenticated()) {
-      res.send('Hello ' + req.user[0].name); // Should redirect to homepage in app
-    } else {
-      res.redirect('/');
-    }
-  }
-
-  export default authGoogle;
+import {
+  errorResponse,
+  successResponse,
+} from "../../../utils/helpers/response.helpers.js";
+function authGoogle(req, res) {
+  if (req.isAuthenticated())
+    return successResponse(res, "authenticated", { user: req.user }, 200);
+  return errorResponse(res, "failed authentication", 401);
+}
+
+export default authGoogle;

middleware/authentication.js

@@ -24,6 +24,7 @@ passport.use(
           return done(null, user);
         })
         .catch((err) => {
+          console.log(err);
           return done(new Error("Internal Server Error"));
         });
     },

package.json

@@ -35,7 +35,7 @@
     "http-status-codes": "^2.3.0",
     "joi": "^17.10.2",
     "mysql2": "^3.6.1",
-    "passport": "^0.6.0",
+    "passport": "~0.5",
     "passport-google-oauth2": "^0.2.0",
     "passport-twitter": "^1.0.4",
     "sequelize": "^6.33.0",

routes/authRoute.js

@@ -14,10 +14,7 @@ authRouter.get(
 authRouter.get("/auth/twitter", passport.authenticate("twitter"));
 authRouter.get(
   "/auth/callback/google",
-  passport.authenticate("google", {
-    failureRedirect: "/",
-    failureMessage: true,
-  }),
+  passport.authenticate("google"),
   loginGoogle,
 );
 authRouter.get("/auth/callback/twitter", loginTwitter);

routes/eventRoutes.js

@@ -3,26 +3,23 @@ import {
   createEvent,
   getEventDetails,
   listAllEvents,
-  deleteEvent
+  deleteEvent,
 } from "../controllers/eventController/index.js";
 import validate from "../middleware/validation.js";
 
-import {
-  AddCommentToEvent
-} from "../controllers/commentController/index.js"
+import { AddCommentToEvent } from "../controllers/commentController/index.js";
 import { userAuthorisation } from "../middleware/authorization.js";
 
-
 const eventRouter = express.Router();
 
 /* userAuthorisation middleware needs to 
 be imported and passed before the validate.Event
 in the createEvent route. It requires the req.session.userId. Ypu can refer to the createEvent method in the event controller */
-eventRouter.post("/events",userAuthorisation, validate.Event, createEvent);
-eventRouter.get("/events",userAuthorisation, listAllEvents);
-eventRouter.get("/events/:id",userAuthorisation, getEventDetails);
-eventRouter.delete("/events/:id",userAuthorisation, deleteEvent);
+eventRouter.post("/events", userAuthorisation, validate.Event, createEvent);
+eventRouter.get("/events", userAuthorisation, listAllEvents);
+eventRouter.get("/events/:id", userAuthorisation, getEventDetails);
+eventRouter.delete("/events/:id", userAuthorisation, deleteEvent);
 
-eventRouter.post("/events/:eventId", AddCommentToEvent);
+eventRouter.post("/events/:eventId", userAuthorisation, AddCommentToEvent);
 
 export default eventRouter;