Merge pull request #26 from danial117/server_dev_8

initial commit
danial117 · Aug 22, 2024 · eb45031 · eb45031
2 parents 07032e2 + f4a22ff
commit eb45031
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ package-lock.json
 public/
 .env
 npm
-.gitigonre
+.gitignore
diff --git a/1724303412081-Dr._Hauschka.jpg b/1724303412081-Dr._Hauschka.jpg
diff --git a/middlewares/auth.js b/middlewares/auth.js
@@ -171,9 +171,13 @@ export const verifyAccessToken = (req, res, next) => {
         if (!user || !user.isAdmin) {
             return res.status(403).json({ message: 'Access denied' });
         }
-
-        req.user = user;
+        else{
+          req.user = user;
         next();
+
+        }
+
+
     } catch (err) {
       console.log(err)
         res.status(401).json({ message: 'Invalid token' });

diff --git a/routers/brand.js b/routers/brand.js
@@ -5,7 +5,7 @@ import { GetAdminBrands,AdminCreateBrand,GetBrands,GetBrandProducts, AdminModify
 import { upload } from '../middlewares/multerConfig.js';
 import { modifiedBrandFile } from '../middlewares/fileModified.js';
 
-
+import { adminAuthenticateJwt } from '../middlewares/auth.js';
 
 
 router.get('/',GetBrands)
@@ -16,11 +16,11 @@ router.get('/name/:brandName',GetBrandProducts)
 
 //Admin Routes
 
-router.post('/create',upload.single('file'),AdminCreateBrand)
-router.get('/show',GetAdminBrands)
-router.get('/show/:brandId',AdminGetBrand)
-router.put('/id/:brandId',upload.single('file'),modifiedBrandFile,AdminModifyBrand)
-router.delete('/:brandId',AdminDeleteBrand)
+router.post('/create',adminAuthenticateJwt,upload.single('file'),AdminCreateBrand)
+router.get('/show',adminAuthenticateJwt,GetAdminBrands)
+router.get('/show/:brandId',adminAuthenticateJwt,AdminGetBrand)
+router.put('/id/:brandId',adminAuthenticateJwt,upload.single('file'),modifiedBrandFile,AdminModifyBrand)
+router.delete('/:brandId,',adminAuthenticateJwt,AdminDeleteBrand)
 
 
 

diff --git a/routers/customerContact.js b/routers/customerContact.js
@@ -11,7 +11,7 @@ router.post('/request',CustomerContact)
 
 
 //admin routes
-router.get('/show',AdminGetUserContacts)
+router.get('/show',adminAuthenticateJwt,AdminGetUserContacts)
 router.get('/show/:contactId',adminAuthenticateJwt,AdminGetContact)
 router.delete('/:contactId',adminAuthenticateJwt,AdminDeleteContact)