Merge pull request #89 from atlp-rwanda/fix-category

fix: fixed category fetching allowing all user to fetch availabe catgeories

.gitignore

@@ -5,3 +5,5 @@
 /uploads
 /.vscode
 /dist
+/demo.tsx
+

src/docs/swagger.ts

@@ -32,21 +32,15 @@ import {
   changeProductAvailability,
 } from "./products";
 import { getCategories, addCategories, getSingleCategory, updateCategories, deleteCategories, categorySchema } from "./categories";
-  import {
-    RoleSchema,
-    getRoles,
-    createRole,
-    updateRole,
-    deleteRole
-  } from "./roledoc";
+import { RoleSchema, getRoles, createRole, updateRole, deleteRole } from "./roledoc";
 import { AddToWishes, deleteWish, getWishes, getWishesByProduct, wishSchema } from "./wishes";
 import { addItemToCartDoc, clearAllProductFromCartDoc, removeProductFromCartDoc, updateProductQuantityDoc, viewCartDoc } from "./cart";
 import { getAllNotifications, readNotification } from "./notifications";
 import { homepage } from "./home";
 import { payment } from "./payments";
 import { createReviewProduct, deleteReview, getReviewProduct, reviewSchema, updateReviewProduct } from "./reviews";
 import { getAdProducts } from "./products";
-import {PrivateChatSchema, getAllUserPrivateChats, getUserToUserPrivateMessages, createPrivateChat } from "./privateChatDoc"
+import { PrivateChatSchema, getAllUserPrivateChats, getUserToUserPrivateMessages, createPrivateChat } from "./privateChatDoc";
 
 const docRouter = express.Router();
 
