diff --git a/api/auth/auth-middleware.js b/api/auth/auth-middleware.js index c603d37c7..779f6b2df 100644 --- a/api/auth/auth-middleware.js +++ b/api/auth/auth-middleware.js @@ -1,7 +1,85 @@ -const { JWT_SECRET } = require("../secrets"); // use this secret! +const jwt = require("jsonwebtoken"); +const { JWT_SECRET } = require("../secrets"); +const Users = require("./../users/users-model"); const restricted = (req, res, next) => { - /* + const token = req.headers.authorization; + + if (!token) { + next({ status: 401, message: "Token required" }); + } else { + jwt.verify(token, JWT_SECRET, (err, decoded) => { + if (err) { + delete req.decodedJwt; + next({ + status: 401, + message: "Token invalid", + }); + } else { + req.decodedJwt = decoded; + next(); + } + }); + } +}; + +const only = (role_name) => (req, res, next) => { + if (req.decodedJwt.role_name !== role_name) { + next({ + status: 403, + message: "This is not for you", + }); + } else { + next(); + } +}; + +const checkUsernameExists = async (req, res, next) => { + try { + const { username } = req.body; + const user = await Users.findBy({ username }); + if (user.length === 0) { + next({ status: 401, message: "Invalid credentials" }); + } else { + req.userFromDb = user[0]; + next(); + } + } catch (err) { + next(err); + } +}; + +const validateRoleName = (req, res, next) => { + if (req.body.role_name === undefined) { + req.body.role_name = "student"; + next(); + } else { + const trimmedRole = req.body.role_name.trim(); + if (!trimmedRole) { + req.body.role_name = "student"; + next(); + } else if (trimmedRole === "admin") { + next({ status: 422, message: "Role name can not be admin" }); + } else if (trimmedRole.length > 32) { + next({ + status: 422, + message: "Role name can not be longer than 32 chars", + }); + } else { + req.body.role_name = trimmedRole; + next(); + } + } +}; + +module.exports = { + restricted, + checkUsernameExists, + validateRoleName, + only, +}; + +/* RESTRICTED If the user does not provide a token in the Authorization header: status 401 { @@ -16,10 +94,8 @@ const restricted = (req, res, next) => { Put the decoded token in the req object, to make life easier for middlewares downstream! */ -} -const only = role_name => (req, res, next) => { - /* +/*ONLY If the user does not provide a token in the Authorization header with a role_name inside its payload matching the role_name passed to this function as its argument: status 403 @@ -29,22 +105,17 @@ const only = role_name => (req, res, next) => { Pull the decoded token from the req object, to avoid verifying it again! */ -} - +// next(); -const checkUsernameExists = (req, res, next) => { - /* +/* CHECK USERNAME EXISTS If the username in req.body does NOT exist in the database status 401 { "message": "Invalid credentials" } */ -} - -const validateRoleName = (req, res, next) => { - /* +/* VALIDATE ROLE NAME If the role_name in the body is valid, set req.role_name to be the trimmed string and proceed. If role_name is missing from req.body, or if after trimming it is just an empty string, @@ -62,11 +133,3 @@ const validateRoleName = (req, res, next) => { "message": "Role name can not be longer than 32 chars" } */ -} - -module.exports = { - restricted, - checkUsernameExists, - validateRoleName, - only, -} diff --git a/api/auth/auth-router.js b/api/auth/auth-router.js index c723c2da8..53b7a1187 100644 --- a/api/auth/auth-router.js +++ b/api/auth/auth-router.js @@ -1,9 +1,49 @@ const router = require("express").Router(); -const { checkUsernameExists, validateRoleName } = require('./auth-middleware'); -const { JWT_SECRET } = require("../secrets"); // use this secret! +const bcrypt = require("bcryptjs"); +const Users = require("./../users/users-model"); +const jwt = require("jsonwebtoken"); +const { checkUsernameExists, validateRoleName } = require("./auth-middleware"); +const { JWT_SECRET } = require("../secrets"); -router.post("/register", validateRoleName, (req, res, next) => { - /** +router.post("/register", validateRoleName, async (req, res, next) => { + let user = req.body; + + const rounds = process.env.BCRYPT_ROUNDS || 8; + const hash = bcrypt.hashSync(user.password, rounds); + + user.password = hash; + + try { + const newUser = await Users.add(user); + res.status(201).json(newUser); + } catch (err) { + next(err); + } +}); + +router.post("/login", checkUsernameExists, (req, res, next) => { + const { username, password } = req.body; + const { userFromDb } = req; + + if (bcrypt.compareSync(password, userFromDb.password)) { + const payload = { + subject: userFromDb.user_id, + username: userFromDb.username, + role_name: userFromDb.role_name, + }; + const options = { + expiresIn: "1d", + }; + const token = jwt.sign(payload, JWT_SECRET, options); + res.status(200).json({ message: `${username} is back!`, token }); + } else { + next({ status: 401, message: "Invalid credentials" }); + } +}); + +module.exports = router; + +/** [POST] /api/auth/register { "username": "anna", "password": "1234", "role_name": "angel" } response: @@ -14,11 +54,8 @@ router.post("/register", validateRoleName, (req, res, next) => { "role_name": "angel" } */ -}); - -router.post("/login", checkUsernameExists, (req, res, next) => { - /** +/** [POST] /api/auth/login { "username": "sue", "password": "1234" } response: @@ -37,6 +74,3 @@ router.post("/login", checkUsernameExists, (req, res, next) => { "role_name": "admin" // the role of the authenticated user } */ -}); - -module.exports = router; diff --git a/api/secrets/index.js b/api/secrets/index.js index 1a125b81e..155607a81 100644 --- a/api/secrets/index.js +++ b/api/secrets/index.js @@ -1,3 +1,8 @@ +module.exports = { + JWT_SECRET: process.env.JWT_SECRET || "shh", +}; + + /** Fix this module so other modules can require JWT_SECRET into them. Use the || operator to fall back to the string "shh" to handle the situation @@ -6,6 +11,3 @@ If no fallback is provided, TESTS WON'T WORK and other developers cloning this repo won't be able to run the project as is. */ -module.exports = { - -} diff --git a/api/users/users-model.js b/api/users/users-model.js index 7a2064834..a38736ca6 100644 --- a/api/users/users-model.js +++ b/api/users/users-model.js @@ -1,7 +1,62 @@ -const db = require('../../data/db-config.js'); +const db = require("../../data/db-config.js"); -function find() { - /** +async function find() { + const users = db("users as u") + .select("u.user_id", "u.username", "r.role_name") + .join("roles as r", "r.role_id", "u.role_id"); + + return users; +} + +async function findBy(filter) { + const user = await db("users as u") + .select("u.user_id", "u.username", "u.password", "r.role_name") + .join("roles as r", "r.role_id", "u.role_id") + .where(filter); + + return user; +} + +async function findById(user_id) { + const user = await db("users as u") + .select("u.user_id", "u.username", "r.role_name") + .join("roles as r", "r.role_id", "u.role_id") + .where("user_id", user_id); + + return user[0]; +} + +async function add({ username, password, role_name }) { + // done for you + let created_user_id; + await db.transaction(async (trx) => { + let role_id_to_use; + const [role] = await trx("roles").where("role_name", role_name); + if (role) { + role_id_to_use = role.role_id; + } else { + const [role_id] = await trx("roles").insert({ role_name: role_name }); + role_id_to_use = role_id; + } + const [user_id] = await trx("users").insert({ + username, + password, + role_id: role_id_to_use, + }); + created_user_id = user_id; + }); + + return findById(created_user_id); +} + +module.exports = { + add, + find, + findBy, + findById, +}; + +/** FIND You will need to join two tables. Resolves to an ARRAY with all users. @@ -18,10 +73,8 @@ function find() { } ] */ -} -function findBy(filter) { - /** +/** FINDBY You will need to join two tables. Resolves to an ARRAY with all users that match the filter condition. @@ -34,10 +87,8 @@ function findBy(filter) { } ] */ -} -function findById(user_id) { - /** +/** FINDBYID You will need to join two tables. Resolves to the user with the given user_id. @@ -47,9 +98,8 @@ function findById(user_id) { "role_name": "instructor" } */ -} -/** +/** ADD Creating a user requires a single insert (into users) if the role record with the given role_name already exists in the db, or two inserts (into roles and then into users) if the given role_name does not exist yet. @@ -67,26 +117,3 @@ function findById(user_id) { "role_name": "team lead" } */ -async function add({ username, password, role_name }) { // done for you - let created_user_id - await db.transaction(async trx => { - let role_id_to_use - const [role] = await trx('roles').where('role_name', role_name) - if (role) { - role_id_to_use = role.role_id - } else { - const [role_id] = await trx('roles').insert({ role_name: role_name }) - role_id_to_use = role_id - } - const [user_id] = await trx('users').insert({ username, password, role_id: role_id_to_use }) - created_user_id = user_id - }) - return findById(created_user_id) -} - -module.exports = { - add, - find, - findBy, - findById, -}; diff --git a/api/users/users-router.js b/api/users/users-router.js index 48baddc06..8fbe62867 100644 --- a/api/users/users-router.js +++ b/api/users/users-router.js @@ -2,6 +2,26 @@ const router = require("express").Router(); const Users = require("./users-model.js"); const { restricted, only } = require("../auth/auth-middleware.js"); + +router.get("/", restricted, (req, res, next) => { + Users.find() + .then((users) => { + res.json(users); + }) + .catch(next); +}); + + +router.get("/:user_id", restricted, only("admin"), (req, res, next) => { + Users.findById(req.params.user_id) + .then((user) => { + res.json(user); + }) + .catch(next); +}); + +module.exports = router; + /** [GET] /api/users @@ -17,15 +37,8 @@ const { restricted, only } = require("../auth/auth-middleware.js"); } ] */ -router.get("/", restricted, (req, res, next) => { // done for you - Users.find() - .then(users => { - res.json(users); - }) - .catch(next); -}); -/** + /** [GET] /api/users/:user_id This endpoint is RESTRICTED: only authenticated users with role 'admin' @@ -40,12 +53,3 @@ router.get("/", restricted, (req, res, next) => { // done for you } ] */ -router.get("/:user_id", restricted, only('admin'), (req, res, next) => { // done for you - Users.findById(req.params.user_id) - .then(user => { - res.json(user); - }) - .catch(next); -}); - -module.exports = router; diff --git a/data/auth.db3 b/data/auth.db3 index 568bc34c7..83bcfcd04 100644 Binary files a/data/auth.db3 and b/data/auth.db3 differ diff --git a/index.js b/index.js index 71f14885b..b96a10d8f 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,5 @@ -const server = require('./api/server.js'); +require("dotenv").config(); +const server = require("./api/server.js"); const PORT = process.env.PORT || 9000; diff --git a/package-lock.json b/package-lock.json index 4c7839920..566eff1dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,10 @@ "dependencies": { "bcryptjs": "^2.4.3", "cors": "^2.8.5", + "dotenv": "^10.0.0", "express": "^4.17.1", "helmet": "^4.6.0", + "jsonwebtoken": "^8.5.1", "knex": "^0.95.11", "sqlite3": "^5.0.2" }, @@ -1739,6 +1741,11 @@ "node-int64": "^0.4.0" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -2380,6 +2387,14 @@ "node": ">=8" } }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, "node_modules/duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -2396,6 +2411,14 @@ "safer-buffer": "^2.1.0" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -4623,6 +4646,35 @@ "node": ">=6" } }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -4638,6 +4690,25 @@ "verror": "1.10.0" } }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/jwt-decode": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", @@ -4769,12 +4840,47 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "node_modules/lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -8613,6 +8719,11 @@ "node-int64": "^0.4.0" } }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -9106,6 +9217,11 @@ "is-obj": "^2.0.0" } }, + "dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" + }, "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -9122,6 +9238,14 @@ "safer-buffer": "^2.1.0" } }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -10849,6 +10973,30 @@ "minimist": "^1.2.5" } }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -10861,6 +11009,25 @@ "verror": "1.10.0" } }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "jwt-decode": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", @@ -10953,12 +11120,47 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", diff --git a/package.json b/package.json index 2252417b8..b6b426249 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "migrate": "knex migrate:latest", "rollback": "knex migrate:rollback", "seed": "knex seed:run", - "test": "cross-env NODE_ENV=testing jest --verbose --runInBand" + "test": "cross-env NODE_ENV=testing jest --watchAll --verbose --runInBand" }, "devDependencies": { "@types/jest": "^27.0.2", @@ -21,8 +21,10 @@ "dependencies": { "bcryptjs": "^2.4.3", "cors": "^2.8.5", + "dotenv": "^10.0.0", "express": "^4.17.1", "helmet": "^4.6.0", + "jsonwebtoken": "^8.5.1", "knex": "^0.95.11", "sqlite3": "^5.0.2" },