diff --git a/app.js b/app.js index 6321d6e..e3f7e23 100644 --- a/app.js +++ b/app.js @@ -33,11 +33,13 @@ app.use("/images", express.static("./src/public/images")); const { connectMongo, getCollection } = require("./src/database/connection"); let users; +let assets; async function initDatabase() { const db = await connectMongo(mongoURI, database); // For any collection, init here - users = await getCollection(db, "users"); + users = await getCollection(db, "users"); + assets = await getCollection(db, "assets"); } /*** ROUTINGS ***/ @@ -79,7 +81,7 @@ initDatabase().then(() => { // Import middleware & apply to user routes const middleware = require("./src/auth/middleware")(users); - app.use(require('./src/router/user')(middleware, users)); + app.use(require('./src/router/user')(middleware, users, assets)); // 404 handler app.get('/*splat', (req, res) => { diff --git a/src/auth/authentication.js b/src/auth/authentication.js index b71fa12..0a25931 100644 --- a/src/auth/authentication.js +++ b/src/auth/authentication.js @@ -3,6 +3,10 @@ const bcrypt = require('bcrypt'); const joi = require("joi"); const salt = 12; +/** + * @param {MongoClient.collection} users db collection + * @returns {express.Router} authentication router + */ module.exports = (users) => { const router = require("express").Router(); diff --git a/src/auth/middleware.js b/src/auth/middleware.js index 8eeaff2..1642da5 100644 --- a/src/auth/middleware.js +++ b/src/auth/middleware.js @@ -2,9 +2,8 @@ const status = require("../util/statuses"); const session = require("express-session"); /** - * createMiddleware returns a middleware function for express. - * @param {MongoClient.collection} users - * @return {async function} + * @param {MongoClient.collection} users db collection + * @returns {async function} middleware handler function */ const createMiddleware = (users) => { return async (req, res, next) => { diff --git a/src/public/scripts/selectAssetForm.js b/src/public/scripts/selectAssetForm.js index 6908766..b40a946 100644 --- a/src/public/scripts/selectAssetForm.js +++ b/src/public/scripts/selectAssetForm.js @@ -7,7 +7,7 @@ const assetForms = [ /** * selectAssetForm changes which form is displayed * to create specified assets. - * @param {string} assetId + * @param {string} assetFormId */ function selectAssetForm(assetFormId) { for (let i = 0; i < assetForms.length; i++) { diff --git a/src/router/user.js b/src/router/user.js index d534590..9a3897f 100644 --- a/src/router/user.js +++ b/src/router/user.js @@ -3,7 +3,13 @@ const bcrypt = require('bcrypt'); const joi = require("joi"); const salt = 12; -module.exports = (middleware, users) => { +/** + * @param {function} middleware handler + * @param {MongoClient.collection} users db collection + * @param {MongoClient.collection} assets db collection + * @returns {express.Router} user protected routes router + */ +module.exports = (middleware, users, assets) => { const router = require("express").Router(); router.use(middleware);