diff --git a/config.example.json b/config.example.json
index 069cd09..5da6bc6 100644
--- a/config.example.json
+++ b/config.example.json
@@ -15,6 +15,6 @@
"url": "mongodb://localhost:27017/pretendo_website"
},
"secrets": {
- "session": "abcdef"
+ "session": "session secret here"
}
}
diff --git a/helpers/blog-helper.js b/helpers/blog-helper.js
index 25d3e76..1d12366 100644
--- a/helpers/blog-helper.js
+++ b/helpers/blog-helper.js
@@ -5,13 +5,9 @@ blog post helper functionality
*/
-//import filesystem
+// imports
const fs = require('fs');
-
-//import author list
const authors = require('../config.json').blog.authors;
-
-//import markdown converter
const showdown = require('showdown');
const converter = new showdown.Converter({metadata: true});
@@ -54,7 +50,6 @@ function writeMarkdownToFile(text) {
fs.writeFileSync(`posts/${length}.md`, text);
}
-// export the router
module.exports = {
getBlogPostAsHtml,
getBlogPostAsMarkdown,
diff --git a/helpers/common.js b/helpers/common.js
index 29aced3..11f55f3 100644
--- a/helpers/common.js
+++ b/helpers/common.js
@@ -5,48 +5,67 @@ common page functionality.
*/
-function sendDefault404(req, res) {
+// shows 404 template.
+function sendDefault404(res) {
res.status(404).send('404');
}
-function sendApi404(req, res) {
+// use for any api return. it has basic layout used for every return.
+function sendApiReturn(res, data, errors) {
+ res.status(200).json(
+ // combine 2 objects
+ Object.assign({
+ code: 200,
+ success: true,
+ errors: [] + (errors ? errors : [])
+ }, data)
+ );
+}
+
+
+// use if api endpoint doesnt exist
+function sendApi404(res) {
res.status(404).json({
- error: {
- code: 404,
- message: 'Endpoint not in use'
- }
+ code: 404,
+ errors: [
+ 'Endpoint not in use'
+ ]
});
}
-function sendApiAuthError(req, res) {
+// use if not logged in and is required (handled with middleware)
+function sendApiAuthError(res) {
res.status(401).json({
- error: {
- code: 401,
- message: 'Not authenticated'
- }
+ code: 401,
+ errors: [
+ 'Not authenticated'
+ ]
});
}
-function sendApiGenericError(req, res) {
+// use for completely broken requests
+function sendApiGenericError(res) {
res.status(400).json({
- error: {
- code: 400,
- message: 'Bad request'
- }
+ code: 400,
+ success: false,
+ errors: [
+ 'Bad request'
+ ]
});
}
-function sendApiError(res, code, message) {
+// use for any api not successfull
+function sendApiError(res, code, errors) {
res.status(code).json({
- error: {
- code,
- message
- }
+ code,
+ success: false,
+ errors
});
}
module.exports = {
sendDefault404,
+ sendApiReturn,
sendApi404,
sendApiGenericError,
sendApiError,
diff --git a/middleware/admin-authentication.js b/middleware/admin-authentication.js
index b91b922..4717352 100644
--- a/middleware/admin-authentication.js
+++ b/middleware/admin-authentication.js
@@ -1,11 +1,28 @@
+/*
+
+admin-authentication.js -
+Middleware file for authentication checking
+
+*/
+
+// imports
const common = require('../helpers/common');
-function adminUserAuthenticationMiddleware(req, res, next) {
- if (req.isAuthenticated()) {
+// middleware to use if admin authentication is required
+function adminAuthenticationRequired(req, res, next) {
+ if (req.isAuthenticated() && req.user.role && req.user.role === 'admin') {
return next();
+ } else {
+ common.sendApiAuthError(res);
}
-
- common.sendApiAuthError(req, res);
}
-module.exports = adminUserAuthenticationMiddleware;
\ No newline at end of file
+// middleware to use if authentication
+function authenticationOptional(req, res, next) {
+ return next();
+}
+
+module.exports = {
+ adminAuthenticationRequired,
+ authenticationOptional
+};
\ No newline at end of file
diff --git a/models/admin-user.js b/models/admin-user.js
index 289034f..5240dbc 100644
--- a/models/admin-user.js
+++ b/models/admin-user.js
@@ -5,10 +5,12 @@ file containing the model file for admin user
*/
+// imports
const mongoose = require('mongoose');
const uniqueValidator = require('mongoose-unique-validator');
const bcrypt = require('bcrypt');
+// admin user database layout
const adminUserSchema = new mongoose.Schema({
username: {
type: String,
@@ -16,26 +18,32 @@ const adminUserSchema = new mongoose.Schema({
minlength: [1, 'Username must be at-least 1 character.'],
maxlength: [42, 'Username cannot be more than 42 characters long.'],
unique: true,
- trim: true,
+ trim: true
},
password: {
type: String,
required: [true, 'Password is required.'],
minlength: [7, 'Password must be at-least 7 characters.'],
maxlength: [256, 'Password cannot be more than 256 characters long.'],
- trim: true,
+ trim: true
+ },
+ role: {
+ type: String,
+ required: true,
+ default: 'admin'
}
});
adminUserSchema.plugin(uniqueValidator, {message: '{PATH} already in use.'});
+// hashing password
adminUserSchema.pre('save', function(next) {
- // only hash the password if it has been modified (or is new)
+ // only if modified
if (!this.isModified('password')) {
return next();
}
- // Hash the password with 10 rounds.
+ // hashing
bcrypt.hash(this.get('password'), 10, (err, hash) => {
if (err) {
return next(err);
diff --git a/package-lock.json b/package-lock.json
index a089189..c3a9751 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
"dev": true,
"requires": {
- "@babel/highlight": "^7.0.0"
+ "@babel/highlight": "7.0.0"
}
},
"@babel/highlight": {
@@ -19,9 +19,9 @@
"integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
"dev": true,
"requires": {
- "chalk": "^2.0.0",
- "esutils": "^2.0.2",
- "js-tokens": "^4.0.0"
+ "chalk": "2.4.1",
+ "esutils": "2.0.2",
+ "js-tokens": "4.0.0"
}
},
"accepts": {
@@ -29,7 +29,7 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
"requires": {
- "mime-types": "~2.1.18",
+ "mime-types": "2.1.18",
"negotiator": "0.6.1"
}
},
@@ -45,7 +45,7 @@
"integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==",
"dev": true,
"requires": {
- "acorn": "^5.0.3"
+ "acorn": "5.7.3"
}
},
"ajv": {
@@ -54,10 +54,10 @@
"integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
"dev": true,
"requires": {
- "fast-deep-equal": "^2.0.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
+ "fast-deep-equal": "2.0.1",
+ "fast-json-stable-stringify": "2.0.0",
+ "json-schema-traverse": "0.4.1",
+ "uri-js": "4.2.2"
}
},
"ajv-keywords": {
@@ -71,9 +71,9 @@
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"requires": {
- "kind-of": "^3.0.2",
- "longest": "^1.0.1",
- "repeat-string": "^1.5.2"
+ "kind-of": "3.2.2",
+ "longest": "1.0.1",
+ "repeat-string": "1.6.1"
}
},
"amdefine": {
@@ -98,7 +98,7 @@
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.3"
}
},
"argparse": {
@@ -107,7 +107,7 @@
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"dev": true,
"requires": {
- "sprintf-js": "~1.0.2"
+ "sprintf-js": "1.0.3"
}
},
"array-flatten": {
@@ -121,7 +121,7 @@
"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
"dev": true,
"requires": {
- "array-uniq": "^1.0.1"
+ "array-uniq": "1.0.3"
}
},
"array-uniq": {
@@ -176,8 +176,8 @@
"version": "1.1.5",
"bundled": true,
"requires": {
- "delegates": "^1.0.0",
- "readable-stream": "^2.0.6"
+ "delegates": "1.0.0",
+ "readable-stream": "2.3.5"
}
},
"balanced-match": {
@@ -188,7 +188,7 @@
"version": "1.1.11",
"bundled": true,
"requires": {
- "balanced-match": "^1.0.0",
+ "balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
@@ -235,7 +235,7 @@
"version": "1.2.5",
"bundled": true,
"requires": {
- "minipass": "^2.2.1"
+ "minipass": "2.3.4"
}
},
"fs.realpath": {
@@ -246,26 +246,26 @@
"version": "2.7.4",
"bundled": true,
"requires": {
- "aproba": "^1.0.3",
- "console-control-strings": "^1.0.0",
- "has-unicode": "^2.0.0",
- "object-assign": "^4.1.0",
- "signal-exit": "^3.0.0",
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1",
- "wide-align": "^1.1.0"
+ "aproba": "1.2.0",
+ "console-control-strings": "1.1.0",
+ "has-unicode": "2.0.1",
+ "object-assign": "4.1.1",
+ "signal-exit": "3.0.2",
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wide-align": "1.1.3"
}
},
"glob": {
"version": "7.1.2",
"bundled": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
},
"has-unicode": {
@@ -276,22 +276,22 @@
"version": "0.4.24",
"bundled": true,
"requires": {
- "safer-buffer": ">= 2.1.2 < 3"
+ "safer-buffer": "2.1.2"
}
},
"ignore-walk": {
"version": "3.0.1",
"bundled": true,
"requires": {
- "minimatch": "^3.0.4"
+ "minimatch": "3.0.4"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
- "once": "^1.3.0",
- "wrappy": "1"
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
}
},
"inherits": {
@@ -306,7 +306,7 @@
"version": "1.0.0",
"bundled": true,
"requires": {
- "number-is-nan": "^1.0.0"
+ "number-is-nan": "1.0.1"
}
},
"isarray": {
@@ -317,7 +317,7 @@
"version": "3.0.4",
"bundled": true,
"requires": {
- "brace-expansion": "^1.1.7"
+ "brace-expansion": "1.1.11"
}
},
"minimist": {
@@ -328,8 +328,8 @@
"version": "2.3.4",
"bundled": true,
"requires": {
- "safe-buffer": "^5.1.2",
- "yallist": "^3.0.0"
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.2"
},
"dependencies": {
"safe-buffer": {
@@ -346,7 +346,7 @@
"version": "1.1.0",
"bundled": true,
"requires": {
- "minipass": "^2.2.1"
+ "minipass": "2.3.4"
}
},
"mkdirp": {
@@ -364,33 +364,33 @@
"version": "2.2.3",
"bundled": true,
"requires": {
- "debug": "^2.1.2",
- "iconv-lite": "^0.4.4",
- "sax": "^1.2.4"
+ "debug": "2.6.9",
+ "iconv-lite": "0.4.24",
+ "sax": "1.2.4"
}
},
"node-pre-gyp": {
"version": "0.11.0",
"bundled": true,
"requires": {
- "detect-libc": "^1.0.2",
- "mkdirp": "^0.5.1",
- "needle": "^2.2.1",
- "nopt": "^4.0.1",
- "npm-packlist": "^1.1.6",
- "npmlog": "^4.0.2",
- "rc": "^1.2.7",
- "rimraf": "^2.6.1",
- "semver": "^5.3.0",
- "tar": "^4"
+ "detect-libc": "1.0.3",
+ "mkdirp": "0.5.1",
+ "needle": "2.2.3",
+ "nopt": "4.0.1",
+ "npm-packlist": "1.1.11",
+ "npmlog": "4.1.2",
+ "rc": "1.2.8",
+ "rimraf": "2.6.2",
+ "semver": "5.5.1",
+ "tar": "4.4.6"
}
},
"nopt": {
"version": "4.0.1",
"bundled": true,
"requires": {
- "abbrev": "1",
- "osenv": "^0.1.4"
+ "abbrev": "1.1.1",
+ "osenv": "0.1.5"
}
},
"npm-bundled": {
@@ -401,18 +401,18 @@
"version": "1.1.11",
"bundled": true,
"requires": {
- "ignore-walk": "^3.0.1",
- "npm-bundled": "^1.0.1"
+ "ignore-walk": "3.0.1",
+ "npm-bundled": "1.0.5"
}
},
"npmlog": {
"version": "4.1.2",
"bundled": true,
"requires": {
- "are-we-there-yet": "~1.1.2",
- "console-control-strings": "~1.1.0",
- "gauge": "~2.7.3",
- "set-blocking": "~2.0.0"
+ "are-we-there-yet": "1.1.5",
+ "console-control-strings": "1.1.0",
+ "gauge": "2.7.4",
+ "set-blocking": "2.0.0"
}
},
"number-is-nan": {
@@ -427,7 +427,7 @@
"version": "1.4.0",
"bundled": true,
"requires": {
- "wrappy": "1"
+ "wrappy": "1.0.2"
}
},
"os-homedir": {
@@ -442,8 +442,8 @@
"version": "0.1.5",
"bundled": true,
"requires": {
- "os-homedir": "^1.0.0",
- "os-tmpdir": "^1.0.0"
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
}
},
"path-is-absolute": {
@@ -458,10 +458,10 @@
"version": "1.2.8",
"bundled": true,
"requires": {
- "deep-extend": "^0.6.0",
- "ini": "~1.3.0",
- "minimist": "^1.2.0",
- "strip-json-comments": "~2.0.1"
+ "deep-extend": "0.6.0",
+ "ini": "1.3.5",
+ "minimist": "1.2.0",
+ "strip-json-comments": "2.0.1"
},
"dependencies": {
"minimist": {
@@ -474,20 +474,20 @@
"version": "2.3.5",
"bundled": true,
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.0.3",
- "util-deprecate": "~1.0.1"
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.1",
+ "string_decoder": "1.0.3",
+ "util-deprecate": "1.0.2"
}
},
"rimraf": {
"version": "2.6.2",
"bundled": true,
"requires": {
- "glob": "^7.0.5"
+ "glob": "7.1.2"
}
},
"safe-buffer": {
@@ -518,23 +518,23 @@
"version": "1.0.2",
"bundled": true,
"requires": {
- "code-point-at": "^1.0.0",
- "is-fullwidth-code-point": "^1.0.0",
- "strip-ansi": "^3.0.0"
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
}
},
"string_decoder": {
"version": "1.0.3",
"bundled": true,
"requires": {
- "safe-buffer": "~5.1.0"
+ "safe-buffer": "5.1.1"
}
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"requires": {
- "ansi-regex": "^2.0.0"
+ "ansi-regex": "2.1.1"
}
},
"strip-json-comments": {
@@ -545,13 +545,13 @@
"version": "4.4.6",
"bundled": true,
"requires": {
- "chownr": "^1.0.1",
- "fs-minipass": "^1.2.5",
- "minipass": "^2.3.3",
- "minizlib": "^1.1.0",
- "mkdirp": "^0.5.0",
- "safe-buffer": "^5.1.2",
- "yallist": "^3.0.2"
+ "chownr": "1.1.1",
+ "fs-minipass": "1.2.5",
+ "minipass": "2.3.4",
+ "minizlib": "1.1.0",
+ "mkdirp": "0.5.1",
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.2"
},
"dependencies": {
"safe-buffer": {
@@ -572,7 +572,7 @@
"version": "1.1.3",
"bundled": true,
"requires": {
- "string-width": "^1.0.2 || 2"
+ "string-width": "1.0.2"
}
},
"wrappy": {
@@ -592,15 +592,15 @@
"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
"requires": {
"bytes": "3.0.0",
- "content-type": "~1.0.4",
+ "content-type": "1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.2",
- "http-errors": "~1.6.3",
+ "depd": "1.1.2",
+ "http-errors": "1.6.3",
"iconv-lite": "0.4.23",
- "on-finished": "~2.3.0",
+ "on-finished": "2.3.0",
"qs": "6.5.2",
"raw-body": "2.3.3",
- "type-is": "~1.6.16"
+ "type-is": "1.6.16"
},
"dependencies": {
"http-errors": {
@@ -608,10 +608,10 @@
"resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"requires": {
- "depd": "~1.1.2",
+ "depd": "1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
- "statuses": ">= 1.4.0 < 2"
+ "statuses": "1.5.0"
}
},
"qs": {
@@ -631,7 +631,7 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": {
- "balanced-match": "^1.0.0",
+ "balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
@@ -640,6 +640,11 @@
"resolved": "https://registry.npmjs.org/bson/-/bson-1.0.9.tgz",
"integrity": "sha512-IQX9/h7WdMBIW/q/++tGd+emQr0XMdeZ6icnT/74Xk9fnabWn+gZgpE+9V+gujL3hhJOoNrnDVY7tWdzc7NUTg=="
},
+ "buffer-shims": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+ "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+ },
"bytes": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -651,7 +656,7 @@
"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
"dev": true,
"requires": {
- "callsites": "^0.2.0"
+ "callsites": "0.2.0"
}
},
"callsites": {
@@ -672,8 +677,8 @@
"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
"optional": true,
"requires": {
- "align-text": "^0.1.3",
- "lazy-cache": "^1.0.3"
+ "align-text": "0.1.4",
+ "lazy-cache": "1.0.4"
}
},
"chalk": {
@@ -682,9 +687,9 @@
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"dev": true,
"requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
}
},
"chardet": {
@@ -705,7 +710,7 @@
"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
"dev": true,
"requires": {
- "restore-cursor": "^2.0.0"
+ "restore-cursor": "2.0.0"
}
},
"cli-width": {
@@ -720,8 +725,8 @@
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"optional": true,
"requires": {
- "center-align": "^0.1.1",
- "right-align": "^0.1.1",
+ "center-align": "0.1.3",
+ "right-align": "0.1.3",
"wordwrap": "0.0.2"
},
"dependencies": {
@@ -763,6 +768,35 @@
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
+ "connect-mongo": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-2.0.1.tgz",
+ "integrity": "sha512-ghBvVq0SA0SkTFsbAB8HdF1+uoHdFJICSlrTklNloMKXuRpX9IuVBnG0DlKnXBZSQI0Joyaq22cazsrV9+5g2A==",
+ "requires": {
+ "mongodb": "2.2.36"
+ },
+ "dependencies": {
+ "mongodb": {
+ "version": "2.2.36",
+ "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.36.tgz",
+ "integrity": "sha512-P2SBLQ8Z0PVx71ngoXwo12+FiSfbNfGOClAao03/bant5DgLNkOPAck5IaJcEk4gKlQhDEURzfR3xuBG1/B+IA==",
+ "requires": {
+ "es6-promise": "3.2.1",
+ "mongodb-core": "2.1.20",
+ "readable-stream": "2.2.7"
+ }
+ },
+ "mongodb-core": {
+ "version": "2.1.20",
+ "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.20.tgz",
+ "integrity": "sha512-IN57CX5/Q1bhDq6ShAR6gIv4koFsZP7L8WOK1S0lR0pVDQaScffSMV5jxubLsmZ7J+UdqmykKw4r9hG3XQEGgQ==",
+ "requires": {
+ "bson": "1.0.9",
+ "require_optional": "1.0.1"
+ }
+ }
+ }
+ },
"content-disposition": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@@ -783,6 +817,11 @@
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ },
"crc": {
"version": "3.4.4",
"resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz",
@@ -793,9 +832,9 @@
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"requires": {
- "lru-cache": "^4.0.1",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
+ "lru-cache": "4.1.3",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
}
},
"debug": {
@@ -822,8 +861,8 @@
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
"requires": {
- "foreach": "^2.0.5",
- "object-keys": "^1.0.8"
+ "foreach": "2.0.5",
+ "object-keys": "1.0.11"
}
},
"del": {
@@ -832,13 +871,13 @@
"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
"dev": true,
"requires": {
- "globby": "^5.0.0",
- "is-path-cwd": "^1.0.0",
- "is-path-in-cwd": "^1.0.0",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0",
- "rimraf": "^2.2.8"
+ "globby": "5.0.0",
+ "is-path-cwd": "1.0.0",
+ "is-path-in-cwd": "1.0.1",
+ "object-assign": "4.1.1",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1",
+ "rimraf": "2.6.2"
}
},
"depd": {
@@ -857,7 +896,7 @@
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true,
"requires": {
- "esutils": "^2.0.2"
+ "esutils": "2.0.2"
}
},
"ee-first": {
@@ -870,6 +909,11 @@
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
},
+ "es6-promise": {
+ "version": "3.2.1",
+ "resolved": "http://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+ "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q="
+ },
"escape-html": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -887,44 +931,44 @@
"integrity": "sha512-hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "ajv": "^6.5.3",
- "chalk": "^2.1.0",
- "cross-spawn": "^6.0.5",
- "debug": "^4.0.1",
- "doctrine": "^2.1.0",
- "eslint-scope": "^4.0.0",
- "eslint-utils": "^1.3.1",
- "eslint-visitor-keys": "^1.0.0",
- "espree": "^4.0.0",
- "esquery": "^1.0.1",
- "esutils": "^2.0.2",
- "file-entry-cache": "^2.0.0",
- "functional-red-black-tree": "^1.0.1",
- "glob": "^7.1.2",
- "globals": "^11.7.0",
- "ignore": "^4.0.6",
- "imurmurhash": "^0.1.4",
- "inquirer": "^6.1.0",
- "is-resolvable": "^1.1.0",
- "js-yaml": "^3.12.0",
- "json-stable-stringify-without-jsonify": "^1.0.1",
- "levn": "^0.3.0",
- "lodash": "^4.17.5",
- "minimatch": "^3.0.4",
- "mkdirp": "^0.5.1",
- "natural-compare": "^1.4.0",
- "optionator": "^0.8.2",
- "path-is-inside": "^1.0.2",
- "pluralize": "^7.0.0",
- "progress": "^2.0.0",
- "regexpp": "^2.0.0",
- "require-uncached": "^1.0.3",
- "semver": "^5.5.1",
- "strip-ansi": "^4.0.0",
- "strip-json-comments": "^2.0.1",
- "table": "^4.0.3",
- "text-table": "^0.2.0"
+ "@babel/code-frame": "7.0.0",
+ "ajv": "6.5.4",
+ "chalk": "2.4.1",
+ "cross-spawn": "6.0.5",
+ "debug": "4.1.0",
+ "doctrine": "2.1.0",
+ "eslint-scope": "4.0.0",
+ "eslint-utils": "1.3.1",
+ "eslint-visitor-keys": "1.0.0",
+ "espree": "4.0.0",
+ "esquery": "1.0.1",
+ "esutils": "2.0.2",
+ "file-entry-cache": "2.0.0",
+ "functional-red-black-tree": "1.0.1",
+ "glob": "7.1.3",
+ "globals": "11.8.0",
+ "ignore": "4.0.6",
+ "imurmurhash": "0.1.4",
+ "inquirer": "6.2.0",
+ "is-resolvable": "1.1.0",
+ "js-yaml": "3.12.0",
+ "json-stable-stringify-without-jsonify": "1.0.1",
+ "levn": "0.3.0",
+ "lodash": "4.17.11",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "natural-compare": "1.4.0",
+ "optionator": "0.8.2",
+ "path-is-inside": "1.0.2",
+ "pluralize": "7.0.0",
+ "progress": "2.0.0",
+ "regexpp": "2.0.1",
+ "require-uncached": "1.0.3",
+ "semver": "5.5.1",
+ "strip-ansi": "4.0.0",
+ "strip-json-comments": "2.0.1",
+ "table": "4.0.3",
+ "text-table": "0.2.0"
},
"dependencies": {
"cross-spawn": {
@@ -933,11 +977,11 @@
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"dev": true,
"requires": {
- "nice-try": "^1.0.4",
- "path-key": "^2.0.1",
- "semver": "^5.5.0",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
+ "nice-try": "1.0.5",
+ "path-key": "2.0.1",
+ "semver": "5.5.1",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
}
},
"debug": {
@@ -946,7 +990,7 @@
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
"dev": true,
"requires": {
- "ms": "^2.1.1"
+ "ms": "2.1.1"
}
},
"glob": {
@@ -955,12 +999,12 @@
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
},
"ms": {
@@ -977,8 +1021,8 @@
"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
"dev": true,
"requires": {
- "esrecurse": "^4.1.0",
- "estraverse": "^4.1.1"
+ "esrecurse": "4.2.1",
+ "estraverse": "4.2.0"
}
},
"eslint-utils": {
@@ -999,8 +1043,8 @@
"integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==",
"dev": true,
"requires": {
- "acorn": "^5.6.0",
- "acorn-jsx": "^4.1.1"
+ "acorn": "5.7.3",
+ "acorn-jsx": "4.1.1"
}
},
"esprima": {
@@ -1015,7 +1059,7 @@
"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
"dev": true,
"requires": {
- "estraverse": "^4.0.0"
+ "estraverse": "4.2.0"
}
},
"esrecurse": {
@@ -1024,7 +1068,7 @@
"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
"dev": true,
"requires": {
- "estraverse": "^4.1.0"
+ "estraverse": "4.2.0"
}
},
"estraverse": {
@@ -1049,13 +1093,13 @@
"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
"requires": {
- "cross-spawn": "^5.0.1",
- "get-stream": "^3.0.0",
- "is-stream": "^1.1.0",
- "npm-run-path": "^2.0.0",
- "p-finally": "^1.0.0",
- "signal-exit": "^3.0.0",
- "strip-eof": "^1.0.0"
+ "cross-spawn": "5.1.0",
+ "get-stream": "3.0.0",
+ "is-stream": "1.1.0",
+ "npm-run-path": "2.0.2",
+ "p-finally": "1.0.0",
+ "signal-exit": "3.0.2",
+ "strip-eof": "1.0.0"
}
},
"express": {
@@ -1063,36 +1107,36 @@
"resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
"integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
"requires": {
- "accepts": "~1.3.4",
+ "accepts": "1.3.5",
"array-flatten": "1.1.1",
"body-parser": "1.18.2",
"content-disposition": "0.5.2",
- "content-type": "~1.0.4",
+ "content-type": "1.0.4",
"cookie": "0.3.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
- "depd": "~1.1.1",
- "encodeurl": "~1.0.1",
- "escape-html": "~1.0.3",
- "etag": "~1.8.1",
+ "depd": "1.1.2",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
"finalhandler": "1.1.0",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
- "methods": "~1.1.2",
- "on-finished": "~2.3.0",
- "parseurl": "~1.3.2",
+ "methods": "1.1.2",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.2",
"path-to-regexp": "0.1.7",
- "proxy-addr": "~2.0.2",
+ "proxy-addr": "2.0.3",
"qs": "6.5.1",
- "range-parser": "~1.2.0",
+ "range-parser": "1.2.0",
"safe-buffer": "5.1.1",
"send": "0.16.1",
"serve-static": "1.13.1",
"setprototypeof": "1.1.0",
- "statuses": "~1.3.1",
- "type-is": "~1.6.15",
+ "statuses": "1.3.1",
+ "type-is": "1.6.16",
"utils-merge": "1.0.1",
- "vary": "~1.1.2"
+ "vary": "1.1.2"
},
"dependencies": {
"body-parser": {
@@ -1101,15 +1145,15 @@
"integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
"requires": {
"bytes": "3.0.0",
- "content-type": "~1.0.4",
+ "content-type": "1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.1",
- "http-errors": "~1.6.2",
+ "depd": "1.1.2",
+ "http-errors": "1.6.2",
"iconv-lite": "0.4.19",
- "on-finished": "~2.3.0",
+ "on-finished": "2.3.0",
"qs": "6.5.1",
"raw-body": "2.3.2",
- "type-is": "~1.6.15"
+ "type-is": "1.6.16"
}
},
"iconv-lite": {
@@ -1135,11 +1179,11 @@
"resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz",
"integrity": "sha1-gKBwu4GbCeSvLKbQeA91zgXnXC8=",
"requires": {
- "glob": "^6.0.4",
- "graceful-fs": "^4.1.2",
- "handlebars": "^4.0.5",
- "object.assign": "^4.0.3",
- "promise": "^7.0.0"
+ "glob": "6.0.4",
+ "graceful-fs": "4.1.11",
+ "handlebars": "4.0.11",
+ "object.assign": "4.1.0",
+ "promise": "7.3.1"
}
},
"express-session": {
@@ -1151,10 +1195,10 @@
"cookie-signature": "1.0.6",
"crc": "3.4.4",
"debug": "2.6.9",
- "depd": "~1.1.1",
- "on-headers": "~1.0.1",
- "parseurl": "~1.3.2",
- "uid-safe": "~2.1.5",
+ "depd": "1.1.2",
+ "on-headers": "1.0.1",
+ "parseurl": "1.3.2",
+ "uid-safe": "2.1.5",
"utils-merge": "1.0.1"
}
},
@@ -1164,9 +1208,9 @@
"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
"dev": true,
"requires": {
- "chardet": "^0.7.0",
- "iconv-lite": "^0.4.24",
- "tmp": "^0.0.33"
+ "chardet": "0.7.0",
+ "iconv-lite": "0.4.24",
+ "tmp": "0.0.33"
},
"dependencies": {
"iconv-lite": {
@@ -1175,7 +1219,7 @@
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"requires": {
- "safer-buffer": ">= 2.1.2 < 3"
+ "safer-buffer": "2.1.2"
}
}
}
@@ -1204,7 +1248,7 @@
"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
"dev": true,
"requires": {
- "escape-string-regexp": "^1.0.5"
+ "escape-string-regexp": "1.0.5"
}
},
"file-entry-cache": {
@@ -1213,8 +1257,8 @@
"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
"dev": true,
"requires": {
- "flat-cache": "^1.2.1",
- "object-assign": "^4.0.1"
+ "flat-cache": "1.3.0",
+ "object-assign": "4.1.1"
}
},
"finalhandler": {
@@ -1223,12 +1267,12 @@
"integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
"requires": {
"debug": "2.6.9",
- "encodeurl": "~1.0.1",
- "escape-html": "~1.0.3",
- "on-finished": "~2.3.0",
- "parseurl": "~1.3.2",
- "statuses": "~1.3.1",
- "unpipe": "~1.0.0"
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.2",
+ "statuses": "1.3.1",
+ "unpipe": "1.0.0"
}
},
"find-up": {
@@ -1236,7 +1280,7 @@
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"requires": {
- "locate-path": "^2.0.0"
+ "locate-path": "2.0.0"
}
},
"flat-cache": {
@@ -1245,10 +1289,10 @@
"integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
"dev": true,
"requires": {
- "circular-json": "^0.3.1",
- "del": "^2.0.2",
- "graceful-fs": "^4.1.2",
- "write": "^0.2.1"
+ "circular-json": "0.3.3",
+ "del": "2.2.2",
+ "graceful-fs": "4.1.11",
+ "write": "0.2.1"
}
},
"foreach": {
@@ -1298,11 +1342,11 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
"requires": {
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "2 || 3",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
},
"globals": {
@@ -1317,12 +1361,12 @@
"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
"dev": true,
"requires": {
- "array-union": "^1.0.1",
- "arrify": "^1.0.0",
- "glob": "^7.0.3",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "array-union": "1.0.2",
+ "arrify": "1.0.1",
+ "glob": "7.1.3",
+ "object-assign": "4.1.1",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1"
},
"dependencies": {
"glob": {
@@ -1331,12 +1375,12 @@
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
}
}
@@ -1351,10 +1395,10 @@
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
"integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
"requires": {
- "async": "^1.4.0",
- "optimist": "^0.6.1",
- "source-map": "^0.4.4",
- "uglify-js": "^2.6"
+ "async": "1.5.2",
+ "optimist": "0.6.1",
+ "source-map": "0.4.4",
+ "uglify-js": "2.8.29"
}
},
"has-flag": {
@@ -1376,7 +1420,7 @@
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
- "statuses": ">= 1.3.1 < 2"
+ "statuses": "1.3.1"
},
"dependencies": {
"depd": {
@@ -1396,7 +1440,7 @@
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
"requires": {
- "safer-buffer": ">= 2.1.2 < 3"
+ "safer-buffer": "2.1.2"
}
},
"ignore": {
@@ -1416,8 +1460,8 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": {
- "once": "^1.3.0",
- "wrappy": "1"
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
}
},
"inherits": {
@@ -1431,19 +1475,19 @@
"integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
"dev": true,
"requires": {
- "ansi-escapes": "^3.0.0",
- "chalk": "^2.0.0",
- "cli-cursor": "^2.1.0",
- "cli-width": "^2.0.0",
- "external-editor": "^3.0.0",
- "figures": "^2.0.0",
- "lodash": "^4.17.10",
+ "ansi-escapes": "3.1.0",
+ "chalk": "2.4.1",
+ "cli-cursor": "2.1.0",
+ "cli-width": "2.2.0",
+ "external-editor": "3.0.3",
+ "figures": "2.0.0",
+ "lodash": "4.17.11",
"mute-stream": "0.0.7",
- "run-async": "^2.2.0",
- "rxjs": "^6.1.0",
- "string-width": "^2.1.0",
- "strip-ansi": "^4.0.0",
- "through": "^2.3.6"
+ "run-async": "2.3.0",
+ "rxjs": "6.3.3",
+ "string-width": "2.1.1",
+ "strip-ansi": "4.0.0",
+ "through": "2.3.8"
}
},
"invert-kv": {
@@ -1478,7 +1522,7 @@
"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
"dev": true,
"requires": {
- "is-path-inside": "^1.0.0"
+ "is-path-inside": "1.0.1"
}
},
"is-path-inside": {
@@ -1487,7 +1531,7 @@
"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
"dev": true,
"requires": {
- "path-is-inside": "^1.0.1"
+ "path-is-inside": "1.0.2"
}
},
"is-promise": {
@@ -1507,6 +1551,11 @@
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
},
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -1524,8 +1573,8 @@
"integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
"dev": true,
"requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
+ "argparse": "1.0.10",
+ "esprima": "4.0.1"
}
},
"json-schema-traverse": {
@@ -1550,7 +1599,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
- "is-buffer": "^1.1.5"
+ "is-buffer": "1.1.6"
}
},
"lazy-cache": {
@@ -1564,7 +1613,7 @@
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"requires": {
- "invert-kv": "^1.0.0"
+ "invert-kv": "1.0.0"
}
},
"levn": {
@@ -1573,8 +1622,8 @@
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true,
"requires": {
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2"
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2"
}
},
"locate-path": {
@@ -1582,8 +1631,8 @@
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"requires": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
+ "p-locate": "2.0.0",
+ "path-exists": "3.0.0"
}
},
"lodash": {
@@ -1611,8 +1660,8 @@
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
"requires": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
+ "pseudomap": "1.0.2",
+ "yallist": "2.1.2"
}
},
"media-typer": {
@@ -1625,7 +1674,7 @@
"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
"requires": {
- "mimic-fn": "^1.0.0"
+ "mimic-fn": "1.2.0"
}
},
"memory-pager": {
@@ -1659,7 +1708,7 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
"integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
"requires": {
- "mime-db": "~1.33.0"
+ "mime-db": "1.33.0"
}
},
"mimic-fn": {
@@ -1672,7 +1721,7 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
- "brace-expansion": "^1.1.7"
+ "brace-expansion": "1.1.11"
}
},
"minimist": {
@@ -1703,7 +1752,7 @@
"integrity": "sha512-E5QJuXQoMlT7KyCYqNNMfAkhfQD79AT4F8Xd+6x37OX+8BL17GyXyWvfm6wuyx4wnzCCPoCSLeMeUN2S7dU9yw==",
"requires": {
"mongodb-core": "3.1.5",
- "safe-buffer": "^5.1.2"
+ "safe-buffer": "5.1.2"
},
"dependencies": {
"safe-buffer": {
@@ -1718,10 +1767,10 @@
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.5.tgz",
"integrity": "sha512-emT/tM4ZBinqd6RZok+EzDdtN4LjYJIckv71qQVOEFmvXgT5cperZegVmTgox/1cx4XQu6LJ5ZuIwipP/eKdQg==",
"requires": {
- "bson": "^1.1.0",
- "require_optional": "^1.0.1",
- "safe-buffer": "^5.1.2",
- "saslprep": "^1.0.0"
+ "bson": "1.1.0",
+ "require_optional": "1.0.1",
+ "safe-buffer": "5.1.2",
+ "saslprep": "1.0.2"
},
"dependencies": {
"bson": {
@@ -1742,7 +1791,7 @@
"integrity": "sha512-07fpCMqvCiSdKXIygt3aAeNFJYjQPjDXILbwBEmF0e8gy2hSKMNuP5QG4J6L8m9BhjVxcvoLiPzaGKN7I/7lLg==",
"requires": {
"async": "2.6.1",
- "bson": "~1.0.5",
+ "bson": "1.0.9",
"kareem": "2.3.0",
"lodash.get": "4.4.2",
"mongodb": "3.1.6",
@@ -1761,7 +1810,7 @@
"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"requires": {
- "lodash": "^4.17.10"
+ "lodash": "4.17.11"
}
},
"safe-buffer": {
@@ -1781,8 +1830,8 @@
"resolved": "https://registry.npmjs.org/mongoose-unique-validator/-/mongoose-unique-validator-2.0.2.tgz",
"integrity": "sha512-gbKFiEzWQi8wZvZFeeEkx4nCV1qWaeRoQBNm+672+h54/0u/Y8rSdNubScn/1H2ScCPO55asDow+OXq67RQDmg==",
"requires": {
- "lodash.foreach": "^4.1.0",
- "lodash.get": "^4.0.2"
+ "lodash.foreach": "4.5.0",
+ "lodash.get": "4.4.2"
}
},
"mpath": {
@@ -1855,7 +1904,7 @@
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"requires": {
- "path-key": "^2.0.0"
+ "path-key": "2.0.1"
}
},
"number-is-nan": {
@@ -1879,10 +1928,10 @@
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
"requires": {
- "define-properties": "^1.1.2",
- "function-bind": "^1.1.1",
- "has-symbols": "^1.0.0",
- "object-keys": "^1.0.11"
+ "define-properties": "1.1.2",
+ "function-bind": "1.1.1",
+ "has-symbols": "1.0.0",
+ "object-keys": "1.0.11"
}
},
"on-finished": {
@@ -1903,7 +1952,7 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": {
- "wrappy": "1"
+ "wrappy": "1.0.2"
}
},
"onetime": {
@@ -1912,7 +1961,7 @@
"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
"dev": true,
"requires": {
- "mimic-fn": "^1.0.0"
+ "mimic-fn": "1.2.0"
}
},
"optimist": {
@@ -1920,8 +1969,8 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
"requires": {
- "minimist": "~0.0.1",
- "wordwrap": "~0.0.2"
+ "minimist": "0.0.10",
+ "wordwrap": "0.0.3"
}
},
"optionator": {
@@ -1930,12 +1979,12 @@
"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
"dev": true,
"requires": {
- "deep-is": "~0.1.3",
- "fast-levenshtein": "~2.0.4",
- "levn": "~0.3.0",
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2",
- "wordwrap": "~1.0.0"
+ "deep-is": "0.1.3",
+ "fast-levenshtein": "2.0.6",
+ "levn": "0.3.0",
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2",
+ "wordwrap": "1.0.0"
},
"dependencies": {
"wordwrap": {
@@ -1951,9 +2000,9 @@
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
"requires": {
- "execa": "^0.7.0",
- "lcid": "^1.0.0",
- "mem": "^1.1.0"
+ "execa": "0.7.0",
+ "lcid": "1.0.0",
+ "mem": "1.1.0"
}
},
"os-tmpdir": {
@@ -1972,7 +2021,7 @@
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"requires": {
- "p-try": "^1.0.0"
+ "p-try": "1.0.0"
}
},
"p-locate": {
@@ -1980,7 +2029,7 @@
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"requires": {
- "p-limit": "^1.1.0"
+ "p-limit": "1.3.0"
}
},
"p-try": {
@@ -1998,7 +2047,7 @@
"resolved": "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz",
"integrity": "sha1-xQlWkTR71a07XhgCOMORTRbwWBE=",
"requires": {
- "passport-strategy": "1.x.x",
+ "passport-strategy": "1.0.0",
"pause": "0.0.1"
}
},
@@ -2007,7 +2056,7 @@
"resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz",
"integrity": "sha1-H+YyaMkudWBmJkN+O5BmYsFbpu4=",
"requires": {
- "passport-strategy": "1.x.x"
+ "passport-strategy": "1.0.0"
}
},
"passport-strategy": {
@@ -2064,7 +2113,7 @@
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"dev": true,
"requires": {
- "pinkie": "^2.0.0"
+ "pinkie": "2.0.4"
}
},
"pluralize": {
@@ -2079,6 +2128,11 @@
"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
"dev": true
},
+ "process-nextick-args": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+ },
"progress": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
@@ -2090,7 +2144,7 @@
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
"requires": {
- "asap": "~2.0.3"
+ "asap": "2.0.6"
}
},
"proxy-addr": {
@@ -2098,7 +2152,7 @@
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
"integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
"requires": {
- "forwarded": "~0.1.2",
+ "forwarded": "0.1.2",
"ipaddr.js": "1.6.0"
}
},
@@ -2144,10 +2198,10 @@
"resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"requires": {
- "depd": "~1.1.2",
+ "depd": "1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
- "statuses": ">= 1.4.0 < 2"
+ "statuses": "1.5.0"
}
},
"statuses": {
@@ -2157,6 +2211,20 @@
}
}
},
+ "readable-stream": {
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
+ "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
+ "requires": {
+ "buffer-shims": "1.0.0",
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "1.0.7",
+ "string_decoder": "1.0.3",
+ "util-deprecate": "1.0.2"
+ }
+ },
"regexp-clone": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz",
@@ -2189,8 +2257,8 @@
"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
"dev": true,
"requires": {
- "caller-path": "^0.1.0",
- "resolve-from": "^1.0.0"
+ "caller-path": "0.1.0",
+ "resolve-from": "1.0.1"
},
"dependencies": {
"resolve-from": {
@@ -2206,8 +2274,8 @@
"resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
"integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
"requires": {
- "resolve-from": "^2.0.0",
- "semver": "^5.1.0"
+ "resolve-from": "2.0.0",
+ "semver": "5.5.1"
}
},
"resolve-from": {
@@ -2221,8 +2289,8 @@
"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
"dev": true,
"requires": {
- "onetime": "^2.0.0",
- "signal-exit": "^3.0.2"
+ "onetime": "2.0.1",
+ "signal-exit": "3.0.2"
}
},
"right-align": {
@@ -2231,7 +2299,7 @@
"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
"optional": true,
"requires": {
- "align-text": "^0.1.1"
+ "align-text": "0.1.4"
}
},
"rimraf": {
@@ -2240,7 +2308,7 @@
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": {
- "glob": "^7.0.5"
+ "glob": "7.1.3"
},
"dependencies": {
"glob": {
@@ -2249,12 +2317,12 @@
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
}
}
@@ -2265,7 +2333,7 @@
"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
"dev": true,
"requires": {
- "is-promise": "^2.1.0"
+ "is-promise": "2.1.0"
}
},
"rxjs": {
@@ -2274,7 +2342,7 @@
"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
"dev": true,
"requires": {
- "tslib": "^1.9.0"
+ "tslib": "1.9.3"
}
},
"safe-buffer": {
@@ -2293,7 +2361,7 @@
"integrity": "sha512-4cDsYuAjXssUSjxHKRe4DTZC0agDwsCqcMqtJAQPzC74nJ7LfAJflAtC1Zed5hMzEQKj82d3tuzqdGNRsLJ4Gw==",
"optional": true,
"requires": {
- "sparse-bitfield": "^3.0.3"
+ "sparse-bitfield": "3.0.3"
}
},
"semver": {
@@ -2307,18 +2375,18 @@
"integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
"requires": {
"debug": "2.6.9",
- "depd": "~1.1.1",
- "destroy": "~1.0.4",
- "encodeurl": "~1.0.1",
- "escape-html": "~1.0.3",
- "etag": "~1.8.1",
+ "depd": "1.1.2",
+ "destroy": "1.0.4",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
"fresh": "0.5.2",
- "http-errors": "~1.6.2",
+ "http-errors": "1.6.2",
"mime": "1.4.1",
"ms": "2.0.0",
- "on-finished": "~2.3.0",
- "range-parser": "~1.2.0",
- "statuses": "~1.3.1"
+ "on-finished": "2.3.0",
+ "range-parser": "1.2.0",
+ "statuses": "1.3.1"
}
},
"serve-static": {
@@ -2326,9 +2394,9 @@
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
"integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
"requires": {
- "encodeurl": "~1.0.1",
- "escape-html": "~1.0.3",
- "parseurl": "~1.3.2",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "parseurl": "1.3.2",
"send": "0.16.1"
}
},
@@ -2347,7 +2415,7 @@
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"requires": {
- "shebang-regex": "^1.0.0"
+ "shebang-regex": "1.0.0"
}
},
"shebang-regex": {
@@ -2360,7 +2428,7 @@
"resolved": "https://registry.npmjs.org/showdown/-/showdown-1.8.6.tgz",
"integrity": "sha1-kepO47elRIqspoIKTifmkMatdxw=",
"requires": {
- "yargs": "^10.0.3"
+ "yargs": "10.1.2"
},
"dependencies": {
"cliui": {
@@ -2368,9 +2436,9 @@
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"requires": {
- "string-width": "^2.1.1",
- "strip-ansi": "^4.0.0",
- "wrap-ansi": "^2.0.0"
+ "string-width": "2.1.1",
+ "strip-ansi": "4.0.0",
+ "wrap-ansi": "2.1.0"
}
},
"yargs": {
@@ -2378,18 +2446,18 @@
"resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz",
"integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==",
"requires": {
- "cliui": "^4.0.0",
- "decamelize": "^1.1.1",
- "find-up": "^2.1.0",
- "get-caller-file": "^1.0.1",
- "os-locale": "^2.0.0",
- "require-directory": "^2.1.1",
- "require-main-filename": "^1.0.1",
- "set-blocking": "^2.0.0",
- "string-width": "^2.0.0",
- "which-module": "^2.0.0",
- "y18n": "^3.2.1",
- "yargs-parser": "^8.1.0"
+ "cliui": "4.1.0",
+ "decamelize": "1.2.0",
+ "find-up": "2.1.0",
+ "get-caller-file": "1.0.3",
+ "os-locale": "2.1.0",
+ "require-directory": "2.1.1",
+ "require-main-filename": "1.0.1",
+ "set-blocking": "2.0.0",
+ "string-width": "2.1.1",
+ "which-module": "2.0.0",
+ "y18n": "3.2.1",
+ "yargs-parser": "8.1.0"
}
}
}
@@ -2405,7 +2473,7 @@
"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "^2.0.0"
+ "is-fullwidth-code-point": "2.0.0"
}
},
"sliced": {
@@ -2418,7 +2486,7 @@
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": {
- "amdefine": ">=0.0.4"
+ "amdefine": "1.0.1"
}
},
"sparse-bitfield": {
@@ -2427,7 +2495,7 @@
"integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=",
"optional": true,
"requires": {
- "memory-pager": "^1.0.2"
+ "memory-pager": "1.1.0"
}
},
"sprintf-js": {
@@ -2446,8 +2514,16 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "string_decoder": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+ "requires": {
+ "safe-buffer": "5.1.1"
}
},
"strip-ansi": {
@@ -2455,7 +2531,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "3.0.0"
}
},
"strip-eof": {
@@ -2475,7 +2551,7 @@
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "3.0.0"
}
},
"table": {
@@ -2484,12 +2560,12 @@
"integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
"dev": true,
"requires": {
- "ajv": "^6.0.1",
- "ajv-keywords": "^3.0.0",
- "chalk": "^2.1.0",
- "lodash": "^4.17.4",
+ "ajv": "6.5.4",
+ "ajv-keywords": "3.2.0",
+ "chalk": "2.4.1",
+ "lodash": "4.17.11",
"slice-ansi": "1.0.0",
- "string-width": "^2.1.1"
+ "string-width": "2.1.1"
}
},
"text-table": {
@@ -2510,7 +2586,7 @@
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
"dev": true,
"requires": {
- "os-tmpdir": "~1.0.2"
+ "os-tmpdir": "1.0.2"
}
},
"tslib": {
@@ -2525,7 +2601,7 @@
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
"requires": {
- "prelude-ls": "~1.1.2"
+ "prelude-ls": "1.1.2"
}
},
"type-is": {
@@ -2534,7 +2610,7 @@
"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
"requires": {
"media-typer": "0.3.0",
- "mime-types": "~2.1.18"
+ "mime-types": "2.1.18"
}
},
"uglify-js": {
@@ -2543,9 +2619,9 @@
"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
"optional": true,
"requires": {
- "source-map": "~0.5.1",
- "uglify-to-browserify": "~1.0.0",
- "yargs": "~3.10.0"
+ "source-map": "0.5.7",
+ "uglify-to-browserify": "1.0.2",
+ "yargs": "3.10.0"
},
"dependencies": {
"source-map": {
@@ -2567,7 +2643,7 @@
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
"integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
"requires": {
- "random-bytes": "~1.0.0"
+ "random-bytes": "1.0.0"
}
},
"unpipe": {
@@ -2581,9 +2657,14 @@
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"dev": true,
"requires": {
- "punycode": "^2.1.0"
+ "punycode": "2.1.1"
}
},
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ },
"utils-merge": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -2599,7 +2680,7 @@
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"requires": {
- "isexe": "^2.0.0"
+ "isexe": "2.0.0"
}
},
"which-module": {
@@ -2623,8 +2704,8 @@
"resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"requires": {
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1"
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -2637,7 +2718,7 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
- "number-is-nan": "^1.0.0"
+ "number-is-nan": "1.0.1"
}
},
"string-width": {
@@ -2645,9 +2726,9 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
- "code-point-at": "^1.0.0",
- "is-fullwidth-code-point": "^1.0.0",
- "strip-ansi": "^3.0.0"
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
}
},
"strip-ansi": {
@@ -2655,7 +2736,7 @@
"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
- "ansi-regex": "^2.0.0"
+ "ansi-regex": "2.1.1"
}
}
}
@@ -2671,7 +2752,7 @@
"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
"dev": true,
"requires": {
- "mkdirp": "^0.5.1"
+ "mkdirp": "0.5.1"
}
},
"y18n": {
@@ -2690,9 +2771,9 @@
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"optional": true,
"requires": {
- "camelcase": "^1.0.2",
- "cliui": "^2.1.0",
- "decamelize": "^1.0.0",
+ "camelcase": "1.2.1",
+ "cliui": "2.1.0",
+ "decamelize": "1.2.0",
"window-size": "0.1.0"
}
},
@@ -2701,7 +2782,7 @@
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
"integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
"requires": {
- "camelcase": "^4.1.0"
+ "camelcase": "4.1.0"
},
"dependencies": {
"camelcase": {
diff --git a/package.json b/package.json
index a623ec7..c7b1948 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"bcrypt": "^3.0.1",
"body-parser": "^1.18.3",
"colors": "^1.1.2",
+ "connect-mongo": "^2.0.1",
"express": "^4.16.2",
"express-handlebars": "^3.0.0",
"express-session": "^1.15.6",
diff --git a/passport.config.js b/passport.config.js
new file mode 100644
index 0000000..dfbbed9
--- /dev/null
+++ b/passport.config.js
@@ -0,0 +1,55 @@
+/*
+
+passport.config.js -
+Passport setup file. handles authentication strategy and session setup
+
+*/
+
+// imports
+const LocalStrategy = require('passport-local').Strategy;
+const passport = require('passport');
+const bcrypt = require('bcrypt');
+const adminUserModel = require('./models/admin-user').adminUserModel;
+
+// setup authentication
+module.exports = (app) => {
+ app.use(passport.initialize());
+ app.use(passport.session());
+ passport.use('adminUserStrategy', new LocalStrategy(
+ (username, password, done) => {
+ // find user in database
+ adminUserModel.findByUsername(username).then((user) => {
+ if (!user) {
+ // user doesnt exist
+ return done(null, false, {message: 'Incorrect user'});
+ }
+
+ bcrypt.compare(password, user.password, (err, res) => {
+ if (err || !res) {
+ // error comparing hashes
+ return done(null, false, {message: 'Incorrect password'});
+ }
+
+ // password is correct, return user
+ return done(null, user);
+
+ });
+ }).catch((err) => {
+ if (err) {
+ // error finding in database
+ return done(null, false, {code: 500});
+ }
+ });
+ }
+ ));
+ //Configuring app to have sessions
+ passport.serializeUser(function(user, done) {
+ done(null, user.id);
+ });
+
+ passport.deserializeUser(function(id, done) {
+ adminUserModel.findById(id, function(err, user) {
+ done(err, user);
+ });
+ });
+};
diff --git a/routes/admin.js b/routes/admin.js
index ab368e1..6d2197e 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -5,10 +5,9 @@ file for handling admin panel routes
*/
-// import express' router
+// imports
const router = require('express').Router();
-
-// import dependencies
+const passport = require('passport');
const common = require('../helpers/common');
const adminUserMiddleware = require('../middleware/admin-authentication');
const adminUser = require('../models/admin-user');
@@ -18,22 +17,57 @@ router.get('/admin', (req, res) => {
res.render('admin');
});
-// admin login
-router.post('/admin/login', (req, res) => {
- common.sendApi404(req, res);
+/*
+* /admin/api/v1/login
+*
+* signs admin user in
+*
+* post {
+* username - username of admin account
+* password - password of admin account
+* }
+* return {
+* code: http code
+* success: boolean - true if login succesfull
+* username: undefined | string - username if login was successfull
+* role: undefined | string - role of user if login was successfull
+* errors: Strings[messages] - not yet :(
+* }
+*/
+// TODO make login somehow display errors in correct format.
+router.post('/admin/api/v1/login', passport.authenticate('adminUserStrategy'), function (req, res) {
+ common.sendApiReturn(res, {
+ username: req.user.username,
+ role: req.user.role ? req.user.role : undefined
+ });
});
-// endpoints
-router.use('/admin/api/v1', adminUserMiddleware);
-
-router.post('/admin/register', (req, res) => {
- if (!req.body || !req.body.username || !req.body.password) {
- // no/wrong post body
- common.sendApiGenericError(req, res);
+/*
+* /admin/api/v1/register
+* - requires admin auth
+*
+* registers a new admin user
+*
+* post {
+* username - username of new admin account
+* password - password of new admin account
+* }
+* return {
+* code: httpcode
+* success: boolean - true if register was successull
+* username: undefined | string - username if register was successfull
+* role: undefined | string - role of user if register was successfull
+* errors: Strings[messages]
+* }
+*/
+router.post('/admin/api/v1/register', adminUserMiddleware.adminAuthenticationRequired, (req, res) => {
+ if (!req.body) {
+ // no post body
+ common.sendApiGenericError(res);
return;
}
+
const { username, password } = req.body;
-
const newUser = new adminUser.adminUserModel({
username,
password
@@ -41,23 +75,53 @@ router.post('/admin/register', (req, res) => {
newUser.save().then(() => {
// successfull
- res.status(201).json({
- success: true
+ common.sendApiReturn(res, {
+ username: req.user.username,
+ role: req.user.role ? req.user.role : undefined
});
return;
}).catch((rejection) => {
- res.status(500).json(rejection);
+ // TODO format exception so it doesnt have a huge list of errors
+ common.sendApiError(res, 500, [rejection]);
return;
});
});
-router.post('/admin/api/v1/ping', (req, res) => {
- res.json({
- success: true,
- messsage: 'pong!'
+/*
+* /admin/api/v1/check
+*
+* checks if admin logged in
+*
+* return {
+* code: httpcode
+* success: boolean - true if request was without errors
+* isAuthed: boolean - true if logged in
+* role: undefined | string - returns user role
+* errors: Strings[messages]
+* }
+*/
+router.get('/admin/api/v1/check', adminUserMiddleware.authenticationOptional, (req, res) => {
+ common.sendApiReturn(res, {
+ isAuthed: req.user ? true : false,
+ role: req.user ? (req.user.role ? req.user.role : undefined) : undefined
});
});
+/*
+* /admin/api/v1/logout
+*
+* logs out admin user
+*
+* return {
+* code: httpcode
+* success: boolean - true if logout is successfull
+* errors: Strings[messages]
+* }
+*/
+router.get('/admin/api/v1/logout', adminUserMiddleware.adminAuthenticationRequired, (req, res) => {
+ req.logout();
+ common.sendApiReturn(res, {});
+});
// export the router
module.exports = router;
diff --git a/routes/blog.js b/routes/blog.js
index f58f2f7..f6dff60 100644
--- a/routes/blog.js
+++ b/routes/blog.js
@@ -5,7 +5,7 @@ file for handling routes regarding blog posts.
*/
-// import express' router
+// imports
const router = require('express').Router();
const blogHelper = require('../helpers/blog-helper.js');
@@ -28,5 +28,5 @@ router.get('/news/:id', async (req, res) => {
res.render('post', hbsObject);
});
-// export the router
+// export router
module.exports = router;
diff --git a/routes/home.js b/routes/home.js
index ca10197..38c9045 100644
--- a/routes/home.js
+++ b/routes/home.js
@@ -6,7 +6,7 @@ for routes on the root path
*/
-// import express' router
+// imports
const router = require('express').Router();
// display home page
diff --git a/server.js b/server.js
index 1930e3e..3a3d87b 100644
--- a/server.js
+++ b/server.js
@@ -1,110 +1,78 @@
/*
server.js -
-the file that contains the code to run the server
+the file that contains the startup code
*/
-// module imports, and
-// some important variable defs
+// imports
const express = require('express');
const handlebars = require('express-handlebars');
const session = require('express-session');
-const passport = require('passport');
-const LocalStrategy = require('passport').Strategy;
-const bcrypt = require('bcrypt');
+const mongoStore = require('connect-mongo')(session);
const mongoose = require('mongoose');
const bodyParser = require('body-parser');
const config = require('./config.json');
-const app = express();
const common = require('./helpers/common');
-const adminUserModel = require('./models/admin-user').adminUserModel;
+const passportconfig = require('./passport.config.js');
-// import the colors module
+// setup console colors
require('colors');
-// locations for some files
+// fix database deprecation warnings
+mongoose.set('useCreateIndex', true);
+mongoose.set('useNewUrlParser', true);
+// setup database connection
+mongoose.connect(config.database.url);
+const connection = mongoose.connection;
+connection.on('error', console.error.bind(console, 'connection error:'));
+
+// setup express
+const app = express();
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(session({
+ secret: config.secrets.session,
+ saveUninitialized: true,
+ resave: true,
+ cookie: {
+ maxAge: 3600000,
+ httpOnly: true//, // remove on production
+ /*secure: true*/ // uncomment on production
+ },
+ // permanent session storing for MongoDB
+ store: new mongoStore({
+ mongooseConnection: connection,
+ collection: 'sessions'
+ })
+}));
+passportconfig(app);
+
+// handlebars templating setup
+app.engine('.hbs', handlebars({
+ extname: '.hbs',
+ layoutsDir: 'views',
+ partialsDir: 'views/partials'
+}));
+app.set('view engine', '.hbs');
+
+// locations and routes setup
const locations = {
home: require('./routes/home'),
posts: require('./routes/blog'),
admin: require('./routes/admin')
};
-// setup body parser
-app.use(bodyParser.urlencoded({ extended: false }));
-
-// setup database
-mongoose.connect(config.database.url);
-const connection = mongoose.connection;
-connection.on('error', console.error.bind(console, 'connection error:'));
-
-// setup session
-app.use(session({
- secret: config.secrets.session,
- //cookie: { secure: true } // use when https is enabled
-}));
-
-// setup authentication
-app.use(passport.initialize());
-app.use(passport.session());
-passport.use('adminUserStrategy', new LocalStrategy(
- (username, password, done) => {
- // find user in database
- adminUserModel.findByUsername(username).then((user) => {
- if (!user) {
- // user doesnt exist
- return done(null, false);
- }
-
- bcrypt.compare(password, user.password, (err, res) => {
- if (err || !res) {
- // error comparing hashes
- return done(null, false);
- }
-
- // password is correct, return user
- return done(null, user);
-
- });
- }).catch((err) => {
- if (err) {
- // error finding in database
- return done(null, false);
- }
- });
- }
-));
-
-// load the handlebars module
-app.engine('.hbs', handlebars({
- extname: '.hbs',
- layoutsDir: 'views',
- partialsDir: 'views/partials'
-}));
-
-// set express to use handlebars
-// as the templating engine
-app.set('view engine', '.hbs');
-
-// set some routes on the server
-
-// assets folder serving
+// static files
app.use('/assets', express.static('assets'));
-
-// website root
+// page map
app.use('/', locations.home);
-
-// blog posts
app.use('/', locations.posts);
-
-// admin panel
app.use('/', locations.admin);
+app.use((req, res) => {
+ common.sendDefault404(res);
+});
-// send a 404 on a file not
-// being found
-app.use(common.sendDefault404);
-
-// start the server
+// startup
app.listen(config.http.port, () => {
console.log(`started the server on port: ${new String(config.http.port).green}`);
});
diff --git a/views/admin.hbs b/views/admin.hbs
index 38bcbb2..1d4185f 100644
--- a/views/admin.hbs
+++ b/views/admin.hbs
@@ -7,19 +7,21 @@
Admin panel here
register
-
login
-
+ Check if logged in
+
{{> footer }}