fix: get builds and tests working (#210)

* fix: exclude tests from compilation * fix: do not lint js files in docs * fix: lint * fix: compilation issues in keycloak package * fix dependency updates * fix: remove instances of graphql in packages before tests
aerogear · Dec 2, 2019 · 7cc1e55 · 7cc1e55
1 parent 752eef3
commit 7cc1e55
Show file tree

Hide file tree

Showing 21 changed files with 56 additions and 1,461 deletions.
diff --git a/examples/audit_logging/server.js b/examples/audit_logging/server.js
@@ -11,7 +11,7 @@ const typeDefs = gql`
 `
 
 // Resolver functions. This is our business logic
-let resolvers = {
+const resolvers = {
   Query: {
     hello: (obj, args, context, info) => {
       context.auditLog('CUSTOM_LOG_TYPE', 'this is a custom audit log', obj, args, context, info)

diff --git a/examples/keycloak/package-lock.json b/examples/keycloak/package-lock.json
diff --git a/examples/keycloak/package.json b/examples/keycloak/package.json
diff --git a/examples/metrics/server.js b/examples/metrics/server.js
@@ -11,7 +11,7 @@ const typeDefs = gql`
 `
 
 // Resolver functions. This is our business logic
-let resolvers = {
+const resolvers = {
   Query: {
     hello: (obj, args, context, info) => {
       return `Hello world from ${context.serverName}`

diff --git a/examples/package.json b/examples/package.json
@@ -8,7 +8,7 @@
     "compile": "exit 0",
     "watch": "exit 0",
     "compile:clean": "exit 0",
-    "test-examples": "ava --concurrency=1 test/*.test.js",
+    "test-examples": "rm -rf ../packages/*/node_modules/graphql && ava --concurrency=1 test/*.test.js",
     "push-basic": "TAG=\"$npm_package_version\" ./push-script.sh basic",
     "push-keycloak": "TAG=\"$npm_package_version\" ./push-script.sh keycloak",
     "push-audit_logging": "TAG=\"$npm_package_version\" ./push-script.sh audit_logging",
@@ -25,24 +25,24 @@
     "@aerogear/voyager-server": "^0.7.1",
     "@aerogear/voyager-subscriptions": "^0.7.1",
     "@aerogear/voyager-tools": "^0.7.1",
-    "axios": "^0.18.0",
-    "express": "^4.16.4",
-    "graphql": "0.13.2",
+    "axios": "^0.19.0",
+    "express": "^4.17.1",
+    "graphql": "14.5.8",
     "graphql-subscriptions": "1.1.0",
-    "graphql-tools": "^4.0.3"
+    "graphql-tools": "^4.0.6"
   },
   "devDependencies": {
-    "@types/graphql": "^14.0.3",
-    "apollo-cache-inmemory": "^1.5.1",
-    "apollo-client": "^2.5.1",
-    "apollo-link": "^1.2.11",
-    "apollo-link-http": "^1.5.14",
-    "apollo-link-ws": "^1.0.17",
-    "apollo-utilities": "^1.2.1",
+    "@types/graphql": "14.5.0",
+    "apollo-cache-inmemory": "1.6.3",
+    "apollo-client": "2.6.4",
+    "apollo-link": "1.2.13",
+    "apollo-link-http": "1.5.16",
+    "apollo-link-ws": "1.0.19",
+    "apollo-utilities": "1.3.2",
     "ava": "^1.0.1",
     "graphql-tag": "^2.10.1",
-    "node-fetch": "^2.5.0",
+    "node-fetch": "^2.6.0",
     "subscriptions-transport-ws": "^0.9.16",
-    "ws": "^7.0.0"
+    "ws": "^7.2.0"
   }
 }
diff --git a/examples/test/auditLogging.test.js b/examples/test/auditLogging.test.js
@@ -10,7 +10,7 @@ function sendQuery () {
     method: 'POST',
     url: `http://localhost:${port}${server.graphqlPath}`,
     data: {
-      'query': '{ hello }'
+      query: '{ hello }'
     },
     headers: { 'Content-Type': 'application/json' }
   })

diff --git a/examples/test/conflicts.test.js b/examples/test/conflicts.test.js
@@ -15,7 +15,7 @@ function sendQuery (query) {
     method: 'POST',
     url: `http://localhost:${port}${server.graphqlPath}`,
     data: {
-      'query': query
+      query: query
     },
     headers: { 'Content-Type': 'application/json' }
   })
@@ -41,7 +41,7 @@ test.serial('Sending a mutation with correct version number should not return er
   }
 })
 
-test.serial(`Sending a query should return the new version of greeting response`, async t => {
+test.serial('Sending a query should return the new version of greeting response', async t => {
   try {
     const res = await sendQuery(testQueries.greeting)
     t.deepEqual(res.status, 200)

diff --git a/examples/test/keycloak.test.js b/examples/test/keycloak.test.js
@@ -23,13 +23,13 @@ function modifyKeycloakServerUrl (url) {
 function sendQuery (token, maxRedirects) {
   const headers = { 'Content-Type': 'application/json' }
   if (token) {
-    headers['Authorization'] = token
+    headers.Authorization = token
   }
   return axios({
     method: 'POST',
     url: `http://localhost:${exampleAppPort}${exampleAppGraphqlPath}`,
     data: {
-      'query': '{ hello }'
+      query: '{ hello }'
     },
     headers,
     maxRedirects

diff --git a/examples/test/metrics.test.js b/examples/test/metrics.test.js
@@ -10,7 +10,7 @@ function sendQuery () {
     method: 'POST',
     url: `http://localhost:${port}${server.graphqlPath}`,
     data: {
-      'query': '{ hello }'
+      query: '{ hello }'
     },
     headers: { 'Content-Type': 'application/json' }
   })

diff --git a/examples/test/subscriptions.test.js b/examples/test/subscriptions.test.js
@@ -43,7 +43,7 @@ test('Sending a request to basic example app should return OK status code and no
 })
 
 test('Basic Subscricption will return a result', async t => {
-  let subscription = clientWrapper.subscribe(gql`
+  const subscription = clientWrapper.subscribe(gql`
       subscription s1 {
         hello
       }

diff --git a/examples/test/util/configureKeycloak.js b/examples/test/util/configureKeycloak.js
@@ -24,23 +24,23 @@ async function authenticateKeycloak () {
     url: `${config.authServerUrl}/realms/${config.adminRealmName}/protocol/openid-connect/token`,
     data: `client_id=${config.resource}&username=${config.username}&password=${config.password}&grant_type=password`
   }).catch((err) => { return console.error(err) })
-  return `Bearer ${res.data['access_token']}`
+  return `Bearer ${res.data.access_token}`
 }
 
 async function importRealm () {
   await axios({
     method: 'POST',
     url: `${config.authServerUrl}/admin/realms`,
     data: realmToImport,
-    headers: { 'Authorization': config.token, 'Content-Type': 'application/json' }
+    headers: { Authorization: config.token, 'Content-Type': 'application/json' }
   }).catch((err) => { return console.error(err) })
 }
 
 async function getRealmRoles () {
   const res = await axios({
     method: 'GET',
     url: `${config.authServerUrl}/admin/realms/${config.appRealmName}/roles`,
-    headers: { 'Authorization': config.token }
+    headers: { Authorization: config.token }
   }).catch((err) => { return console.error(err) })
 
   return res.data
@@ -50,7 +50,7 @@ async function getClients () {
   const res = await axios({
     method: 'GET',
     url: `${config.authServerUrl}/admin/realms/${config.appRealmName}/clients`,
-    headers: { 'Authorization': config.token }
+    headers: { Authorization: config.token }
   }).catch((err) => { return console.error(err) })
 
   return res.data
@@ -60,7 +60,7 @@ async function getClientRoles (client) {
   const res = await axios({
     method: 'GET',
     url: `${config.authServerUrl}/admin/realms/${config.appRealmName}/clients/${client.id}/roles`,
-    headers: { 'Authorization': config.token }
+    headers: { Authorization: config.token }
   }).catch((err) => { return console.error(err) })
   return res.data
 }
@@ -70,11 +70,11 @@ async function createUser (name, password) {
     method: 'post',
     url: `${config.authServerUrl}/admin/realms/${config.appRealmName}/users`,
     data: {
-      'username': name,
-      'credentials': [{ 'type': 'password', 'value': password, 'temporary': false }],
-      'enabled': true
+      username: name,
+      credentials: [{ type: 'password', value: password, temporary: false }],
+      enabled: true
     },
-    headers: { 'Authorization': config.token, 'Content-Type': 'application/json' }
+    headers: { Authorization: config.token, 'Content-Type': 'application/json' }
   })
   if (res) {
     return res.headers.location
@@ -86,7 +86,7 @@ async function assignRealmRoleToUser (userIdUrl, role) {
     method: 'POST',
     url: `${userIdUrl}/role-mappings/realm`,
     data: [role],
-    headers: { 'Authorization': config.token, 'Content-Type': 'application/json' }
+    headers: { Authorization: config.token, 'Content-Type': 'application/json' }
   }).catch((err) => { return console.error(err) })
 
   return res.data
@@ -97,7 +97,7 @@ async function assignClientRoleToUser (userIdUrl, client, role) {
     method: 'POST',
     url: `${userIdUrl}/role-mappings/clients/${client.id}`,
     data: [role],
-    headers: { 'Authorization': config.token, 'Content-Type': 'application/json' }
+    headers: { Authorization: config.token, 'Content-Type': 'application/json' }
   }).catch((err) => { return console.error(err) })
   return res.data
 }
@@ -109,7 +109,7 @@ async function prepareKeycloak (authServerUrl, testPassword) {
   const realmRoles = await getRealmRoles()
   const clients = await getClients()
 
-  for (let user of usersConfiguration) {
+  for (const user of usersConfiguration) {
     // Create a new user
     const userIdUrl = await createUser(user.name, testPassword)
     // Assign realm role to user
@@ -131,7 +131,7 @@ async function resetKeycloakConfiguration () {
   await axios({
     method: 'DELETE',
     url: `${config.authServerUrl}/admin/realms/${config.appRealmName}`,
-    headers: { 'Authorization': config.token }
+    headers: { Authorization: config.token }
   }).catch((err) => { return console.error(err) })
 }
 

diff --git a/examples/test/util/getAuthToken.js b/examples/test/util/getAuthToken.js
@@ -6,7 +6,7 @@ async function getAuthToken (keycloakConfig, username, password) {
     url: `${keycloakConfig['auth-server-url']}/realms/${keycloakConfig.realm}/protocol/openid-connect/token`,
     data: `client_id=${keycloakConfig.resource}&username=${username}&password=${password}&grant_type=password`
   })
-  return `Bearer ${res.data['access_token']}`
+  return `Bearer ${res.data.access_token}`
 }
 
 module.exports = getAuthToken
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   "dependencies": {},
   "devDependencies": {
     "@types/express-session": "1.15.16",
-    "@types/graphql": "14.2.3",
+    "@types/graphql": "14.5.0",
     "@types/joi": "14.3.4",
     "@types/keycloak-connect": "4.5.1",
     "@types/node": "10.17.6",
@@ -49,5 +49,10 @@
     "exclude": [
       "**/*.test.ts"
     ]
+  },
+  "standard": {
+    "ignore": [
+      "/doc/**/*.js"
+    ]
   }
 }
diff --git a/packages/voyager-audit/package.json b/packages/voyager-audit/package.json
@@ -32,7 +32,7 @@
     "typescript": "3.7.2"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.13.0 || ^14.0.0"
   },
   "ava": {
     "compileEnhancements": false,

diff --git a/packages/voyager-conflicts/package.json b/packages/voyager-conflicts/package.json
@@ -29,7 +29,7 @@
     "typescript": "3.7.2"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.13.0 || ^14.0.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/voyager-keycloak/package.json b/packages/voyager-keycloak/package.json
@@ -26,16 +26,16 @@
     "keycloak-connect-graphql": "0.2.2"
   },
   "devDependencies": {
-    "@types/express": "4.17.2",
+    "@types/express": "4.16.1",
     "@types/express-session": "1.15.16",
     "@types/keycloak-connect": "4.5.1",
-    "@types/node": "10.17.6",
+    "@types/node": "12.12.14",
     "ava": "2.4.0",
     "ts-node": "8.5.4",
     "typescript": "3.7.2"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.13.0 || ^14.0.0"
   },
   "ava": {
     "compileEnhancements": false,

diff --git a/packages/voyager-keycloak/src/KeycloakSecurityService.ts b/packages/voyager-keycloak/src/KeycloakSecurityService.ts
@@ -63,7 +63,7 @@ export class KeycloakSecurityService implements SecurityService {
       resave: false,
       saveUninitialized: true,
       store: memoryStore
-    }))
+    }) as any)
 
     if (!this.keycloak) {
       this.keycloak = new Keycloak({

diff --git a/packages/voyager-keycloak/tsconfig.json b/packages/voyager-keycloak/tsconfig.json
@@ -5,5 +5,5 @@
     "outDir": "./dist"
   },
   "include": ["src/**/*"],
-  "exclude": []
+  "exclude": ["node_modules"]
 }
diff --git a/packages/voyager-server/package.json b/packages/voyager-server/package.json
@@ -57,6 +57,6 @@
     ]
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.13.0 || ^14.0.0"
   }
 }
diff --git a/packages/voyager-server/tsconfig.json b/packages/voyager-server/tsconfig.json
@@ -5,5 +5,8 @@
     "outDir": "./dist"
   },
   "include": ["src/**/*"],
-  "exclude": []
+  "exclude": [
+    "src/integration_test",
+    "**/*.test.ts"
+  ]
 }
diff --git a/packages/voyager-subscriptions/package.json b/packages/voyager-subscriptions/package.json
@@ -29,7 +29,7 @@
     "typescript": "3.7.2"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.13.0 || ^14.0.0"
   },
   "publishConfig": {
     "access": "public"