removing skills from auth protected routes

.prettierrc

@@ -1,4 +1,4 @@
 {
-    "singleQuote": true,
-    "tabWidth": 4
+  "singleQuote": true,
+  "tabWidth": 4
 }

src/app.js

@@ -34,9 +34,9 @@ app.options('*', cors());
 // app.use(helmet.contentSecurityPolicy({}));
 
 const limiter = rateLimit({
-    max: 100,
-    windowMs: 60 * 60 * 1000,
-    message: 'Too many requests from this IP, please try again in an hour!'
+  max: 100,
+  windowMs: 60 * 60 * 1000,
+  message: 'Too many requests from this IP, please try again in an hour!'
 });
 app.use('/api', limiter);
 
@@ -57,20 +57,20 @@ app.use(xss());
 // app.use(hpp());
 //--------------------------------//
 app.use('/api/v1/auth', authRouter);
+app.use('/api/v1/skills', skillsRouter);
 app.use(isLogin);
 app.use('/api/v1/users', usersRouter);
 app.use('/api/v1/admins', adminRouter);
-app.use('/api/v1/skills', skillsRouter);
 app.use('/api/v1/mentors', mentorsRouter);
 app.use('/api/v1/courses', coursesRouter);
 app.use('/api/v1/reviews', reviewsRouter);
 app.use('/api/v1/friends', friendsRouter);
 app.use('/api/v1/meetings', meetingsRouter);
 
 app.all('*', (req, res, next) => {
-    res.status(res.locals.statusCode || 404).json({
-        message: 'Invalid route, please check URL'
-    });
+  res.status(res.locals.statusCode || 404).json({
+    message: 'Invalid route, please check URL'
+  });
 });
 //--------------------------------//
 app.use(globalErrorHandler);

src/controllers/meeting.controller.js

@@ -2,84 +2,89 @@ const Meeting = require('../models/meeting.model');
 const AppError = require('../utils/appErrorsClass');
 const catchAsyncError = require('../utils/catchAsyncErrors');
 const {
-  standMentorsMeeting,
-  standUsersMeeting
+    standMentorsMeeting,
+    standUsersMeeting
 } = require('../utils/ApiFeatures');
 // ------------- User Operations ------------//
 exports.getMyMeetings = catchAsyncError(async (req, res, next) => {
-  const userId = res.locals.userId;
+    const userId = res.locals.userId;
 
-  const meetingsQuery =
-    res.locals.userType === 'mentor'
-      ? { mentor: userId, status: { $nin: ['not-selected', 'rejected'] } }
-      : { user: userId };
-  const populateOptions =
-    res.locals.userType === 'mentor'
-      ? { path: 'user' }
-      : {
-          path: 'mentor',
-          populate: {
-            path: 'skill',
-            select: 'name'
-          }
-        };
+    const meetingsQuery =
+        res.locals.userType === 'mentor'
+            ? { mentor: userId, status: { $nin: ['not-selected', 'rejected'] } }
+            : { user: userId };
+    const populateOptions =
+        res.locals.userType === 'mentor'
+            ? { path: 'user' }
+            : {
+                  path: 'mentor',
+                  populate: {
+                      path: 'skill',
+                      select: 'name'
+                  }
+              };
 
-  const meetings = await Meeting.find(meetingsQuery).populate(populateOptions);
+    const meetings = await Meeting.find(meetingsQuery).populate(
+        populateOptions
+    );
 
-  const selectedMeetings = meetings.map(meeting => {
-    if (res.locals.userType === 'mentor') {
-      return standMentorsMeeting(meeting);
-    } else {
-      return standUsersMeeting(meeting);
-    }
-  });
+    const selectedMeetings = meetings.map(meeting => {
+        if (res.locals.userType === 'mentor') {
+            return standMentorsMeeting(meeting);
+        } else {
+            return standUsersMeeting(meeting);
+        }
+    });
 
-  res.status(res.locals.statusCode || 200).json({
-    status: 'success',
-    results: selectedMeetings.length,
-    data: selectedMeetings
-  });
+    res.status(res.locals.statusCode || 200).json({
+        status: 'success',
+        results: selectedMeetings.length,
+        data: selectedMeetings
+    });
 });
 
 exports.updateMeeting = catchAsyncError(async (req, res, next) => {
-  const status = req.body.status == 'accepted' ? 'accepted' : 'rejected';
-  const meeting = await Meeting.findOneAndUpdate(
-    { _id: req.params.id, status: 'pending' },
-    { status },
-    { new: true }
-  );
-  if (!meeting) return next(new AppError('No meeting found with that ID', 404));
+    const status = req.body.status == 'accepted' ? 'accepted' : 'rejected';
+    const meeting = await Meeting.findOneAndUpdate(
+        { _id: req.params.id, status: 'pending' },
+        { status },
+        { new: true }
+    );
+    if (!meeting)
+        return next(new AppError('No meeting found with that ID', 404));
 
-  res.status(res.locals.statusCode || 200).json({
-    status: 'success',
-    data: meeting
-  });
+    res.status(res.locals.statusCode || 200).json({
+        status: 'success',
+        data: meeting
+    });
 });
 
 exports.createMeeting = catchAsyncError(async (req, res, next) => {
-  const userId = res.locals.userId;
-  const meeting = await Meeting.findByIdAndUpdate(req.params.id, {
-    user: userId,
-    status: 'pending'
-  });
+    const userId = res.locals.userId;
+    const meeting = await Meeting.findByIdAndUpdate(req.params.id, {
+        user: userId,
+        status: 'pending'
+    });
 
-  if (!meeting) return next(new AppError('No meeting found with that ID', 404));
+    if (!meeting)
+        return next(new AppError('No meeting found with that ID', 404));
 
-  res.status(res.locals.statusCode || 201).json({
-    status: 'success',
-    data: meeting
-  });
+    res.status(res.locals.statusCode || 201).json({
+        status: 'success',
+        data: meeting
+    });
 });
 // ---------- Basic CRUD Operations ----------//
 exports.getMeeting = catchAsyncError(async (req, res, next) => {
-  const meeting = await Meeting.find({
-    mentor: req.params.id
-  });
-  if (!meeting) return next(new AppError('No meeting found with that ID', 404));
+    const meeting = await Meeting.find({
+        mentor: req.params.id
+    });
+    if (!meeting)
+        return next(new AppError('No meeting found with that ID', 404));
 
-  res.status(res.locals.statusCode || 200).json({
-    status: 'success',
-    length: meeting.length,
-    data: meeting
-  });
+    res.status(res.locals.statusCode || 200).json({
+        status: 'success',
+        length: meeting.length,
+        data: meeting
+    });
 });

src/routes/skill.routes.js

@@ -1,17 +1,20 @@
 const express = require('express');
+const { isLogin } = require('../controllers/auth.controller');
 const authController = require('../controllers/auth.controller');
 const skillController = require('../controllers/skill.controller.js');
+const app = require('../app');
 //-----------------------------------------//
 const router = express.Router();
 //-------------------Router----------------//
 router
-    .get('/', skillController.getAllSkills)
-    .get('/:id', skillController.getSkill);
+  .get('/', skillController.getAllSkills)
+  .get('/:id', skillController.getSkill);
 
+app.use(isLogin);
 router.use(authController.restrictTo('admin'));
 router
-    .post('/', skillController.createSkill)
-    .patch('/:id', skillController.updateSkill)
-    .delete('/:id', skillController.deleteSkill);
+  .post('/', skillController.createSkill)
+  .patch('/:id', skillController.updateSkill)
+  .delete('/:id', skillController.deleteSkill);
 //-------------------------------------------//
 module.exports = router;