feat(*): update several dependencies

2025-11-08 16:17:37 +00:00 · 2017-10-29 14:01:58 +01:00
parent cda6561d86
commit 4d2b9148cf
8 changed files with 4715 additions and 3474 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -43,59 +43,59 @@
    "testEnvironment": "node"
  },
  "dependencies": {
-    "async": "^2.1.2",
+    "async": "^2.5.0",
    "bcrypt-nodejs": "^0.0.3",
-    "body-parser": "^1.15.2",
-    "compression": "^1.6.2",
+    "body-parser": "^1.18.2",
+    "compression": "^1.7.1",
    "connect-mongo": "^1.3.2",
    "dotenv": "^2.0.0",
-    "errorhandler": "^1.4.3",
-    "express": "^4.14.0",
-    "express-flash": "^0.0.2",
-    "express-session": "^1.14.2",
-    "express-validator": "^3.1.3",
-    "fbgraph": "^1.3.0",
+    "errorhandler": "^1.5.0",
+    "express": "^4.16.2",
+    "express-flash": "0.0.2",
+    "express-session": "^1.15.6",
+    "express-validator": "^4.2.1",
+    "fbgraph": "^1.4.1",
    "lodash": "^4.17.4",
-    "lusca": "^1.4.1",
-    "mongoose": "^4.6.6",
-    "morgan": "^1.7.0",
-    "nodemailer": "^2.6.4",
-    "passport": "0.3.2",
+    "lusca": "^1.5.2",
+    "mongoose": "^4.12.4",
+    "morgan": "^1.9.0",
+    "nodemailer": "^2.7.2",
+    "passport": "^0.4.0",
    "passport-facebook": "^2.1.1",
    "passport-local": "^1.0.0",
-    "pug": "^2.0.0-beta6",
-    "request": "^2.78.0"
+    "pug": "^2.0.0-rc.4",
+    "request": "^2.83.0"
  },
  "devDependencies": {
    "@types/async": "^2.0.40",
    "@types/bcrypt-nodejs": "0.0.30",
    "@types/body-parser": "^1.16.2",
    "@types/compression": "0.0.33",
-    "@types/connect-mongo": "0.0.32",
+    "@types/connect-mongo": "0.0.34",
    "@types/dotenv": "^2.0.20",
-    "@types/errorhandler": "0.0.30",
+    "@types/errorhandler": "0.0.32",
    "@types/express": "^4.0.35",
-    "@types/express-session": "0.0.32",
-    "@types/jest": "^19.2.2",
-    "@types/jquery": "^2.0.41",
-    "@types/lodash": "^4.14.63",
-    "@types/mongodb": "^2.1.43",
+    "@types/express-session": "^1.15.5",
+    "@types/jest": "^21.1.5",
+    "@types/jquery": "^3.2.15",
+    "@types/lodash": "^4.14.80",
+    "@types/mongodb": "^2.2.15",
    "@types/mongoose": "^4.7.9",
    "@types/morgan": "^1.7.32",
    "@types/node": "^7.0.12",
    "@types/nodemailer": "^1.3.32",
    "@types/passport": "^0.3.3",
    "@types/passport-facebook": "^2.1.3",
-    "@types/request": "0.0.45",
+    "@types/request": "^2.0.7",
    "@types/supertest": "^2.0.0",
    "concurrently": "^3.4.0",
-    "jest": "^19.0.2",
+    "jest": "^21.2.1",
    "node-sass": "^4.5.2",
    "nodemon": "^1.11.0",
    "shelljs": "^0.7.7",
    "supertest": "^2.0.1",
-    "ts-jest": "^19.0.8",
-    "tslint": "^5.0.0",
+    "ts-jest": "^21.1.4",
+    "tslint": "^5.8.0",
    "typescript": "^2.4.0"
  }
 }
--- a/src/server.ts
+++ b/src/server.ts
@@ -1,6 +1,141 @@
+/**
+ * Module dependencies.
+ */
+import * as express from "express";
+import * as compression from "compression";  // compresses requests
+import * as session from "express-session";
+import * as expressValidator from "express-validator";
+import * as bodyParser from "body-parser";
+import * as logger from "morgan";
 import * as errorHandler from "errorhandler";
+import * as lusca from "lusca";
+import * as dotenv from "dotenv";
+import * as mongo from "connect-mongo";
+import * as flash from "express-flash";
+import * as path from "path";
+import * as mongoose from "mongoose";
+import * as passport from "passport";

