Migration to esm module

server/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["env", "stage-2"]
-}

server/package.json

@@ -12,32 +12,30 @@
     "url": "https://github.com/Superalgos/MasterApp/issues"
   },
   "homepage": "https://github.com/Superalgos/MasterApp#readme",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
-    "start": "nodemon --exec babel-node --presets env,stage-2 src/index.js",
+    "start": "nodemon src/index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-2": "^6.24.1",
-    "nodemon": "^1.18.10"
+    "nodemon": "1.19.1"
   },
   "dependencies": {
-    "apollo-link": "^1.2.3",
-    "apollo-link-context": "^1.0.9",
-    "apollo-link-http": "^1.5.5",
-    "apollo-server-express": "^2.1.0",
+    "apollo-link": "1.2.12",
+    "apollo-link-context": "1.0.18",
+    "apollo-link-http": "1.5.5",
+    "apollo-server-express": "2.6.4",
     "axios": "0.19.0",
-    "cors": "^2.8.4",
+    "body-parser": "1.19.0",
     "dotenv": "8.0.0",
-    "express": "^4.16.3",
-    "express-jwt": "^5.3.1",
-    "graphql": "^14.0.2",
-    "graphql-tools": "^4.0.0",
-    "jwks-rsa": "^1.3.0",
-    "lodash.merge": "^4.6.1",
-    "node-fetch": "^2.2.0",
-    "winston": "^3.1.0"
+    "esm": "3.2.25",
+    "express": "4.17.1",
+    "express-jwt": "5.3.1",
+    "graphql": "14.3.1",
+    "graphql-tools": "4.0.5",
+    "jwks-rsa": "1.5.1",
+    "lodash.merge": "4.6.1",
+    "node-fetch": "2.6.0",
+    "winston": "3.2.1"
   }
 }

server/src/app.js

