update/doc comments + create assets collection
This commit is contained in:
5 files changed
+18
-7
No files matched your search
@@ -33,11 +33,13 @@ app.use("/images", express.static("./src/public/images"));
|
|||||||
const { connectMongo, getCollection } = require("./src/database/connection");
|
const { connectMongo, getCollection } = require("./src/database/connection");
|
||||||
|
|
||||||
let users;
|
let users;
|
||||||
|
let assets;
|
||||||
async function initDatabase() {
|
async function initDatabase() {
|
||||||
const db = await connectMongo(mongoURI, database);
|
const db = await connectMongo(mongoURI, database);
|
||||||
|
|
||||||
// For any collection, init here
|
// For any collection, init here
|
||||||
users = await getCollection(db, "users");
|
users = await getCollection(db, "users");
|
||||||
|
assets = await getCollection(db, "assets");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*** ROUTINGS ***/
|
/*** ROUTINGS ***/
|
||||||
@@ -79,7 +81,7 @@ initDatabase().then(() => {
|
|||||||
|
|
||||||
// Import middleware & apply to user routes
|
// Import middleware & apply to user routes
|
||||||
const middleware = require("./src/auth/middleware")(users);
|
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
|
// 404 handler
|
||||||
app.get('/*splat', (req, res) => {
|
app.get('/*splat', (req, res) => {
|
||||||
|
|||||||
@@ -3,6 +3,10 @@ const bcrypt = require('bcrypt');
|
|||||||
const joi = require("joi");
|
const joi = require("joi");
|
||||||
const salt = 12;
|
const salt = 12;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {MongoClient.collection} users db collection
|
||||||
|
* @returns {express.Router} authentication router
|
||||||
|
*/
|
||||||
module.exports = (users) => {
|
module.exports = (users) => {
|
||||||
const router = require("express").Router();
|
const router = require("express").Router();
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,8 @@ const status = require("../util/statuses");
|
|||||||
const session = require("express-session");
|
const session = require("express-session");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* createMiddleware returns a middleware function for express.
|
* @param {MongoClient.collection} users db collection
|
||||||
* @param {MongoClient.collection} users
|
* @returns {async function} middleware handler function
|
||||||
* @return {async function}
|
|
||||||
*/
|
*/
|
||||||
const createMiddleware = (users) => {
|
const createMiddleware = (users) => {
|
||||||
return async (req, res, next) => {
|
return async (req, res, next) => {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const assetForms = [
|
|||||||
/**
|
/**
|
||||||
* selectAssetForm changes which form is displayed
|
* selectAssetForm changes which form is displayed
|
||||||
* to create specified assets.
|
* to create specified assets.
|
||||||
* @param {string} assetId
|
* @param {string} assetFormId
|
||||||
*/
|
*/
|
||||||
function selectAssetForm(assetFormId) {
|
function selectAssetForm(assetFormId) {
|
||||||
for (let i = 0; i < assetForms.length; i++) {
|
for (let i = 0; i < assetForms.length; i++) {
|
||||||
|
|||||||
+7
-1
@@ -3,7 +3,13 @@ const bcrypt = require('bcrypt');
|
|||||||
const joi = require("joi");
|
const joi = require("joi");
|
||||||
const salt = 12;
|
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();
|
const router = require("express").Router();
|
||||||
|
|
||||||
router.use(middleware);
|
router.use(middleware);
|
||||||
|
|||||||
Reference in new issue
Block a user