fixed - auth required typo and validate tocken expresion (#11)

* fixed - auth required typo and validate tocken expresion

* fixed - version

---------

Co-authored-by: ct-amit <[email protected]>

Author: phoenixcoded20

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mock-data-api-nextjs",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": false,
   "scripts": {
     "dev": "next dev -p 3010",

package.json

@@ -3,4 +3,4 @@ export const JWT_API = {
   timeout: '1 days'
 };
 
-export const NO_AUTHENTICATION_REQUIRED = true;
+export const AUTHENTICATION_REQUIRED = false;

src/config.js

@@ -1,5 +1,5 @@
 import jwt from 'jsonwebtoken';
-import { JWT_API, NO_AUTHENTICATION_REQUIRED } from 'config';
+import { JWT_API } from 'config';
 import cors from 'utils/cors';
 import users from 'data/users.json';
 import { messages } from 'utils';
@@ -9,7 +9,7 @@ const JWT_SECRET = JWT_API.secret;
 const JWT_EXPIRES_TIME = JWT_API.timeout;
 
 export default async function handler(req, res) {
-  await cors(req, res, NO_AUTHENTICATION_REQUIRED);
+  await cors(req, res, false);
   const { email, password } = req.body;
   const user = users.find((_user) => _user.email === email);
 

src/pages/api/account/login.js

@@ -1,5 +1,5 @@
 // project imports
-import { JWT_API, NO_AUTHENTICATION_REQUIRED } from 'config';
+import { JWT_API } from 'config';
 import cors from 'utils/cors';
 import { verify } from 'jsonwebtoken';
 import users from 'data/users.json';
@@ -8,7 +8,7 @@ import users from 'data/users.json';
 const JWT_SECRET = JWT_API.secret;
 
 export default async function handler(req, res) {
-  await cors(req, res, NO_AUTHENTICATION_REQUIRED);
+  await cors(req, res);
   const { authorization } = req.headers;
   if (!authorization) {
     return res.status(401).json({ message: 'Token Missing' });

src/pages/api/account/me.js

@@ -1,10 +1,9 @@
 import cors from 'utils/cors';
 import users from 'data/users.json';
 import { messages } from 'utils';
-import { NO_AUTHENTICATION_REQUIRED } from 'config';
 
 export default async function handler(req, res) {
-  await cors(req, res, NO_AUTHENTICATION_REQUIRED);
+  await cors(req, res, false);
   const { id, email, password, firstName, lastName } = req.body;
   if (!email || !password) {
     return res.status(400).json({ message: messages.errorMessages.enterEmailAndPassword });

src/pages/api/account/register.js

@@ -1,8 +1,7 @@
 import cors from 'utils/cors';
 import dashboard from 'data/dashboard.json';
-import { NO_AUTHENTICATION_REQUIRED } from 'config';
 
 export default async function handler(req, res) {
-  await cors(req, res, NO_AUTHENTICATION_REQUIRED);
+  await cors(req, res);
   return res.status(200).json({ dashboard });
 }

src/pages/api/menu/dashboard.js

@@ -1,8 +1,7 @@
 import cors from 'utils/cors';
 import widget from 'data/widget.json';
-import { NO_AUTHENTICATION_REQUIRED } from 'config';
 
 export default async function handler(req, res) {
-  await cors(req, res, NO_AUTHENTICATION_REQUIRED);
+  await cors(req, res);
   return res.status(200).json({ widget });
 }

src/pages/api/menu/widget.js

@@ -1,5 +1,5 @@
 // project imports
-import { JWT_API } from 'config';
+import { AUTHENTICATION_REQUIRED, JWT_API } from 'config';
 import { verify } from 'jsonwebtoken';
 import users from 'data/users.json';
 
@@ -9,13 +9,13 @@ const JWT_SECRET = JWT_API.secret;
 // Helper method to wait for a middleware to execute before continuing
 // And to throw an error when an error happens in a middleware
 export default function initMiddleware(middleware) {
-  return (req, res, NO_AUTHENTICATION_REQUIRED = false) =>
+  return (req, res, validateToken = AUTHENTICATION_REQUIRED) =>
     new Promise((resolve, reject) => {
       middleware(req, res, (result) => {
         if (result instanceof Error) {
           return reject(result);
         }
-        if (!NO_AUTHENTICATION_REQUIRED) {
+        if (validateToken) {
           const { authorization } = req.headers;
           if (!authorization) {
             return res.status(401).json({ message: 'Token Missing' });