Skip to content
Snippets Groups Projects
Commit e992e77a authored by Andy Nicholson's avatar Andy Nicholson
Browse files

revert back to version on main

parent 217db7b4
No related branches found
No related tags found
No related merge requests found
/* eslint-disable no-param-reassign */
/* eslint-disable global-require */
const path = require('path')
const config = require('config')
......@@ -12,6 +10,7 @@ const helmet = require('helmet')
const cookieParser = require('cookie-parser')
const bodyParser = require('body-parser')
const passport = require('passport')
const gqlApi = require('./graphql')
// const index = require('./routes/index')
// const api = require('./routes/api')
const logger = require('@pubsweet/logger')
......@@ -23,10 +22,9 @@ const registerComponents = require('pubsweet-server/src/register-components') //
// Wax Collab requirements
const WebSocket = require('ws')
const EventEmitter = require('events')
const wsUtils = require('./wax-collab/server-util.js')
// const cookie = require('cookie')
const gqlApi = require('./graphql')
const EventEmitter = require('events')
const configureApp = app => {
const models = require('@pubsweet/models')
......@@ -37,7 +35,6 @@ const configureApp = app => {
app.use(bodyParser.json({ limit: '50mb' }))
morgan.token('graphql', ({ body }, res, type) => {
if (!body.operationName) return ''
switch (type) {
case 'query':
return body.query.replace(/\s+/g, ' ')
......@@ -69,7 +66,6 @@ const configureApp = app => {
),
)
}
// Passport strategies
app.use(passport.initialize())
const authentication = require('pubsweet-server/src/authentication')
......@@ -107,20 +103,13 @@ const configureApp = app => {
if (err.name === 'ValidationError') {
return res.status(STATUS.BAD_REQUEST).json({ message: err.message })
}
if (err.name === 'ConflictError') {
} else if (err.name === 'ConflictError') {
return res.status(STATUS.CONFLICT).json({ message: err.message })
}
if (err.name === 'AuthorizationError') {
} else if (err.name === 'AuthorizationError') {
return res.status(err.status).json({ message: err.message })
}
if (err.name === 'AuthenticationError') {
} else if (err.name === 'AuthenticationError') {
return res.status(STATUS.UNAUTHORIZED).json({ message: err.message })
}
return res
.status(err.status || STATUS.INTERNAL_SERVER_ERROR)
.json({ message: err.message })
......@@ -144,12 +133,10 @@ const configureApp = app => {
serverProxy.emit('upgrade', request, socket, head, ...rest)
} else {
let user = null
if (request.headers.cookie) {
// const cookies = cookie.parse(request.headers.cookie)
// const user = cookies.user_identifier
}
// TODO: Do real auth for Wax-collab
user = 'test' // shortcut
......@@ -158,7 +145,6 @@ const configureApp = app => {
socket.destroy()
return
}
wss.handleUpgrade(request, socket, head, ws => {
wss.emit('connection', ws, request)
})
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment