orbiting · patte · May 9, 2019 · Apr 26, 2019 · Apr 27, 2019 · Apr 27, 2019
diff --git a/.github/main.workflow b/.github/main.workflow
@@ -4,12 +4,12 @@ workflow "Unit Testing on push" {
 }
 
 action "yarn install" {
-  uses = "borales/actions-yarn@master"
+  uses = "orbiting/actions-yarn@master"
   args = "install"
 }
 
 action "yarn test:unit" {
-  uses = "borales/actions-yarn@master"
+  uses = "orbiting/actions-yarn@master"
   args = "test:unit"
   needs = ["yarn install"]
 }
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10
+12
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,6 @@
 language: node_js
+node_js:
+  - "12"
 cache:
   directories:
     - node_modules
@@ -15,8 +17,6 @@ env:
   global:
     - NODE_ENV=development
     - PORT=5020
-    - PUBLIC_WS_URL_BASE=ws://localhost:5020
-    - PUBLIC_WS_URL_PATH=/graphql
     - SEND_MAILS=false
     - FORCE_TEST_END=true
     - SESSION_SECRET=testtest
@@ -32,7 +32,7 @@ env:
     - AUTO_LOGIN_REGEX='^([a-zA-Z0-9._%+-]+)@test\.project-r\.construction$'
     - DOCUMENTS_RESTRICT_TO_ROLES=member
 before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
   - export PATH=$HOME/.yarn/bin:$PATH
   - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-6.3.0.deb && sudo service elasticsearch restart
 before_script:

diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ LOCAL_IP=192.168.1.88
 ```
 CORS_WHITELIST_URL=http://republik.test
 COOKIE_DOMAIN=.republik.test
-PUBLIC_WS_URL_BASE=ws://api.republik.test
 ```
 - in `republik-frontend/.env`
 ```

diff --git a/app.json b/app.json
@@ -137,12 +137,6 @@
     "PUBLIC_URL": {
       "required": true
     },
-    "PUBLIC_WS_URL_BASE": {
-      "required": true
-    },
-    "PUBLIC_WS_URL_PATH": {
-      "required": true
-    },
     "QUESTIONS_MAIL_FROM_ADDRESS": {
       "required": true
     },

diff --git a/docker-compose.republik-backend.yml b/docker-compose.republik-backend.yml
@@ -11,9 +11,7 @@ services:
       - DATABASE_URL=postgres://postgres@postgres:5432/republik
       - REDIS_URL=redis:6379
       - PUBLIC_URL=http://localhost:8080
-      - PUBLIC_WS_URL_BASE=ws://localhost:8080
       - FRONTEND_BASE_URL
-      - PUBLIC_WS_URL_PATH
       - SESSION_SECRET
       - CORS_WHITELIST_URL
       - SEND_MAILS

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "license": "AGPL-3.0",
   "version": "1.0.0",
   "engines": {
-    "node": "10.x"
+    "node": "12.x"
   },
   "private": true,
   "main": "index.js",
@@ -37,15 +37,15 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "commitizen": "^2.10.1",
+    "commitizen": "^3.1.1",
     "coveralls": "^3.0.3",
     "cz-conventional-changelog": "^2.1.0",
     "foreman": "^3.0.0",
-    "husky": "^1.1.3",
+    "husky": "^2.2.0",
     "jest": "^24.3.1",
-    "lint-staged": "^7.1.2",
-    "nock": "^10.0.6",
-    "standard": "^11.0.1",
+    "jest-environment-node": "^24.7.1",
+    "lint-staged": "^8.1.5",
+    "standard": "^12.0.1",
     "validate-commit-msg": "^2.11.1"
   },
   "scripts": {

diff --git a/packages/access/package.json b/packages/access/package.json
@@ -20,7 +20,7 @@
     "link": "yarn link"
   },
   "dependencies": {
-    "debug": "^3.1.0",
+    "debug": "^4.1.1",
     "escape-html": "^1.0.3",
     "moment": "^2.22.2",
     "redlock": "^3.1.2"

diff --git a/packages/apollo-modules-node/package.json b/packages/apollo-modules-node/package.json
@@ -15,13 +15,8 @@
   "scripts": {
     "link": "yarn link"
   },
-  "devDependencies": {
-    "graphql": "^0.13.2"
-  },
-  "peerDependencies": {
-    "graphql": "^0.13.2"
-  },
   "dependencies": {
+    "graphql": "^14.2.1",
     "lodash.merge": "^4.6.1",
     "lodash.pickby": "^4.6.0"
   }

diff --git a/packages/assets/package.json b/packages/assets/package.json
@@ -19,19 +19,14 @@
   "scripts": {
     "link": "yarn link"
   },
-  "devDependencies": {
-    "isomorphic-unfetch": "^2.0.0"
-  },
   "dependencies": {
-    "aws-sdk": "^2.246.1",
+    "aws-sdk": "^2.448.0",
     "bluebird": "^3.5.1",
     "check-env": "^1.3.0",
-    "debug": "^3.1.0",
+    "debug": "^4.1.1",
     "file-type-stream": "^1.0.0",
-    "sharp": "^0.20.1",
+    "isomorphic-unfetch": "^3.0.0",
+    "sharp": "^0.22.1",
     "stream-to-array": "^2.3.0"
-  },
-  "peerDependencies": {
-    "isomorphic-unfetch": "^2.0.0"
   }
 }
diff --git a/packages/auth/express/auth.js b/packages/auth/express/auth.js
@@ -36,7 +36,8 @@ exports.configure = ({
   }
   // Sessions store for express-session (defaults to connect-pg-simple using DATABASE_URL)
   const store = new PgSession({
-    tableName: 'sessions'
+    tableName: 'sessions',
+    conString: process.env.DATABASE_URL
   })
   const Users = pgdb.public.users
 
@@ -70,7 +71,7 @@ exports.configure = ({
 
   passport.deserializeUser(async function (id, next) {
     const user = transformUser(
-      await Users.findOne({id})
+      await Users.findOne({ id })
     )
 
     if (!user) {

diff --git a/packages/auth/graphql/resolvers/_queries/echo.js b/packages/auth/graphql/resolvers/_queries/echo.js
@@ -4,7 +4,7 @@ const { flag, code } = require('country-emoji')
 
 module.exports = async (_, args, { req }) => {
   const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress
-  const { country, countryEN, city } = geoForIP(ip)
+  const { country, countryEN, city } = await geoForIP(ip)
   const countryCode = countryEN ? code(countryEN) : null
   const ua = req.headers['user-agent']
 

diff --git a/packages/auth/lib/Sessions.js b/packages/auth/lib/Sessions.js
@@ -21,7 +21,7 @@ const initiateSession = async ({ req, pgdb, email, consents }) => {
   const ipAddress = req.headers['x-forwarded-for'] || req.connection.remoteAddress
   const userAgent = req.headers['user-agent']
   const phrase = `${kraut.adjectives.random()} ${kraut.verbs.random()} ${kraut.nouns.random()}`
-  const { country, city } = geoForIP(ipAddress)
+  const { country, city } = await geoForIP(ipAddress)
   req.session.email = email
   req.session.ip = ipAddress
   req.session.ua = userAgent

diff --git a/packages/auth/lib/geoForIP.js b/packages/auth/lib/geoForIP.js
@@ -1,8 +1,12 @@
 const geoipDatabase = require('geoip-database')
 const maxmind = require('maxmind')
-const cityLookup = maxmind.openSync(geoipDatabase.city)
+let cityLookup
+
+module.exports = async (ip) => {
+  if (!cityLookup) {
+    cityLookup = await maxmind.open(geoipDatabase.city)
+  }
 
-module.exports = (ip) => {
   const geo = cityLookup.get(ip)
   let country
   // eslint-disable-next-line no-empty

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -21,22 +21,20 @@
   },
   "homepage": "https://github.com/orbiting/backends#readme",
   "devDependencies": {
-    "dotenv": "^5.0.1",
-    "gsheets": "^2.0.0",
-    "isomorphic-unfetch": "^2.0.0"
+    "gsheets": "^2.0.0"
   },
   "dependencies": {
     "apollo-modules-node": "^0.1.4",
     "check-env": "^1.3.0",
-    "connect-pg-simple": "^3.1.2",
+    "connect-pg-simple": "^5.0.0",
     "country-emoji": "^1.2.0",
-    "debug": "^3.1.0",
+    "debug": "^4.1.1",
     "express-basic-auth": "^1.1.5",
     "express-session": "^1.15.6",
     "geoip-database": "^1.0.19",
     "is-uuid": "^1.0.2",
     "kraut": "^0.1.1",
-    "maxmind": "^2.11.0",
+    "maxmind": "^3.0.3",
     "otp": "^0.1.3",
     "passport": "^0.4.0",
     "pogi": "^2.5.8",
@@ -46,10 +44,5 @@
     "useragent": "^2.3.0",
     "uuid": "^3.2.1",
     "validator": "^10.2.0"
-  },
-  "peerDependencies": {
-    "d3-array": "^1.2.1",
-    "dotenv": "^5.0.1",
-    "isomorphic-unfetch": "^2.0.0"
   }
 }