-const app = require("./app");
+
+const MongoStore = mongo(session);
+
+/**
+ * Load environment variables from .env file, where API keys and passwords are configured.
+ */
+dotenv.config({ path: ".env.example" });
+
+
+/**
+ * Controllers (route handlers).
+ */
+import * as homeController from "./controllers/home";
+import * as userController from "./controllers/user";
+import * as apiController from "./controllers/api";
+import * as contactController from "./controllers/contact";
+
+/**
+ * API keys and Passport configuration.
+ */
+import * as passportConfig from "./config/passport";
+
+/**
+ * Create Express server.
+ */
+const app = express();
+
+/**
+ * Connect to MongoDB.
+ */
+// mongoose.Promise = global.Promise;
+mongoose.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI, {
+  useMongoClient: true
+});
+mongoose.connection.on("error", () => {
+  console.log("MongoDB connection error. Please make sure MongoDB is running.");
+  process.exit();
+});
+
+
+
+/**
+ * Express configuration.
+ */
+app.set("port", process.env.PORT || 3000);
+app.set("views", path.join(__dirname, "../views"));
+app.set("view engine", "pug");
+app.use(compression());
+app.use(logger("dev"));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use(expressValidator());
+app.use(session({
+  resave: true,
+  saveUninitialized: true,
+  secret: process.env.SESSION_SECRET,
+  store: new MongoStore({
+    url: process.env.MONGODB_URI || process.env.MONGOLAB_URI,
+    autoReconnect: true
+  })
+}));
+app.use(passport.initialize());
+app.use(passport.session());
+app.use(flash());
+app.use(lusca.xframe("SAMEORIGIN"));
+app.use(lusca.xssProtection(true));
+app.use((req, res, next) => {
+  res.locals.user = req.user;
+  next();
+});
+app.use((req, res, next) => {
+  // After successful login, redirect back to the intended page
+  if (!req.user &&
+    req.path !== "/login" &&
+    req.path !== "/signup" &&
+    !req.path.match(/^\/auth/) &&
+    !req.path.match(/\./)) {
+    req.session.returnTo = req.path;
+  } else if (req.user &&
+    req.path == "/account") {
+    req.session.returnTo = req.path;
+  }
+  next();
+});
+app.use(express.static(path.join(__dirname, "public"), { maxAge: 31557600000 }));
+
+/**
+ * Primary app routes.
+ */
+app.get("/", homeController.index);
+app.get("/login", userController.getLogin);
+app.post("/login", userController.postLogin);
+app.get("/logout", userController.logout);
+app.get("/forgot", userController.getForgot);
+app.post("/forgot", userController.postForgot);
+app.get("/reset/:token", userController.getReset);
+app.post("/reset/:token", userController.postReset);
+app.get("/signup", userController.getSignup);
+app.post("/signup", userController.postSignup);
+app.get("/contact", contactController.getContact);
+app.post("/contact", contactController.postContact);
+app.get("/account", passportConfig.isAuthenticated, userController.getAccount);
+app.post("/account/profile", passportConfig.isAuthenticated, userController.postUpdateProfile);
+app.post("/account/password", passportConfig.isAuthenticated, userController.postUpdatePassword);
+app.post("/account/delete", passportConfig.isAuthenticated, userController.postDeleteAccount);
+app.get("/account/unlink/:provider", passportConfig.isAuthenticated, userController.getOauthUnlink);
+
+/**
+ * API examples routes.
+ */
+app.get("/api", apiController.getApi);
+app.get("/api/facebook", passportConfig.isAuthenticated, passportConfig.isAuthorized, apiController.getFacebook);
+
+/**
+ * OAuth authentication routes. (Sign in)
+ */
+app.get("/auth/facebook", passport.authenticate("facebook", { scope: ["email", "public_profile"] }));
+app.get("/auth/facebook/callback", passport.authenticate("facebook", { failureRedirect: "/login" }), (req, res) => {
+  res.redirect(req.session.returnTo || "/");
+});

 /**
 * Error Handler. Provides full stack - remove for production
--- a/test/api.test.ts
+++ b/test/api.test.ts
@@ -1,10 +1,9 @@
-import {} from "jest";
 import * as supertest from "supertest";
-
-const app = require("../src/app");
-const request = supertest(app);
+import * as app from "../src/server";

 describe("GET /api", () => {
+  const request = supertest(app);
+
  it("should return 200 OK", () => {
    return request
      .get("/api")
--- a/test/app.test.ts
+++ b/test/app.test.ts
@@ -1,11 +1,11 @@
-import {} from "jest";
 import * as supertest from "supertest";
-const app = require("../src/app");
-const request = supertest(app);
+import * as app from "../src/server";

 describe("GET /random-url", () => {
-  it("should return 404", () => {
-    return request.get("/reset")
-      .expect(404);
+  const request = supertest(app);
+
+  it("should return 404", (done) => {
+    request.get("/reset")
+      .expect(404, done);
  });
 });
--- a/test/contact.test.ts
+++ b/test/contact.test.ts
@@ -1,11 +1,11 @@
-import {} from "jest";
 import * as supertest from "supertest";
-const app = require("../src/app");
-const request = supertest(app);
+import * as app from "../src/server";

 describe("GET /contact", () => {
-  it("should return 200 OK", () => {
-    return request.get("/contact")
-      .expect(200);
+  const request = supertest(app);
+
+  it("should return 200 OK", (done) => {
+    request.get("/contact")
+      .expect(200, done);
  });
 });
--- a/test/home.test.ts
+++ b/test/home.test.ts
@@ -1,11 +1,11 @@
-import {} from "jest";
 import * as supertest from "supertest";
-const app = require("../src/app");
-const request = supertest(app);
+import * as app from "../src/server";

 describe("GET /", () => {
-  it("should return 200 OK", () => {
-    return request.get("/")
-      .expect(200);
+  const request = supertest(app);
+
+  it("should return 200 OK", (done) => {
+    request.get("/")
+      .expect(200, done);
  });
 });
--- a/test/user.test.ts
+++ b/test/user.test.ts
@@ -1,6 +1,6 @@
-import {} from "jest";
 import * as supertest from "supertest";
-const app = require("../src/app");
+import * as app from "../src/server";
+
 const request = supertest(app);

 describe("GET /login", () => {