@@ -72,7 +66,7 @@ const options = {
   basePath: "/",
 
   tags: [
-    { name: "Home"},
+    { name: "Home" },
     { name: "Users", description: "Endpoints related to users" },
     {
       name: "Roles",
@@ -81,9 +75,9 @@ const options = {
     { name: "Products", description: "Endpoints related to products" },
     { name: "Categories", description: "Endpoints related categories" },
     { name: "Wishes", description: "Endpoints related to Wishes" },
-    { name: "Carts", description: "Endpoints related to Cart"},
+    { name: "Carts", description: "Endpoints related to Cart" },
     { name: "Payments", description: "Endpoints related to payments" },
-    {name: "PrivateChat", description: "Endpoints related to Private Chat"},
+    { name: "PrivateChat", description: "Endpoints related to Private Chat" },
   ],
 
   paths: {
@@ -123,7 +117,7 @@ const options = {
     },
 
     "/api/v1/users/me": {
-      post: verifyUserAccessToken,
+      get: verifyUserAccessToken,
     },
     "/api/v1/roles": {
       get: getRoles,
@@ -146,7 +140,7 @@ const options = {
       delete: deleteProducts,
     },
     "/api/v1/products/ads": {
-      get: getAdProducts
+      get: getAdProducts,
     },
     "/api/v1/categories": {
       get: getCategories,
@@ -169,7 +163,7 @@ const options = {
     },
     "/api/v1/products/{id}/wishes": {
       get: getWishesByProduct,
-      delete: deleteWish
+      delete: deleteWish,
     },
     "/api/v1/products/search": {
       get: searchProduct,
@@ -188,13 +182,13 @@ const options = {
       get: readNotification,
     },
     "/api/v1/payment/checkout": {
-      post: payment
+      post: payment,
     },
-    "/api/v1/products/{pid}/reviews":  {
+    "/api/v1/products/{pid}/reviews": {
       get: getReviewProduct,
       post: createReviewProduct,
       patch: updateReviewProduct,
-      delete: deleteReview
+      delete: deleteReview,
     },
     "/api/v1/chats/private": {
       get: getAllUserPrivateChats,
@@ -215,7 +209,7 @@ const options = {
       Category: categorySchema,
       Wish: wishSchema,
       Review: reviewSchema,
-      PrivateChat: PrivateChatSchema
+      PrivateChat: PrivateChatSchema,
     },
     securitySchemes: {
       bearerAuth: {

src/middlewares/verifyToken.ts

@@ -34,11 +34,7 @@ export const verifyToken = async (req: Request, res: Response) => {
         message: "Token has expired. Please login again.",
       });
     }
-    return res.status(200).json({
-      message: "You're Logged In Successfully",
-      username: user.username,
-      user,
-    });
+    return res.status(200).json(user);
   } catch (error: any) {
     return res.status(401).json({
       status: "failed",

src/routes/categoriesRoutes.ts

@@ -1,23 +1,16 @@
 import { Router } from "express";
 import { upload } from "../utils/uploadImages";
-import { 
-    fetchCategories,
-    addCategories,
-    fetchSingleCategory,
-    categoriesUpdate,
-    removeCategories
- } from "../controllers/categoriesControllers";
- import { validateSchema } from "../middlewares/validator";
+import { fetchCategories, addCategories, fetchSingleCategory, categoriesUpdate, removeCategories } from "../controllers/categoriesControllers";
+import { validateSchema } from "../middlewares/validator";
 import { categoriesDataSchema } from "../schemas/categorySchema";
 import { isAseller } from "../middlewares/sellerAuth";
 import { isLoggedIn } from "../middlewares/isLoggedIn";
 import { isPasswordOutOfDate } from "../middlewares/isPasswordOutOfDate";
 const categoriesRouter = Router();
-categoriesRouter.get("/",isLoggedIn,isPasswordOutOfDate,isAseller,fetchCategories);
-categoriesRouter.get("/:id",isLoggedIn,isPasswordOutOfDate,isAseller,fetchSingleCategory);
-categoriesRouter.post("/",isLoggedIn,isPasswordOutOfDate,isAseller,upload.single('image'),validateSchema(categoriesDataSchema)
-,addCategories);
-categoriesRouter.patch("/:id",isAseller,isPasswordOutOfDate,upload.single('image'),categoriesUpdate);
-categoriesRouter.delete("/:id",isLoggedIn,isPasswordOutOfDate,isAseller,removeCategories);
+categoriesRouter.get("/", fetchCategories);
+categoriesRouter.get("/:id", isLoggedIn, isPasswordOutOfDate, isAseller, fetchSingleCategory);
+categoriesRouter.post("/", isLoggedIn, isPasswordOutOfDate, isAseller, upload.single("image"), validateSchema(categoriesDataSchema), addCategories);
+categoriesRouter.patch("/:id", isAseller, isPasswordOutOfDate, upload.single("image"), categoriesUpdate);
+categoriesRouter.delete("/:id", isLoggedIn, isPasswordOutOfDate, isAseller, removeCategories);
 
-export default categoriesRouter;
+export default categoriesRouter;

src/routes/userRoutes.ts

@@ -1,5 +1,24 @@
 import { Router } from "express";
-import { fetchAllUsers, createUserController, userLogin, updatePassword, tokenVerification, handleSuccess, handleFailure,updateProfileController, getProfileController, otpVerification,updateUserRole, changeUserAccountStatus, logout, sendResetLinkEmail, resetPasswordController, verifyUserEmailController, verifyUserController, fetchAllsellers  } from "../controllers/userControllers";
+import {
+  fetchAllUsers,
+  createUserController,
+  userLogin,
+  updatePassword,
+  tokenVerification,
+  handleSuccess,
+  handleFailure,
+  updateProfileController,
+  getProfileController,
+  otpVerification,
+  updateUserRole,
+  changeUserAccountStatus,
+  logout,
+  sendResetLinkEmail,
+  resetPasswordController,
+  verifyUserEmailController,
+  verifyUserController,
+  fetchAllsellers,
+} from "../controllers/userControllers";
 import { emailValidation, validateSchema } from "../middlewares/validator";
 import { isLoggedIn } from "../middlewares/isLoggedIn";
 import { passwordUpdateSchema } from "../schemas/passwordUpdate";
@@ -19,41 +38,39 @@ import { isPasswordOutOfDate } from "../middlewares/isPasswordOutOfDate";
 import { isVerified } from "../middlewares/isVerified";
 const userRoutes = Router();
 
-userRoutes.get("/",isLoggedIn,isAdmin, fetchAllUsers);
-userRoutes.put("/passwordupdate", isLoggedIn, validateSchema(passwordUpdateSchema), updatePassword)
-userRoutes.post("/login", emailValidation,validateSchema(logInSchema),isDisabled,isVerified,userLogin);
+userRoutes.get("/", isLoggedIn, isAdmin, fetchAllUsers);
+userRoutes.put("/passwordupdate", isLoggedIn, validateSchema(passwordUpdateSchema), updatePassword);
+userRoutes.post("/login", emailValidation, validateSchema(logInSchema), isDisabled, isVerified, userLogin);
 userRoutes.post("/register", emailValidation, validateSchema(signUpSchema), createUserController);
 userRoutes.put("/passwordupdate", isLoggedIn, validateSchema(passwordUpdateSchema), updatePassword);
-userRoutes.get("/sellers", fetchAllsellers)
-userRoutes.put("/passwordupdate", isLoggedIn,validateSchema(passwordUpdateSchema), updatePassword)
-userRoutes.post("/login", emailValidation,validateSchema(logInSchema),isDisabled,userLogin);
-userRoutes.post("/register", emailValidation,validateSchema(signUpSchema), createUserController);
-userRoutes.get("/2fa-verify/:token",tokenVerification);
-userRoutes.post("/2fa-verify",otpVerification);
-userRoutes.get('/profile',
- isLoggedIn, isPasswordOutOfDate,
- getProfileController
-);
-userRoutes.post('/logout', isLoggedIn, logout);
-userRoutes.patch('/profile',
- isLoggedIn,isPasswordOutOfDate, 
- upload.single('profileImage'),
- validateSchema(profileSchemas),
- isUploadedFileImage,
- updateProfileController
+userRoutes.get("/sellers", fetchAllsellers);
+userRoutes.put("/passwordupdate", isLoggedIn, validateSchema(passwordUpdateSchema), updatePassword);
+userRoutes.post("/login", emailValidation, validateSchema(logInSchema), isDisabled, userLogin);
+userRoutes.post("/register", emailValidation, validateSchema(signUpSchema), createUserController);
+userRoutes.get("/2fa-verify/:token", tokenVerification);
+userRoutes.post("/2fa-verify", otpVerification);
+userRoutes.get("/profile", isLoggedIn, isPasswordOutOfDate, getProfileController);
+userRoutes.post("/logout", isLoggedIn, logout);
+userRoutes.patch(
+  "/profile",
+  isLoggedIn,
+  isPasswordOutOfDate,
+  upload.single("profileImage"),
+  validateSchema(profileSchemas),
+  isUploadedFileImage,
+  updateProfileController,
 );
-userRoutes.patch("/:id/role",isLoggedIn,isPasswordOutOfDate, isAdmin, validateSchema(roleUpdateSchema), userExist, roleExist, updateUserRole)
-userRoutes.patch('/:userId/status',isLoggedIn,isPasswordOutOfDate, isAdmin, changeUserAccountStatus);
+userRoutes.patch("/:id/role", isLoggedIn, isPasswordOutOfDate, isAdmin, validateSchema(roleUpdateSchema), userExist, roleExist, updateUserRole);
+userRoutes.patch("/:userId/status", isLoggedIn, isPasswordOutOfDate, isAdmin, changeUserAccountStatus);
 
 userRoutes.get("/auth/google", authenticateUser);
 userRoutes.get("/auth/google/callback", callbackFn);
 userRoutes.get("/auth/google/success", handleSuccess);
 userRoutes.get("/auth/google/failure", handleFailure);
-userRoutes.post('/password-reset-link', sendResetLinkEmail);
-userRoutes.patch('/reset-password', resetPasswordController);
-userRoutes.post('/verify-user-email', verifyUserEmailController);
-userRoutes.get('/verify-user', verifyUserController);
-
+userRoutes.post("/password-reset-link", sendResetLinkEmail);
+userRoutes.patch("/reset-password", resetPasswordController);
+userRoutes.post("/verify-user-email", verifyUserEmailController);
+userRoutes.get("/verify-user", verifyUserController);
 
 userRoutes.get("/me", verifyToken);