Merge pull request #179 from oceanprotocol/feature/packages

package updates and test fixes
2023-03-15 18:03:00 +01:00 · 2019-08-01 13:48:33 +02:00 · 2019-08-01 13:48:33 +02:00 · 105dcbc8cf
commit 105dcbc8cf
parent ba1ba78849 73ac3d0875
23 changed files with 4855 additions and 3782 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,5 @@ yarn-error.log*
 # cypress
 cypress/screenshots
 cypress/videos
+cypress/fixtures/did.txt
+artifacts
--- a/.travis.yml
+++ b/.travis.yml
@ -4,7 +4,14 @@ language: node_js
 node_js:
  - '11'

+services:
+  - docker
+
 addons:
+  # required for internal Aquarius-Brizo communication
+  # https://docs.travis-ci.com/user/hosts/
+  hosts:
+    - aquarius
  apt:
    packages:
      # for Cypress
@ -12,25 +19,35 @@ addons:

 env:
  global:
-    # run E2E tests against these values
-    - REACT_APP_NODE_URI="https://pacific.oceanprotocol.com"
-    - REACT_APP_AQUARIUS_URI="https://aquarius.test.oceanprotocol.com"
-    - REACT_APP_BRIZO_URI="https://brizo.test.oceanprotocol.com"
-    - REACT_APP_SECRET_STORE_URI="https://secret-store.oceanprotocol.com"
-    - REACT_APP_FAUCET_URI="https://faucet.oceanprotocol.com"
-    - REACT_APP_BRIZO_ADDRESS="0x0474ed05ba757dde575dfaaaa267d9e7f3643abc"
+    # run E2E tests against local Spree
+    - REACT_APP_NODE_URI="http://localhost:8545"
+    - REACT_APP_AQUARIUS_URI="http://aquarius:5000"
+    - REACT_APP_BRIZO_URI="http://localhost:8030"
+    - REACT_APP_SECRET_STORE_URI="http://localhost:12001"
+    - REACT_APP_FAUCET_URI="http://localhost:3001"
+    - REACT_APP_BRIZO_ADDRESS="0x00bd138abd70e2f00903268f3db08f2d25677c9e"
+    # start Barge with these versions
+    - KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
+    - FAUCET_TIMESPAN=0

 before_install:
  - npm install -g npm
-  - npm install -g codacy-coverage truffle ganache-cli
+  - npm install -g codacy-coverage
  # Fixes an issue where the max file watch count is exceeded, triggering ENOSPC
  # https://stackoverflow.com/questions/22475849/node-js-error-enospc#32600959
  - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p

+before_script:
+  - git clone https://github.com/oceanprotocol/barge
+  - cd barge
+  - bash -x start_ocean.sh --no-pleuston 2>&1 > start_ocean.log &
+  - cd ..
+
 script:
  # - ./scripts/install.sh # runs automatically with npm ci
  # executing `npm test` scripts individually here, so first one failing will exit the build
  - npm run lint || travis_terminate 1
+  - ./scripts/keeper.sh
  - ./scripts/test.sh || travis_terminate 1
  - ./scripts/coverage.sh
  - npm run test:e2e || travis_terminate 1
--- a/README.md
+++ b/README.md
@ -22,21 +22,21 @@

 If you're a developer and want to contribute to, or want to utilize this marketplace's code in your projects, then keep on reading.

