From 4eb0962a7b92c9ac0ce63ef42c6085bdfc216caf Mon Sep 17 00:00:00 2001 From: Daniel Temme Date: Sat, 19 Aug 2017 16:12:45 +0200 Subject: [PATCH] separate server binding to port from other app config this seems a bit crude but allows running the tests and having them take care of setting up the port to use --- src/app.ts | 138 +++++++++++++++++++++++++++++++++++++++++++ src/server.ts | 137 +----------------------------------------- test/api.test.ts | 3 +- test/app.test.ts | 3 +- test/contact.test.ts | 3 +- test/home.test.ts | 3 +- test/user.test.ts | 3 +- 7 files changed, 149 insertions(+), 141 deletions(-) create mode 100644 src/app.ts diff --git a/src/app.ts b/src/app.ts new file mode 100644 index 0000000..5a2c13a --- /dev/null +++ b/src/app.ts @@ -0,0 +1,138 @@ +/** + * Module dependencies. + */ +import * as express from "express"; +import * as compression from "compression"; // compresses requests +import * as session from "express-session"; +import * as bodyParser from "body-parser"; +import * as logger from "morgan"; +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"; +import expressValidator = require("express-validator"); + + +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); + +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 || "/"); +}); + +module.exports = app; \ No newline at end of file diff --git a/src/server.ts b/src/server.ts index 7afcfa6..13c75b1 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,141 +1,6 @@ -/** - * Module dependencies. - */ -import * as express from "express"; -import * as compression from "compression"; // compresses requests -import * as session from "express-session"; -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"; -import expressValidator = require("express-validator"); - - -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); - -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 || "/"); -}); +const app = require("./app"); /** * Error Handler. Provides full stack - remove for production diff --git a/test/api.test.ts b/test/api.test.ts index 91e6ee9..335ce74 100644 --- a/test/api.test.ts +++ b/test/api.test.ts @@ -1,7 +1,8 @@ import {} from "jest"; import * as supertest from "supertest"; -const request = supertest("http://localhost:3000"); +const app = require("../src/app"); +const request = supertest(app); describe("GET /api", () => { it("should return 200 OK", () => { diff --git a/test/app.test.ts b/test/app.test.ts index 0dfe80c..7b484aa 100644 --- a/test/app.test.ts +++ b/test/app.test.ts @@ -1,6 +1,7 @@ import {} from "jest"; import * as supertest from "supertest"; -const request = supertest("http://localhost:3000"); +const app = require("../src/app"); +const request = supertest(app); describe("GET /random-url", () => { it("should return 404", () => { diff --git a/test/contact.test.ts b/test/contact.test.ts index 70dcbf6..0d00f11 100644 --- a/test/contact.test.ts +++ b/test/contact.test.ts @@ -1,6 +1,7 @@ import {} from "jest"; import * as supertest from "supertest"; -const request = supertest("http://localhost:3000"); +const app = require("../src/app"); +const request = supertest(app); describe("GET /contact", () => { it("should return 200 OK", () => { diff --git a/test/home.test.ts b/test/home.test.ts index 7e5c4b4..32a8590 100644 --- a/test/home.test.ts +++ b/test/home.test.ts @@ -1,6 +1,7 @@ import {} from "jest"; import * as supertest from "supertest"; -const request = supertest("http://localhost:3000"); +const app = require("../src/app"); +const request = supertest(app); describe("GET /", () => { it("should return 200 OK", () => { diff --git a/test/user.test.ts b/test/user.test.ts index 96c283f..baa6278 100644 --- a/test/user.test.ts +++ b/test/user.test.ts @@ -1,6 +1,7 @@ import {} from "jest"; import * as supertest from "supertest"; -const request = supertest("http://localhost:3000"); +const app = require("../src/app"); +const request = supertest(app); describe("GET /login", () => { it("should return 200 OK", () => {