Merge branch 'dev' into feat-decouple-l-s-entrypoint

This commit is contained in:
Rafael Taranto 2022-04-27 15:59:33 +01:00 committed by GitHub
commit 9f13873e36
18 changed files with 569 additions and 136 deletions

View file

@ -14,6 +14,7 @@ const computeSchema = require('./middlewares/compute-schema')
const findOperatorId = require('./middlewares/operatorId')
const populateDeviceId = require('./middlewares/populateDeviceId')
const populateSettings = require('./middlewares/populateSettings')
const recordPing = require('./middlewares/recordPing')
const cashboxRoutes = require('./routes/cashboxRoutes')
const customerRoutes = require('./routes/customerRoutes')
@ -29,6 +30,8 @@ const verifyUserRoutes = require('./routes/verifyUserRoutes')
const verifyTxRoutes = require('./routes/verifyTxRoutes')
const verifyPromoCodeRoutes = require('./routes/verifyPromoCodeRoutes')
const graphQLServer = require('./graphql/server')
const app = express()
const configRequiredRoutes = [
@ -38,7 +41,8 @@ const configRequiredRoutes = [
'/phone_code',
'/customer',
'/tx',
'/verify_promo_code'
'/verify_promo_code',
'/graphql'
]
const devMode = argv.dev || process.env.HTTP
@ -55,11 +59,12 @@ app.use('/', pairingRoutes)
app.use(findOperatorId)
app.use(populateDeviceId)
app.use(computeSchema)
if (!devMode) app.use(authorize)
app.use(authorize)
app.use(configRequiredRoutes, populateSettings)
app.use(filterOldRequests)
// other app routes
app.use('/graphql', recordPing)
app.use('/poll', pollingRoutes)
app.use('/terms_conditions', termsAndConditionsRoutes)
app.use('/state', stateRoutes)
@ -78,6 +83,8 @@ app.use('/tx', txRoutes)
app.use('/logs', logsRoutes)
graphQLServer.applyMiddleware({ app })
app.use(errorHandler)
app.use((req, res) => {
res.status(404).json({ error: 'No such route' })