From 141997342be1947ff97ef26cbd0d3b5f0bdc37f8 Mon Sep 17 00:00:00 2001
From: Sathishkumar Krishnan <satizkris@gmail.com>
Date: Mon, 27 Dec 2021 12:48:55 +0530
Subject: [PATCH] fix: conflict due to merge

---
 src/controller/user.router.js     |  3 +--
 src/controller/utils/authorize.js | 15 ++++++++++-----
 src/models/Level.js               |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/controller/user.router.js b/src/controller/user.router.js
index 7c0c39d..ffb840a 100644
--- a/src/controller/user.router.js
+++ b/src/controller/user.router.js
@@ -1,7 +1,6 @@
 const router = require("express").Router();
 const controller = require("./user.controller");
-const { AuthenticateMiddleware } = require("../config/auth");
-const { SuperAdminCheck } = require("./utils/authorize");
+const { SuperAdminCheck, AuthenticateMiddleware } = require("./utils/authorize");
 
 router.post("/register", controller.registerUser);
 router.post("/login", controller.loginUser);
diff --git a/src/controller/utils/authorize.js b/src/controller/utils/authorize.js
index 11e801e..ea92041 100644
--- a/src/controller/utils/authorize.js
+++ b/src/controller/utils/authorize.js
@@ -1,9 +1,12 @@
-const UserRole = require("../../models/UserRole");
-const { SUPER_ADMIN_ROLE, AUTHORIZATION_FAILURE_ERROR_MESSAGE } = require("../../config/constants");
 const jwt = require("jsonwebtoken");
-const { JWT_SECRET } = require("./env");
-const User = require("../models/User");
-const constants = require("./constants");
+const User = require("../../models/User");
+const UserRole = require("../../models/UserRole");
+const {
+  SUPER_ADMIN_ROLE,
+  AUTHORIZATION_FAILURE_ERROR_MESSAGE,
+} = require("../../config/constants");
+const { JWT_SECRET } = require("../../config/env");
+const constants = require("../../config/constants");
 
 const authenticate = async (token) => {
   const decodedToken = jwt.verify(token, JWT_SECRET);
@@ -50,6 +53,8 @@ module.exports = {
         const user = authenticate(token);
         res.locals.user = user;
         next();
+      } else {
+        throw new Error("Not Authenticated user!");
       }
     } catch (error) {
       res.status(401).send({
diff --git a/src/models/Level.js b/src/models/Level.js
index 43b04c0..3e7b010 100644
--- a/src/models/Level.js
+++ b/src/models/Level.js
@@ -51,6 +51,6 @@ const schema = new mongoose.Schema(
   }
 );
 
-const Level = mongoose.model("Level", schema);
+const Level = mongoose.models.Level || mongoose.model("Level", schema);
 
 module.exports = Level;