@@ -0,0 +1,220 @@
+import express from 'express'
+import 'dotenv/config'
+import { ApolloServer, ForbiddenError } from 'apollo-server-express'
+import { mergeSchemas } from 'graphql-tools'
+import jwt from 'express-jwt'
+import jwksRsa from 'jwks-rsa'
+import axios from 'axios'
+
+import { createTransformedRemoteSchema } from './createRemoteSchema'
+import { teams, events, operations } from './links'
+
+import logger from './logger'
+import bodyParser from 'body-parser'
+
+async function getUserId (authId) {
+  try {
+
+    const userData = await axios({
+      url: process.env.USERS_API_URL,
+      method: 'post',
+      headers: {
+        preshared: process.env.USERS_API_PRESHARED
+      },
+      data: {
+        query: `
+        {
+          userByAuthId(authId: "${authId}")
+          {
+            id
+          }
+        }
+        `
+      }
+    })
+    return userData.data.data.userByAuthId.id
+  } catch (error) {
+    return (error)
+  }
+}
+
+async function run () {
+  const transformedKeyVaultSchema = await createTransformedRemoteSchema(
+    'keyVault_',
+    process.env.KEYVAULT_API_URL,
+    process.env.KEYVAULT_API_PRESHARED)
+  const transformedTeamsSchema = await createTransformedRemoteSchema(
+    'teams_',
+    process.env.TEAMS_API_URL,
+    process.env.TEAMS_API_PRESHARED)
+  const transformedUsersSchema = await createTransformedRemoteSchema(
+    'users_',
+    process.env.USERS_API_URL,
+    process.env.USERS_API_PRESHARED)
+  const transformedEventsSchema = await createTransformedRemoteSchema(
+    'events_',
+    process.env.EVENTS_API_URL,
+    process.env.EVENTS_API_PRESHARED)
+  const transformedOperationsSchema = await createTransformedRemoteSchema(
+    'operations_',
+    process.env.OPERATIONS_API_URL,
+    process.env.OPERATIONS_API_PRESHARED)
+  const transformedNotificationsSchema = await createTransformedRemoteSchema(
+    'notifications_',
+    process.env.NOTIFICATIONS_API_URL,
+    process.env.NOTIFICATIONS_API_PRESHARED)
+  const transformedLogsSchema = await createTransformedRemoteSchema(
+    'logs_',
+    process.env.LOGS_API_URL,
+    process.env.LOGS_API_PRESHARED)
+  const transformedStrategizerSchema = await createTransformedRemoteSchema(
+    'strategizer_',
+    process.env.STRATEGIZER_API_URL,
+    process.env.STRATEGIZER_API_PRESHARED)
+  const transformedCockpitSchema = await createTransformedRemoteSchema(
+    'cockpit_',
+    process.env.COCKPIT_API_URL,
+    process.env.COCKPIT_API_PRESHARED)
+  const transformedSAWeb = await createTransformedRemoteSchema(
+      'web_',
+      process.env.SAWEB_API_URL,
+      process.env.SAWEB_API_PRESHARED)
+
+  var schemas = []
+  var resolvers = {}
+
+  if (transformedTeamsSchema) {
+    schemas.push(transformedTeamsSchema)
+    if (transformedUsersSchema && transformedEventsSchema && transformedStrategizerSchema) {
+      schemas.push(teams.linkSchemaDefs)
+      resolvers = Object.assign(resolvers, teams.resolver(transformedUsersSchema, transformedEventsSchema, transformedStrategizerSchema))
+    }
+  }
+  if (transformedUsersSchema) {
+    schemas.push(transformedUsersSchema)
+  }
+  if (transformedEventsSchema) {
+    schemas.push(transformedEventsSchema)
+    if (transformedUsersSchema && transformedTeamsSchema && transformedOperationsSchema) {
+      schemas.push(events.linkSchemaDefs)
+      resolvers = Object.assign(resolvers, events.resolver(transformedUsersSchema, transformedTeamsSchema, transformedOperationsSchema))
+    }
+  }
+  if (transformedKeyVaultSchema) {
+    schemas.push(transformedKeyVaultSchema)
+  }
+  if (transformedOperationsSchema) {
+    schemas.push(transformedOperationsSchema)
+    if (transformedTeamsSchema && transformedCockpitSchema) {
+      schemas.push(operations.linkSchemaDefs)
+      resolvers = Object.assign(resolvers, operations.resolver(transformedTeamsSchema, transformedCockpitSchema))
+    }
+  }
+  if (transformedNotificationsSchema) {
+    schemas.push(transformedNotificationsSchema)
+  }
+  if (transformedLogsSchema) {
+    schemas.push(transformedLogsSchema)
+  }
+  if (transformedStrategizerSchema) {
+    schemas.push(transformedStrategizerSchema)
+  }
+  if (transformedCockpitSchema) {
+    schemas.push(transformedCockpitSchema)
+  }
+  if (transformedSAWeb) {
+    schemas.push(transformedSAWeb)
+  }
+
+  const schema = mergeSchemas({
+    schemas,
+    resolvers
+  })
+
+  const app = express()
+
+  app.use(bodyParser.json({limit: '50mb'}));
+  app.use(bodyParser.urlencoded({limit: '50mb', extended: true}));
+
+  app.use('/graphql',
+    jwt({
+      secret: jwksRsa.expressJwtSecret({
+        cache: true,
+        rateLimit: true,
+        jwksRequestsPerMinute: 1,
+        jwksUri: `https://${process.env.AUTH0_DOMAIN}/.well-known/jwks.json`
+      }),
+      credentialsRequired: false,
+      audience: process.env.AUTH0_AUDIENCE,
+      issuer: process.env.AUTH0_ISSUER,
+      algorithms: [`RS256`]
+    }),
+    function (err, req, res, next) {
+      if (err.code === 'invalid_token') {
+        res.locals.error = err.message
+      }
+      return next()
+    }
+  )
+
+  app.use('/graphql', (req, res, next) => {
+    res.locals.userId = ''
+    if (req.user) {
+      getUserId(req.user.sub)
+        .then(data => {
+          res.locals.userId = data
+          next()
+        })
+        .catch(err => {
+          console.log(err)
+          next()
+        })
+    } else {
+      next()
+    }
+  })
+
+  const context = ({ req, res }) => {
+    if (res.locals.error) {
+      throw new ForbiddenError(res.locals.error)
+    }
+    const response = {
+      headers: Object.assign(
+        res.locals.userId ? { userId: res.locals.userId } : {},
+        req.headers.authorization ? { authorization: req.headers.authorization } : {},
+        req.headers.access_token ? { access_token: req.headers.access_token } : {}
+      )
+    }
+    return response
+  }
+
+  const server = new ApolloServer({
+    schema,
+    context,
+    formatError: error => {
+      logger.error('An error ocurred inside a module: %s', error.message)
+      return error.message
+    },
+    formatResponse: response => {
+      logger.debug('Response from Apollo Server: ' + response)
+      return response
+    },
+    playground: {
+      settings: {
+        'editor.theme': 'dark',
+        'editor.cursorShape': 'line'
+      }
+    }
+  })
+
+  server.applyMiddleware({ app, cors: { origin: true, credentials: true, methods:'GET,PUT,POST,DELETE,OPTIONS'}})
+
+  app.listen(4100)
+  logger.info(`Server running. Open ${process.env.GRAPHQL_API_URL} to run queries.`)
+}
+
+try {
+  run()
+} catch (e) {
+  logger.error(`An general error occured while running the app: ${e}, details: ${e.message}, stack: ${e.stack}`)
+}

