Merge pull request #117 from watson-developer-cloud/up

Update dependencies

Author: germanattanasio

.env.example

@@ -1,12 +1,7 @@
-# You need to provide either username and password
-DISCOVERY_USERNAME=
-DISCOVERY_PASSWORD=
-# OR IAM API key and URL
 DISCOVERY_IAM_APIKEY=
 DISCOVERY_IAM_URL=https://iam.bluemix.net/identity/token
-
+DISCOVERY_URL=https://gateway.watsonplatform.net/discovery/api
 
 ENVIRONMENT_ID=<environment>
 COLLECTION_ID=<collection>
-# check your credentials to validate the url below is correct
-DISCOVERY_URL=https://gateway.watsonplatform.net/discovery/api
+

.eslintrc.json

@@ -1,8 +1,4 @@
 {
-    "extends": ["react-app", "airbnb"],
-    "plugins": [
-        "react",
-        "jsx-a11y",
-        "import"
-    ]
+  "extends": ["react-app"],
+  "plugins": ["react", "jsx-a11y", "import"]
 }

.travis.yml

@@ -1,30 +1,26 @@
 language: node_js
-dist: trusty
 sudo: required
-node_js: 8
+node_js: 12
 cache:
   directories:
-  - node_modules
+    - node_modules
 env:
   global:
-  - BX_APP=discovery-news-demo
-  - BX_API=https://api.ng.bluemix.net
-  - BX_ORGANIZATION=WatsonPlatformServices
-  - BX_SPACE=demos
+    - BX_APP=discovery-news-demo
+    - BX_API=https://api.ng.bluemix.net
+    - BX_ORGANIZATION=WatsonPlatformServices
+    - BX_SPACE=demos
 script:
-- npm run test
-- npm run build
+  - npm run test
+  - npm run build
 before_deploy: npm install -g bx-blue-green
 deploy:
-- provider: script
-  skip_cleanup: true
-  script:
-  - bx-blue-green-travis
-  on:
-    branch: master
-    repo: watson-developer-cloud/discovery-nodejs
-- provider: script
-  skip_cleanup: true
-  script: npx semantic-release
-  on:
-    node: 8
+  - provider: script
+    skip_cleanup: true
+    script: bx-blue-green-travis
+    on:
+      branch: master
+      repo: watson-developer-cloud/discovery-nodejs
+  - provider: script
+    skip_cleanup: true
+    script: npx semantic-release

app.js

@@ -1,24 +1,28 @@
-const queryBuilder = require('./src/query-builder');
-
-const NEWS_ENVIRONMENT_ID = 'system';
-const NEWS_COLLECTION_ID = 'news';
+const DISCOVERY_ENVIRONMENT_ID = 'system';
+const DISCOVERY_COLLECTION_ID = 'news';
 
-const DiscoveryV1 = require('watson-developer-cloud/discovery/v1');
+const DiscoveryV1 = require('ibm-watson/discovery/v1');
+const { IamAuthenticator } = require('ibm-watson/auth');
 
+// Create the service wrapper
 const discovery = new DiscoveryV1({
-  version: '2017-08-01',
-  url: process.env.DISCOVERY_URL || 'https://gateway.watsonplatform.net/discovery/api',
+  version: '2019-02-28',
+  authenticator: new IamAuthenticator({
+    apikey: process.env.DISCOVERY_IAM_APIKEY,
+  }),
+  url: process.env.DISCOVERY_URL,
 });
 
 // Bootstrap application settings
 const express = require('express');
 const path = require('path');
+const queryBuilder = require('./src/query-builder');
 
 const app = express();
 require('./config/express')(app);
 
 function getWidgetQuery(request) {
-  const widgetQueries = request.query.widgetQueries;
+  const { widgetQueries } = request.query;
 
   if (!widgetQueries) {
     return null;
@@ -34,12 +38,14 @@ function getWidgetQuery(request) {
         const currentAggregations = finalWidgetQuery.aggregations || [];
         delete queryBuilderWidgetQuery.aggregations;
 
-        return Object.assign({}, finalWidgetQuery, queryBuilderWidgetQuery, {
+        return {
+          ...finalWidgetQuery,
+          ...queryBuilderWidgetQuery,
           aggregations: currentAggregations.concat(widgetAggregations),
-        });
+        };
       }
     }
-    return Object.assign({}, finalWidgetQuery, queryBuilderWidgetQuery);
+    return { ...finalWidgetQuery, ...queryBuilderWidgetQuery };
   }, {});
 }
 
@@ -56,10 +62,11 @@ app.post('/api/query', (req, res, next) => {
     delete queryParams.aggregations;
   }
 
-  const params = Object.assign({}, queryParams, {
-    environment_id: NEWS_ENVIRONMENT_ID,
-    collection_id: NEWS_COLLECTION_ID,
-  });
+  const params = {
+    ...queryParams,
+    environmentId: DISCOVERY_ENVIRONMENT_ID,
+    collectionId: DISCOVERY_COLLECTION_ID,
+  };
 
   discovery.query(params, (error, response) => {
     if (error) {

casper-runner.js

@@ -1,10 +1,10 @@
 require('dotenv').config();
+const { spawn } = require('child_process');
 const app = require('./app');
-const spawn = require('child_process').spawn;
 
-if (!process.env.DISCOVERY_USERNAME && !process.env.DISCOVERY_IAM_APIKEY) {
+if (!process.env.DISCOVERY_IAM_APIKEY) {
   // eslint-disable-next-line no-console
-  console.log('Skipping integration tests because DISCOVERY_USERNAME and DISCOVERY_IAM_APIKEY are null');
+  console.log('Skipping integration tests because DISCOVERY_IAM_APIKEY is null');
 } else {
   const port = 3000;
   const server = app.listen(port, () => {

config/security.js

@@ -9,7 +9,6 @@ module.exports = function secureApp(app) {
 
   const limiter = rateLimit({
     windowMs: 30 * 1000, // seconds
-    delayMs: 0,
     max: 5,
     message: JSON.stringify({
       error: 'Too many requests, please try again in 30 seconds.',