Skip to content

Commit

Permalink
back to express (for view rendering)
Browse files Browse the repository at this point in the history
  • Loading branch information
JaneJeon committed Sep 28, 2019
1 parent 82ac2ce commit 3420807
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 32 deletions.
40 changes: 14 additions & 26 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,27 @@
require('dotenv-defaults').config()
require('express-async-errors')

const app = require('restana')({
errorHandler: require('./middlewares/error-handler')
})
const passport = require('./lib/passport')
const express = require('express')
const app = express()

app
.use(require('helmet')())
.use(require('cors')({ origin: true }))
.use(require('body-parser').json())
.use(express.json())
.use(require('./middlewares/session'))
.use(passport.initialize())
.use(passport.session())
.get('/')
.get('/login')
.get('/auth/github', passport.authenticate('github'))
.get(
'/auth/github/callback',
passport.authenticate('github', { failureRedirect: '/login' }),
(req, res) => {
res.redirect(req.session.returnTo || '/')
}
) // TODO: subdomain?!?
.use(express.static('public', { index: false }))
.use(require('./routes'))
.use(require('./middlewares/error-handler'))

app
.start(process.env.PORT)
.then(server => {
console.log(`Server listening at ${server.address}`)
})
.catch(err => {
console.error(err)
process.exit(1)
if (process.env.NODE_ENV !== 'test')
app.listen(process.env.PORT, function(err) {
if (err) {
console.error('Could not start server:', err)
process.exit(1)
} else console.log(`Server listening at ${this.address()}`)
})

process.on('SIGINT', () => {
app.close().then(() => process.exit())
})

module.exports = app
2 changes: 1 addition & 1 deletion middlewares/error-handler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const omit = require('lodash/omit')

// https://mongoosejs.com/docs/api/error.html
module.exports = (err, req, res) => {
module.exports = (err, req, res, next) => {
let { status, message, errors } = err
if (status) status = Math.min(status, 500)
else
Expand Down
14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test": "jest --forceExit",
"test:watch": "yarn test --watch",
"coverage": "is-ci && codecov",
"clean": "rimraf reports coverage"
"clean": "rimraf reports coverage logs/*.log"
},
"jest": {
"testEnvironment": "node"
Expand Down Expand Up @@ -61,30 +61,34 @@
"dependencies": {
"@casl/ability": "^3.2.0",
"@casl/mongoose": "^2.3.2",
"body-parser": "^1.19.0",
"chalk": "^2.4.2",
"commander": "^3.0.1",
"connect-ensure-login": "^0.1.1",
"connect-mongo": "^3.0.0",
"cors": "^2.8.5",
"dotenv-defaults": "^1.0.2",
"express": "^4.17.1",
"express-async-errors": "^3.1.1",
"express-rate-limit": "^5.0.0",
"express-request-id": "^1.4.1",
"express-session": "^1.16.2",
"got": "^9.6.0",
"hashids": "^2.0.1",
"helmet": "^3.21.1",
"lodash": "^4.17.15",
"mongoose": "^5.7.1",
"mongoose-hidden": "^1.8.0",
"mongoose-paginate-v2": "^1.3.1",
"mongoose-sequence": "^5.2.1",
"mongoose-unique-validator": "^2.0.3",
"morgan": "^1.9.1",
"ms": "^2.1.2",
"normalize-url": "^4.4.1",
"passport": "^0.4.0",
"passport-github": "^1.1.0",
"passport-remember-me": "^0.0.1",
"rate-limit-redis": "^1.6.0",
"restana": "^3.3.1",
"winston": "^3.2.1"
"winston": "^3.2.1",
"winston-daily-rotate-file": "^4.1.0"
},
"devDependencies": {
"@types/jest": "^24.0.18",
Expand Down

0 comments on commit 3420807

Please sign in to comment.