mohiit1502/plaidware-wms-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: conflict due to merge

Browse Source
This commit is contained in:
Sathishkumar Krishnan
2021-12-27 12:48:55 +05:30
parent a41987b327
commit 141997342b
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/controller/user.router.js
View File

@@ -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);

15
src/controller/utils/authorize.js
View File

@@ -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({

2
src/models/Level.js
View File

@@ -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;