- [🏄 Get Started](#-Get-Started)
-  - [🏖 Remote Ocean: Pacific](#-Remote-Ocean-Pacific)
-  - [🐳 Use with Barge](#-Use-with-Barge)
-  - [⛵️ Environment Variables](#️-Environment-Variables)
-    - [Client](#Client)
-    - [Server](#Server)
- [👩‍🔬 Testing](#-Testing)
-  - [Unit Tests](#Unit-Tests)
-  - [End-to-End Integration Tests](#End-to-End-Integration-Tests)
- [✨ Code Style](#-Code-Style)
- [🛳 Production](#-Production)
- [⬆️ Releases](#️-Releases)
- [📜 Changelog](#-Changelog)
- [🎁 Contributing](#-Contributing)
- [🏛 License](#-License)
+- [🏄 Get Started](#-get-started)
+  - [🏖 Remote Ocean: Pacific](#-remote-ocean-pacific)
+  - [🐳 Use with Barge](#-use-with-barge)
+  - [⛵️ Environment Variables](#️-environment-variables)
+    - [Client](#client)
+    - [Server](#server)
+- [👩‍🔬 Testing](#-testing)
+  - [Unit Tests](#unit-tests)
+  - [End-to-End Integration Tests](#end-to-end-integration-tests)
+- [✨ Code Style](#-code-style)
+- [🛳 Production](#-production)
+- [⬆️ Releases](#️-releases)
+- [📜 Changelog](#-changelog)
+- [🎁 Contributing](#-contributing)
+- [🏛 License](#-license)

 ## 🏄 Get Started

@ -68,16 +68,40 @@ By default, the client uses a burner wallet connected to the correct network aut

 ### 🐳 Use with Barge

-If you prefer to connect to locally running components instead of remote connections to Ocean's Nile network, you can spin up [`barge`](https://github.com/oceanprotocol/barge) and use a local network:
+If you prefer to connect to locally running components instead of remote connections to Ocean's Nile network, you can spin up [`barge`](https://github.com/oceanprotocol/barge) and use a local Spree network:

 ```bash
 git clone git@github.com:oceanprotocol/barge.git
 cd barge

-./start_ocean.sh --latest --no-pleuston --local-spree-node
+# startup with local Spree node
+./start_ocean.sh --latest --no-pleuston
 ```

-Modify `./client/src/config.ts` or set environment variables to use those local connections.
+Then set [environment variables](#️-environment-variables) to use those local connections.
+
+Finally, you need to copy the generated contract artifacts out of the Docker container. To do this, execute this script in another terminal:
+
+```bash
+./scripts/keeper.sh
+```
+
+The script will wait for all contracts to be generated in the `keeper-contracts` Docker container, then will copy the artifacts in place.
+
+If you are on macOS, you need to additionally tweak your `/etc/hosts` file so Brizo can connect to Aquarius. This is only required on macOS and is a [known limitation of Docker for Mac](https://docs.docker.com/docker-for-mac/networking/#known-limitations-use-cases-and-workarounds):
+
+```bash
+sudo vi /etc/hosts
+
+# add this line, and save
+127.0.0.1    aquarius
+```
+
+Then use this host for the local Aquarius url in the client config:
+
+```bash
+REACT_APP_AQUARIUS_URI="http://aquarius:5000"
+```

 ### ⛵️ Environment Variables

--- a/client/.env.local.example
+++ b/client/.env.local.example
@ -46,7 +46,7 @@ REACT_APP_BRIZO_ADDRESS="0x0474ed05ba757dde575dfaaaa267d9e7f3643abc"
 # Connect to Spree (local with Barge)
 #
 # REACT_APP_NODE_URI="http://localhost:8545"
-# REACT_APP_AQUARIUS_URI="http://localhost:5000"
+# REACT_APP_AQUARIUS_URI="http://aquarius:5000"
 # REACT_APP_BRIZO_URI="http://localhost:8030"
 # REACT_APP_SECRET_STORE_URI="http://localhost:12001"
 # REACT_APP_FAUCET_URI="http://localhost:3001"
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@ -9,11 +9,12 @@
    "test": "react-scripts test --coverage --watchAll=false",
    "test:watch": "react-scripts test --coverage",
    "eject": "react-scripts eject",
-    "coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7"
+    "coverage": "cat coverage/lcov.info | codacy-coverage --token 8801f827fe1144ffa85cd7da94f2bbf7",
+    "analyze": "source-map-explorer 'build/static/js/*.js'"
  },
  "dependencies": {
    "@oceanprotocol/art": "^2.2.0",
-    "@oceanprotocol/squid": "^0.6.4",
+    "@oceanprotocol/squid": "^0.6.6",
    "@oceanprotocol/typographies": "^0.1.0",
    "@sindresorhus/slugify": "^0.9.1",
    "axios": "^0.19.0",
@ -24,45 +25,46 @@
    "history": "^4.9.0",
    "is-url": "^1.2.4",
    "moment": "^2.24.0",
-    "query-string": "^6.8.1",
+    "query-string": "^6.8.2",
    "react": "^16.8.6",
-    "react-collapsed": "^2.0.1",
-    "react-datepicker": "^2.7.0",
+    "react-collapsed": "^2.1.1",
+    "react-datepicker": "^2.8.0",
    "react-dom": "^16.8.6",
-    "react-dotdotdot": "^1.3.0",
+    "react-dotdotdot": "^1.3.1",
    "react-ga": "^2.6.0",
    "react-helmet": "^5.2.1",
    "react-markdown": "^4.1.0",
-    "react-modal": "^3.8.2",
+    "react-modal": "^3.9.1",
    "react-moment": "^0.9.2",
    "react-paginate": "^6.3.0",
    "react-popper": "^1.3.3",
    "react-router-dom": "^5.0.1",
-    "react-transition-group": "^4.1.1",
-    "truffle-hdwallet-provider": "^1.0.13",
-    "web3": "1.0.0-beta.37"
+    "react-transition-group": "^4.2.1",
+    "truffle-hdwallet-provider": "1.0.14",
+    "web3": "1.2.0"
  },
  "devDependencies": {
    "@react-mock/state": "^0.1.8",
-    "@testing-library/react": "^8.0.4",
-    "@types/classnames": "^2.2.7",
+    "@testing-library/jest-dom": "^4.0.0",
+    "@testing-library/react": "^8.0.7",
+    "@types/classnames": "^2.2.9",
    "@types/filesize": "^4.1.0",
    "@types/is-url": "^1.2.28",
-    "@types/jest": "^24.0.15",
-    "@types/react": "^16.8.22",
-    "@types/react-datepicker": "^2.3.0",
-    "@types/react-dom": "^16.8.4",
+    "@types/jest": "^24.0.16",
+    "@types/react": "^16.8.23",
+    "@types/react-datepicker": "^2.8.0",
+    "@types/react-dom": "^16.8.5",
    "@types/react-dotdotdot": "^1.2.0",
    "@types/react-helmet": "^5.0.8",
    "@types/react-modal": "^3.8.2",
    "@types/react-paginate": "^6.2.1",
    "@types/react-router-dom": "^4.3.4",
-    "@types/react-transition-group": "^2.9.2",
+    "@types/react-transition-group": "^4.2.0",
    "@types/web3": "^1.0.19",
-    "jest-dom": "^3.5.0",
-    "jest-mock-axios": "^3.0.0",
+    "jest-mock-axios": "^3.1.0",
    "node-sass": "^4.12.0",
    "react-scripts": "^3.0.0",
+    "source-map-explorer": "^2.0.1",
    "typescript": "3.4.5"
  },
  "repository": {
--- a/client/src/components/molecules/VersionNumbers/index.test.tsx
+++ b/client/src/components/molecules/VersionNumbers/index.test.tsx
@ -58,21 +58,29 @@ const mockResponseFaulty = {

 describe('VersionNumbers', () => {
    it('renders without crashing', () => {
-        const { container } = render(
+        const { container, rerender } = render(
            <User.Provider value={userMockConnected}>
-                <VersionNumbers />
+                <VersionNumbers account="0x00000" />
            </User.Provider>
        )
        mockAxios.mockResponse(mockResponse)
        expect(mockAxios.get).toHaveBeenCalled()
        expect(container.firstChild).toBeInTheDocument()
+
+        rerender(
+            <User.Provider value={userMockConnected}>
+                <VersionNumbers account="0x99999" />
+            </User.Provider>
+        )
+        mockAxios.mockResponse(mockResponse)
+        expect(mockAxios.get).toHaveBeenCalled()
    })

    it('renders without proper component response', () => {
        const { container } = render(
            <User.Provider value={userMockConnected}>
                <StateMock state={stateMockIncomplete}>
-                    <VersionNumbers />
+                    <VersionNumbers account="0x00000" />
                </StateMock>
            </User.Provider>
        )
--- a/client/src/components/molecules/VersionNumbers/index.tsx
+++ b/client/src/components/molecules/VersionNumbers/index.tsx
@ -42,10 +42,16 @@ export default class VersionNumbers extends PureComponent<
    // construct values which are not part of any response
    public commonsVersion =
        process.env.NODE_ENV === 'production' ? version : `${version}-dev`
-    public commonsNetwork = new URL(nodeUri).hostname.split('.')[0]
+    public commonsNetwork = faucetUri.includes('localhost')
+        ? 'Spree'
+        : new URL(nodeUri).hostname.split('.')[0]
    public faucetNetwork = faucetUri.includes('dev-ocean')
        ? new URL(faucetUri).hostname.split('.')[1]
-        : 'Pacific'
+        : faucetUri.includes('oceanprotocol.com')
+        ? 'Pacific'
+        : faucetUri.includes('localhost')
+        ? 'Spree'
+        : 'Unknown'

    // define a minimal default state to fill UI
    public state: VersionNumbersState = {
--- a/client/src/components/organisms/WalletSelector.test.tsx
+++ b/client/src/components/organisms/WalletSelector.test.tsx
@ -7,10 +7,10 @@ import { userMockConnected } from '../../../__mocks__/user-mock'
 import { marketMock } from '../../../__mocks__/market-mock'

 describe('WalletSelector', () => {
-    it('renders without crashing', () => {
+    it('renders without crashing', async () => {
        ReactModal.setAppElement(document.createElement('div'))

-        const { container } = render(
+        const { container, getByText } = render(
            <User.Provider value={userMockConnected}>
                <Market.Provider value={marketMock}>
                    <WalletSelector />
@ -18,6 +18,13 @@ describe('WalletSelector', () => {
            </User.Provider>
        )
        expect(container.firstChild).toBeInTheDocument()
-        fireEvent.click(container.querySelector('button'))
+        fireEvent.click(getByText('Select wallet'))
+
+        const burnerButton = await getByText('Burner Wallet')
+        fireEvent.click(burnerButton)
+
+        fireEvent.click(getByText('Select wallet'))
+        // const metamaskButton = await getByText('MetaMask')
+        // fireEvent.click(metamaskButton)
    })
 })
--- a/client/src/context/BurnerWalletProvider.ts
+++ b/client/src/context/BurnerWalletProvider.ts
@ -37,9 +37,11 @@ export class BurnerWalletProvider {
        localStorage.setItem('logType', 'BurnerWallet')
        const provider = new HDWalletProvider(mnemonic, `${nodeUri}`, 0, 1)
        this.web3 = new Web3(provider)
+        const accounts = await this.web3.eth.getAccounts()
+        const balance = await this.web3.eth.getBalance(accounts[0])

-        // fill with Ether
-        await requestFromFaucet(provider.addresses[0])
+        // fill with Ether if account balance is empty
+        balance === '0' && (await requestFromFaucet(provider.addresses[0]))
    }

    public async logout() {
--- a/client/src/routes/Faucet.tsx
+++ b/client/src/routes/Faucet.tsx
@ -66,13 +66,9 @@ class Faucet extends PureComponent<{}, FaucetState> {
        const { network } = this.context
        const { trxHash } = this.state

-        const submarineLink = `https://submarine${
-            network === 'Duero'
-                ? '.duero'
-                : network === 'Pacific'
-                ? '.pacific'
-                : ''
-        }.dev-ocean.com/tx/${trxHash}`
+        const submarineLink = `https://submarine.${
+            network === 'pacific' ? 'oceanprotocol' : `${network}.dev-ocean`
+        }.com/tx/${trxHash}`

        return (
            <div className={styles.success}>
--- a/client/src/setupTests.js
+++ b/client/src/setupTests.js
@ -1,2 +1,2 @@
-import 'jest-dom/extend-expect'
+import '@testing-library/jest-dom/extend-expect'
 import '@testing-library/react/cleanup-after-each'
--- a/cypress.json
+++ b/cypress.json
@ -1,6 +1,3 @@
 {
-  "baseUrl": "http://localhost:3000",
-  "env": {
-    "CONSUME_ASSET": "did:op:3fa4721ad643489bad77e0e52ecefe9b73166873faaf4661a02486b735eea0c8"
-  }
+  "baseUrl": "http://localhost:3000"
 }
--- a/cypress/integration/1_publish.spec.js
+++ b/cypress/integration/1_publish.spec.js
@ -64,5 +64,16 @@ context('Publish', () => {
        cy.contains('Your asset is published!', {
            timeout: 12000
        }).should('be.visible')
+
+        // Store DID
+        cy.get('a')
+            .contains('See published asset')
+            .invoke('attr', 'href')
+            .then(href => {
+                cy.writeFile(
+                    'cypress/fixtures/did.txt',
+                    href.replace('/asset/', '')
+                )
+            })
    })
 })
--- a/cypress/integration/2_search.spec.js
+++ b/cypress/integration/2_search.spec.js
--- a/cypress/integration/3_consume.spec.js
+++ b/cypress/integration/3_consume.spec.js
@ -1,7 +1,9 @@
 /// <reference types="Cypress" />
 context('Consume', () => {
    before(() => {
-        cy.visit(`/asset/${Cypress.env('CONSUME_ASSET')}`)
+        cy.fixture('did').then(did => {
+            cy.visit(`/asset/${did}`)
+        })

        // Alias button selector & wait for end of loading
        cy.get('button[name="Download"]', { timeout: 60000 })
--- a/cypress/integration/4_faucet.spec.js
+++ b/cypress/integration/4_faucet.spec.js
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@ -14,4 +14,11 @@
 module.exports = (on, config) => {
    // `on` is used to hook into various events Cypress emits
    // `config` is the resolved Cypress config
+    require('cypress-log-to-output').install(on, (type, event) => {
+        // only show error events
+        if (event.level === 'error' || event.type === 'error') {
+            return true
+        }
+        return false
+    })
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -6,12 +6,10 @@
  "scripts": {
    "install": "./scripts/install.sh",
    "start": "concurrently \"cd client && npm start\" \"cd server && npm start\"",
-    "start:commons-and-ganache": "concurrently 'npm run start:ganache' 'npm run start'",
    "build": "./scripts/build.sh",
    "test": "npm run lint && scripts/test.sh && npm run test:e2e",
-    "test:e2e": "start-test start:commons-and-ganache http-get://localhost:3000 cypress:run",
+    "test:e2e": "start-test start http-get://localhost:3000 cypress:run",
    "test:watch": "npm run lint && concurrently \"cd client && npm run test:watch\" \"cd server && npm run test:watch\"",
-    "start:ganache": "ganache-cli -m 'stamp polar cup smart ill agree human episode reform trigger text forget' -i 5777",
    "format:js": "prettier --parser typescript --write '**/*.{js,jsx,ts,tsx}'",
    "format:css": "prettier-stylelint --ignore-path .gitignore --write --quiet '**/*.{css,scss}'",
    "format": "npm run format:js && npm run format:css",
@ -27,25 +25,26 @@
  "dependencies": {},
  "devDependencies": {
    "@release-it/bumper": "^1.0.3",
-    "@typescript-eslint/eslint-plugin": "^1.11.0",
-    "@typescript-eslint/parser": "^1.11.0",
-    "auto-changelog": "^1.13.0",
+    "@typescript-eslint/eslint-plugin": "^1.12.0",
+    "@typescript-eslint/parser": "^1.12.0",
+    "auto-changelog": "^1.14.1",
    "concurrently": "^4.1.1",
-    "cypress": "^3.4.0",
+    "cypress": "^3.4.1",
+    "cypress-log-to-output": "^1.0.4",
    "eslint": "^5.16.0",
    "eslint-config-oceanprotocol": "^1.3.0",
    "eslint-config-prettier": "^6.0.0",
-    "eslint-plugin-cypress": "^2.2.1",
+    "eslint-plugin-cypress": "^2.6.0",
    "eslint-plugin-prettier": "^3.1.0",
    "prettier": "^1.18.2",
    "prettier-stylelint": "^0.4.2",
-    "release-it": "^12.3.0",
+    "release-it": "^12.3.4",
    "start-server-and-test": "^1.9.1",
    "stylelint": "^10.1.0",
    "stylelint-config-bigchaindb": "^1.2.2",
    "stylelint-config-css-modules": "^1.4.0",
    "stylelint-config-standard": "^18.3.0",
-    "typescript": "3.5.2"
+    "typescript": "3.5.3"
  },
  "repository": {
    "type": "git",
--- a/scripts/keeper.sh
+++ b/scripts/keeper.sh
@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Wait for contracts migration and extract Keeper artifacts
+
+RETRY_COUNT=0
+COMMAND_STATUS=1
+
+printf '\n\e[33m◯ Waiting for contracts to be generated...\e[0m\n'
+
+mkdir -p artifacts
+
+until [ $COMMAND_STATUS -eq 0 ] || [ $RETRY_COUNT -eq 120 ]; do
+  keeper_contracts_docker_id=$(docker container ls | grep keeper-contracts | awk '{print $1}')
+  docker cp "${keeper_contracts_docker_id}":/keeper-contracts/artifacts/ready ./artifacts/ > /dev/null 2>&1
+  COMMAND_STATUS=$?
+  sleep 5
+  (( RETRY_COUNT=RETRY_COUNT+1 ))
+done
+
+printf '\e[32m✔ Found new contract artifacts.\e[0m\n'
+
+rm -rf ./artifacts/
+
+if [ $COMMAND_STATUS -ne 0 ]; then
+  echo "Waited for more than two minutes, but keeper contracts have not been migrated yet. Did you run an Ethereum RPC client and the migration script?"
+  exit 1
+fi
+
+docker cp "${keeper_contracts_docker_id}":/keeper-contracts/artifacts/. ./client/node_modules/@oceanprotocol/keeper-contracts/artifacts/
+
+printf '\e[32m✔ Copied new contract artifacts.\e[0m\n'
--- a/server/package-lock.json
+++ b/server/package-lock.json
@ -5,31 +5,31 @@
  "requires": true,
  "dependencies": {
    "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
      "dev": true,
      "requires": {
        "@babel/highlight": "^7.0.0"
      }
    },
    "@babel/core": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz",
-      "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
-        "@babel/helpers": "^7.4.4",
-        "@babel/parser": "^7.4.5",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.5",
-        "@babel/types": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
        "convert-source-map": "^1.1.0",
        "debug": "^4.1.0",
        "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "resolve": "^1.3.2",
        "semver": "^5.4.1",
        "source-map": "^0.5.0"
@ -44,14 +44,14 @@
      }
    },
    "@babel/generator": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
-      "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+      "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
      "dev": true,
      "requires": {
-        "@babel/types": "^7.4.4",
+        "@babel/types": "^7.5.5",
        "jsesc": "^2.5.1",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "source-map": "^0.5.0",
        "trim-right": "^1.0.1"
      },
@ -100,20 +100,20 @@
      }
    },
    "@babel/helpers": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
-      "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
      "dev": true,
      "requires": {
        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
      }
    },
    "@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
      "dev": true,
      "requires": {
        "chalk": "^2.0.0",
@ -122,9 +122,9 @@
      }
    },
    "@babel/parser": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
-      "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+      "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
      "dev": true
    },
    "@babel/plugin-syntax-object-rest-spread": {
@ -148,30 +148,30 @@
      }
    },
    "@babel/traverse": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
-      "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+      "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
      "dev": true,
      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
        "@babel/helper-function-name": "^7.1.0",
        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.4.5",
-        "@babel/types": "^7.4.4",
+        "@babel/parser": "^7.5.5",
+        "@babel/types": "^7.5.5",
        "debug": "^4.1.0",
        "globals": "^11.1.0",
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.13"
      }
    },
    "@babel/types": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
-      "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+      "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
      "dev": true,
      "requires": {
        "esutils": "^2.0.2",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
        "to-fast-properties": "^2.0.0"
      }
    },
@ -412,9 +412,9 @@
      }
    },
    "@types/babel__traverse": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.6.tgz",
-      "integrity": "sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==",
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz",
+      "integrity": "sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==",
      "dev": true,
      "requires": {
        "@babel/types": "^7.3.0"
@ -486,14 +486,6 @@
        "@types/range-parser": "*"
      }
    },
-    "@types/form-data": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
-      "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
    "@types/istanbul-lib-coverage": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
@ -541,18 +533,18 @@
      "dev": true
    },
    "@types/morgan": {
-      "version": "1.7.35",
-      "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.7.35.tgz",
-      "integrity": "sha512-E9qFi0seOkdlQnCTPv54brNfGWeFdRaEhI5tSue4pdx/V+xfxvMETsxXhOEcj1cYL+0n/jcTEmj/jD2gjzCwMg==",
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@types/morgan/-/morgan-1.7.36.tgz",
+      "integrity": "sha512-Hc2UfTpnqS3gfGZFPk6aaQf/nwxFHboC/o1O25W29UsENPLv8qd/GJUBqzrBuczgaIS3/vZxZRHTfFF28uFNeQ==",
      "dev": true,
      "requires": {
        "@types/express": "*"
      }
    },
    "@types/node": {
-      "version": "12.0.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.12.tgz",
-      "integrity": "sha512-Uy0PN4R5vgBUXFoJrKryf5aTk3kJ8Rv3PdlHjl6UaX+Cqp1QE0yPQ68MPXGrZOfG7gZVNDIJZYyot0B9ubXUrQ=="
+      "version": "12.6.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz",
+      "integrity": "sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg=="
    },
    "@types/range-parser": {
      "version": "1.2.3",
@ -561,14 +553,14 @@
      "dev": true
    },
    "@types/request": {
-      "version": "2.48.1",
-      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz",
-      "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
+      "version": "2.48.2",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.2.tgz",
+      "integrity": "sha512-gP+PSFXAXMrd5PcD7SqHeUjdGshAI8vKQ3+AvpQr3ht9iQea+59LOKvKITcQI+Lg+1EIkDP6AFSBUJPWG8GDyA==",
      "requires": {
        "@types/caseless": "*",
-        "@types/form-data": "*",
        "@types/node": "*",
-        "@types/tough-cookie": "*"
+        "@types/tough-cookie": "*",
+        "form-data": "^2.5.0"
      }
    },
    "@types/serve-static": {
@ -588,9 +580,9 @@
      "dev": true
    },
    "@types/superagent": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.2.tgz",
-      "integrity": "sha512-GISrJnl+eZSzkVdsP2bXARXaroe/qKTwl/7v/d7bHP4OhlZKKIExcvQexwTDWHGtalHSLVuM78/Ri54laoOFfQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.3.tgz",
+      "integrity": "sha512-vy2licJQwOXrTAe+yz9SCyUVXAkMgCeDq9VHzS5CWJyDU1g6CI4xKb4d5sCEmyucjw5sG0y4k2/afS0iv/1D0Q==",
      "dev": true,
      "requires": {
        "@types/cookiejar": "*",
@ -655,23 +647,23 @@
      },
      "dependencies": {
        "acorn": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
-          "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
+          "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
          "dev": true
        }
      }
    },
    "acorn-walk": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
-      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
      "dev": true
    },
    "ajv": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
-      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+      "version": "6.10.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
      "requires": {
        "fast-deep-equal": "^2.0.1",
        "fast-json-stable-stringify": "^2.0.0",
@ -719,9 +711,9 @@
      }
    },
    "arg": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
-      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz",
+      "integrity": "sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==",
      "dev": true
    },
    "arr-diff": {
@ -833,11 +825,12 @@
      }
    },
    "babel-plugin-istanbul": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz",
-      "integrity": "sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
+      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
      "dev": true,
      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
        "find-up": "^3.0.0",
        "istanbul-lib-instrument": "^3.3.0",
        "test-exclude": "^5.2.3"
@ -929,6 +922,13 @@
      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
      "requires": {
        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
      }
    },
    "bcrypt-pbkdf": {
@ -969,6 +969,11 @@
          "requires": {
            "ms": "2.0.0"
          }
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
        }
      }
    },
@ -1067,9 +1072,9 @@
      }
    },
    "bser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
-      "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
+      "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
      "dev": true,
      "requires": {
        "node-int64": "^0.4.0"
@ -1326,6 +1331,11 @@
          "requires": {
            "ms": "2.0.0"
          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
        }
      }
    },
@ -1366,6 +1376,13 @@
      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
      "requires": {
        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
      }
    },
    "content-type": {
@ -1380,6 +1397,14 @@
      "dev": true,
      "requires": {
        "safe-buffer": "~5.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
      }
    },
    "cookie": {
@ -1438,15 +1463,15 @@
      "dev": true
    },
    "cssom": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.6.tgz",
-      "integrity": "sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
      "dev": true
    },
    "cssstyle": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.2.tgz",
-      "integrity": "sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
      "dev": true,
      "requires": {
        "cssom": "0.3.x"
@ -1493,9 +1518,9 @@
      },
      "dependencies": {
        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
        }
      }
    },
@ -1877,6 +1902,16 @@
          "requires": {
            "ms": "2.0.0"
          }
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
        }
      }
    },
@ -2078,9 +2113,9 @@
      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
    },
    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.0.tgz",
+      "integrity": "sha512-WXieX3G/8side6VIqx44ablyULoGruSde5PNTxoUyo5CeyAMX6nVWUd0rgist/EuX655cjhUhTo1Fo3tRYqbcA==",
      "requires": {
        "asynckit": "^0.4.0",
        "combined-stream": "^1.0.6",
@ -2779,9 +2814,9 @@
      }
    },
    "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
+      "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==",
      "dev": true
    },
    "growly": {
@ -3274,9 +3309,9 @@
      },
      "dependencies": {
        "semver": {
-          "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
+          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
          "dev": true
        }
      }
@ -3462,9 +3497,9 @@
      "dev": true
    },
    "jest-haste-map": {
-      "version": "24.8.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.0.tgz",
-      "integrity": "sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ==",
+      "version": "24.8.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.8.1.tgz",
+      "integrity": "sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==",
      "dev": true,
      "requires": {
        "@jest/types": "^24.8.0",
@ -3908,9 +3943,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
    },
    "lodash.sortby": {
      "version": "4.7.0",
@ -4262,9 +4297,9 @@
          }
        },
        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
          "dev": true
        }
      }
@ -4675,9 +4710,9 @@
      }
    },
    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
      "dev": true
    },
    "prompts": {
@ -4706,9 +4741,9 @@
      "dev": true
    },
    "psl": {
-      "version": "1.1.32",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
-      "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.2.0.tgz",
+      "integrity": "sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA=="
    },
    "pstree.remy": {
      "version": "1.1.7",
@ -4732,9 +4767,9 @@
      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
    },
    "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
    },
    "range-parser": {
      "version": "1.2.1",
@ -4804,6 +4839,14 @@
        "safe-buffer": "~5.1.1",
        "string_decoder": "~1.1.1",
        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
      }
    },
    "readdirp": {
@ -4900,10 +4943,15 @@
        "uuid": "^3.3.2"
      },
      "dependencies": {
-        "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
        }
      }
    },
@ -4940,9 +4988,9 @@
      "dev": true
    },
    "resolve": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
-      "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
      "dev": true,
      "requires": {
        "path-parse": "^1.0.6"
@ -4985,15 +5033,15 @@
      }
    },
    "rsvp": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.4.tgz",
-      "integrity": "sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==",
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
      "dev": true
    },
    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
    },
    "safe-regex": {
      "version": "1.1.0",
@ -5162,9 +5210,9 @@
      "dev": true
    },
    "sisteransi": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.0.tgz",
-      "integrity": "sha512-N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.2.tgz",
+      "integrity": "sha512-ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w==",
      "dev": true
    },
    "slash": {
@ -5357,9 +5405,9 @@
      }
    },
    "spdx-license-ids": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
      "dev": true
    },
    "split-string": {
@ -5486,6 +5534,14 @@
      "dev": true,
      "requires": {
        "safe-buffer": "~5.1.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
      }
    },
    "strip-ansi": {
@ -5543,9 +5599,9 @@
          }
        },
        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
          "dev": true
        }
      }
@ -5569,9 +5625,9 @@
      }
    },
    "symbol-tree": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
      "dev": true
    },
    "term-size": {
@ -5819,9 +5875,9 @@
      }
    },
    "typescript": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz",
-      "integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
      "dev": true
    },
    "uglify-js": {
--- a/server/package.json
+++ b/server/package.json
@ -30,15 +30,15 @@
    "@types/express": "^4.17.0",
    "@types/jest": "^24.0.15",
    "@types/morgan": "^1.7.35",
-    "@types/node": "^12.0.12",
-    "@types/request": "^2.48.1",
+    "@types/node": "^12.6.6",
+    "@types/request": "^2.48.2",
    "@types/supertest": "^2.0.8",
    "jest": "^24.8.0",
    "nodemon": "^1.19.1",
    "supertest": "^4.0.2",
    "ts-jest": "^24.0.2",
    "ts-node": "^8.3.0",
-    "typescript": "3.5.2"
+    "typescript": "3.5.3"
  },
  "repository": {
    "type": "git",