server/src/index.js

@@ -1,221 +1,2 @@
-import express from 'express'
-import cors from 'cors'
-import 'dotenv/config'
-import { ApolloServer, ForbiddenError } from 'apollo-server-express'
-import { mergeSchemas } from 'graphql-tools'
-import jwt from 'express-jwt'
-import jwksRsa from 'jwks-rsa'
-import axios from 'axios'
-
-import { createTransformedRemoteSchema } from './createRemoteSchema'
-import { teams, events, operations } from './links'
-
-import logger from './logger'
-import bodyParser from 'body-parser'
-
-async function getUserId (authId) {
-  try {
-
-    const userData = await axios({
-      url: process.env.USERS_API_URL,
-      method: 'post',
-      headers: {
-        preshared: process.env.USERS_API_PRESHARED
-      },
-      data: {
-        query: `
-        {
-          userByAuthId(authId: "${authId}")
-          {
-            id
-          }
-        }
-        `
-      }
-    })
-    return userData.data.data.userByAuthId.id
-  } catch (error) {
-    return (error)
-  }
-}
-
-async function run () {
-  const transformedKeyVaultSchema = await createTransformedRemoteSchema(
-    'keyVault_',
-    process.env.KEYVAULT_API_URL,
-    process.env.KEYVAULT_API_PRESHARED)
-  const transformedTeamsSchema = await createTransformedRemoteSchema(
-    'teams_',
-    process.env.TEAMS_API_URL,
-    process.env.TEAMS_API_PRESHARED)
-  const transformedUsersSchema = await createTransformedRemoteSchema(
-    'users_',
-    process.env.USERS_API_URL,
-    process.env.USERS_API_PRESHARED)
-  const transformedEventsSchema = await createTransformedRemoteSchema(
-    'events_',
-    process.env.EVENTS_API_URL,
-    process.env.EVENTS_API_PRESHARED)
-  const transformedOperationsSchema = await createTransformedRemoteSchema(
-    'operations_',
-    process.env.OPERATIONS_API_URL,
-    process.env.OPERATIONS_API_PRESHARED)
-  const transformedNotificationsSchema = await createTransformedRemoteSchema(
-    'notifications_',
-    process.env.NOTIFICATIONS_API_URL,
-    process.env.NOTIFICATIONS_API_PRESHARED)
-  const transformedLogsSchema = await createTransformedRemoteSchema(
-    'logs_',
-    process.env.LOGS_API_URL,
-    process.env.LOGS_API_PRESHARED)
-  const transformedStrategizerSchema = await createTransformedRemoteSchema(
-    'strategizer_',
-    process.env.STRATEGIZER_API_URL,
-    process.env.STRATEGIZER_API_PRESHARED)
-  const transformedCockpitSchema = await createTransformedRemoteSchema(
-    'cockpit_',
-    process.env.COCKPIT_API_URL,
-    process.env.COCKPIT_API_PRESHARED)
-  const transformedSAWeb = await createTransformedRemoteSchema(
-      'web_',
-      process.env.SAWEB_API_URL,
-      process.env.SAWEB_API_PRESHARED)
-
-  var schemas = []
-  var resolvers = {}
-
-  if (transformedTeamsSchema) {
-    schemas.push(transformedTeamsSchema)
-    if (transformedUsersSchema && transformedEventsSchema && transformedStrategizerSchema) {
-      schemas.push(teams.linkSchemaDefs)
-      resolvers = Object.assign(resolvers, teams.resolver(transformedUsersSchema, transformedEventsSchema, transformedStrategizerSchema))
-    }
-  }
-  if (transformedUsersSchema) {
-    schemas.push(transformedUsersSchema)
-  }
-  if (transformedEventsSchema) {
-    schemas.push(transformedEventsSchema)
-    if (transformedUsersSchema && transformedTeamsSchema && transformedOperationsSchema) {
-      schemas.push(events.linkSchemaDefs)
-      resolvers = Object.assign(resolvers, events.resolver(transformedUsersSchema, transformedTeamsSchema, transformedOperationsSchema))
-    }
-  }
-  if (transformedKeyVaultSchema) {
-    schemas.push(transformedKeyVaultSchema)
-  }
-  if (transformedOperationsSchema) {
-    schemas.push(transformedOperationsSchema)
-    if (transformedTeamsSchema && transformedCockpitSchema) {
-      schemas.push(operations.linkSchemaDefs)
-      resolvers = Object.assign(resolvers, operations.resolver(transformedTeamsSchema, transformedCockpitSchema))
-    }
-  }
-  if (transformedNotificationsSchema) {
-    schemas.push(transformedNotificationsSchema)
-  }
-  if (transformedLogsSchema) {
-    schemas.push(transformedLogsSchema)
-  }
-  if (transformedStrategizerSchema) {
-    schemas.push(transformedStrategizerSchema)
-  }
-  if (transformedCockpitSchema) {
-    schemas.push(transformedCockpitSchema)
-  }
-  if (transformedSAWeb) {
-    schemas.push(transformedSAWeb)
-  }
-
-  const schema = mergeSchemas({
-    schemas,
-    resolvers
-  })
-
-  const app = express()
-
-  app.use(bodyParser.json({limit: '50mb'}));
-  app.use(bodyParser.urlencoded({limit: '50mb', extended: true}));
-
-  app.use('/graphql',
-    jwt({
-      secret: jwksRsa.expressJwtSecret({
-        cache: true,
-        rateLimit: true,
-        jwksRequestsPerMinute: 1,
-        jwksUri: `https://${process.env.AUTH0_DOMAIN}/.well-known/jwks.json`
-      }),
-      credentialsRequired: false,
-      audience: process.env.AUTH0_AUDIENCE,
-      issuer: process.env.AUTH0_ISSUER,
-      algorithms: [`RS256`]
-    }),
-    function (err, req, res, next) {
-      if (err.code === 'invalid_token') {
-        res.locals.error = err.message
-      }
-      return next()
-    }
-  )
-
-  app.use('/graphql', (req, res, next) => {
-    res.locals.userId = ''
-    if (req.user) {
-      getUserId(req.user.sub)
-        .then(data => {
-          res.locals.userId = data
-          next()
-        })
-        .catch(err => {
-          console.log(err)
-          next()
-        })
-    } else {
-      next()
-    }
-  })
-
-  const context = ({ req, res }) => {
-    if (res.locals.error) {
-      throw new ForbiddenError(res.locals.error)
-    }
-    const response = {
-      headers: Object.assign(
-        res.locals.userId ? { userId: res.locals.userId } : {},
-        req.headers.authorization ? { authorization: req.headers.authorization } : {},
-        req.headers.access_token ? { access_token: req.headers.access_token } : {}
-      )
-    }
-    return response
-  }
-
-  const server = new ApolloServer({
-    schema,
-    context,
-    formatError: error => {
-      logger.error('An error ocurred inside a module: %s', error.message)
-      return error.message
-    },
-    formatResponse: response => {
-      logger.debug('Response from Apollo Server: ' + response)
-      return response
-    },
-    playground: {
-      settings: {
-        'editor.theme': 'dark',
-        'editor.cursorShape': 'line'
-      }
-    }
-  })
-
-  server.applyMiddleware({ app, cors: { origin: true, credentials: true, methods:'GET,PUT,POST,DELETE,OPTIONS'}})
-
-  app.listen(4100)
-  logger.info(`Server running. Open ${process.env.GRAPHQL_API_URL} to run queries.`)
-}
-
-try {
-  run()
-} catch (e) {
-  logger.error(`An general error occured while running the app: ${e}, details: ${e.message}, stack: ${e.stack}`)
-}
+require = require('esm')(module)
+module.exports = require('./app.js')