refactor: move apollo server context creator to middleware function
This commit is contained in:
parent
0272dc2bd1
commit
c0d1db834b
3 changed files with 36 additions and 23 deletions
|
|
@ -16,12 +16,11 @@ const options = require('../options')
|
||||||
const users = require('../users')
|
const users = require('../users')
|
||||||
const logger = require('../logger')
|
const logger = require('../logger')
|
||||||
|
|
||||||
const session = require('./middlewares/session')
|
|
||||||
const { AuthDirective } = require('./graphql/directives')
|
const { AuthDirective } = require('./graphql/directives')
|
||||||
const { typeDefs, resolvers } = require('./graphql/schema')
|
const { typeDefs, resolvers } = require('./graphql/schema')
|
||||||
const computeSchema = require('../compute-schema')
|
const computeSchema = require('../compute-schema')
|
||||||
const cleanUserSessions = require('./middlewares/cleanUserSessions')
|
|
||||||
const { USER_SESSIONS_CLEAR_INTERVAL } = require('../constants')
|
const { USER_SESSIONS_CLEAR_INTERVAL } = require('../constants')
|
||||||
|
const { session, cleanUserSessions, buildApolloContext } = require('./middlewares')
|
||||||
|
|
||||||
const devMode = require('minimist')(process.argv.slice(2)).dev
|
const devMode = require('minimist')(process.argv.slice(2)).dev
|
||||||
const idPhotoCardBasedir = _.get('idPhotoCardDir', options)
|
const idPhotoCardBasedir = _.get('idPhotoCardDir', options)
|
||||||
|
|
@ -59,27 +58,7 @@ const apolloServer = new ApolloServer({
|
||||||
logger.error(error)
|
logger.error(error)
|
||||||
return error
|
return error
|
||||||
},
|
},
|
||||||
context: async ({ req, res }) => {
|
context: async (obj) => buildApolloContext(obj)
|
||||||
if (!req.session.user) return { req }
|
|
||||||
|
|
||||||
const user = await users.verifyAndUpdateUser(
|
|
||||||
req.session.user.id,
|
|
||||||
req.headers['user-agent'] || 'Unknown',
|
|
||||||
req.ip
|
|
||||||
)
|
|
||||||
if (!user || !user.enabled) throw new AuthenticationError('Authentication failed')
|
|
||||||
|
|
||||||
req.session.ua = req.headers['user-agent'] || 'Unknown'
|
|
||||||
req.session.ipAddress = req.ip
|
|
||||||
req.session.lastUsed = new Date(Date.now()).toISOString()
|
|
||||||
req.session.user.id = user.id
|
|
||||||
req.session.user.role = user.role
|
|
||||||
|
|
||||||
res.set('role', user.role)
|
|
||||||
res.set('Access-Control-Expose-Headers', 'role')
|
|
||||||
|
|
||||||
return { req }
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
apolloServer.applyMiddleware({
|
apolloServer.applyMiddleware({
|
||||||
|
|
|
||||||
25
lib/new-admin/middlewares/context.js
Normal file
25
lib/new-admin/middlewares/context.js
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
const users = require('../../users')
|
||||||
|
|
||||||
|
const buildApolloContext = async ({ req, res }) => {
|
||||||
|
if (!req.session.user) return { req }
|
||||||
|
|
||||||
|
const user = await users.verifyAndUpdateUser(
|
||||||
|
req.session.user.id,
|
||||||
|
req.headers['user-agent'] || 'Unknown',
|
||||||
|
req.ip
|
||||||
|
)
|
||||||
|
if (!user || !user.enabled) throw new AuthenticationError('Authentication failed')
|
||||||
|
|
||||||
|
req.session.ua = req.headers['user-agent'] || 'Unknown'
|
||||||
|
req.session.ipAddress = req.ip
|
||||||
|
req.session.lastUsed = new Date(Date.now()).toISOString()
|
||||||
|
req.session.user.id = user.id
|
||||||
|
req.session.user.role = user.role
|
||||||
|
|
||||||
|
res.set('role', user.role)
|
||||||
|
res.set('Access-Control-Expose-Headers', 'role')
|
||||||
|
|
||||||
|
return { req }
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = buildApolloContext
|
||||||
9
lib/new-admin/middlewares/index.js
Normal file
9
lib/new-admin/middlewares/index.js
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
const cleanUserSessions = require('./cleanUserSessions')
|
||||||
|
const buildApolloContext = require('./context')
|
||||||
|
const session = require('./session')
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
cleanUserSessions,
|
||||||
|
buildApolloContext,
|
||||||
|
session
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue