🔥 Update dependencies

Author: germanattanasio

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
-dist: trusty
 sudo: required
-node_js: 8
+node_js: 12
 script:
 - npm run test
 
@@ -18,13 +17,10 @@ before_deploy: npm install -g bx-blue-green
 deploy:
 - provider: script
   skip_cleanup: true
-  script:
-  - bx-blue-green-travis
+  script: bx-blue-green-travis
   on:
     branch: master
     repo: watson-developer-cloud/natural-language-classifier-nodejs
 - provider: script
   skip_cleanup: true
   script: npx semantic-release
-  on:
-    node: 8

README.md

@@ -26,22 +26,21 @@ You can view a [demo](https://natural-language-classifier-demo.ng.bluemix.net/)
     - Log in to your IBM Cloud account.
     - Click **Create**.
     - Click **Show** to view the service credentials.
-    - Copy the `apikey` value, or copy the `username` and `password` values if your service instance doesn't provide an `apikey`.
+    - Copy the `apikey` value.
     - Copy the `url` value.
 
 ## Configuring the application
 
 1. The Natural Language Classifier service must be trained before you can successfully use this application. The training data is provided in the file `training/weather_data_train.csv`.  
  If you have `username` and `password` credentials, train a classifier by using the following command:
 
-  ```none
-  curl -i -u "<username>":"<password>" \
+  ```sh
+  curl -i -u "apikey":"<apikey>" \
   -F training_data=@training/weather_data_train.csv \
   -F training_metadata="{\"language\":\"en\",\"name\":\"TutorialClassifier\"}" \
   "<url>/v1/classifiers"
   ```
-  Make sure to replace `<username>`, `<password>` and `<url>`.  
-  If you have `apikey` credentials, use the word "apikey" as your username and your `apikey` as the password.  
+  Make sure to replace `<apikey>` and `<url>`.  
   After running the command, copy the value for `classifier_id`.
 
 2. In the application folder, copy the *.env.example* file and create a file called *.env*
@@ -59,16 +58,6 @@ You can view a [demo](https://natural-language-classifier-demo.ng.bluemix.net/)
     NATURAL_LANGUAGE_CLASSIFIER_URL=https://gateway.watsonplatform.net/natural-language-classifier/api
     ```
 
-    - If your service instance uses `username` and `password` credentials, add the `NATURAL_LANGUAGE_CLASSIFIER_USERNAME` and `NATURAL_LANGUAGE_CLASSIFIER_PASSWORD` variables to the *.env* file.
-
-    Example *.env* file that configures the `username`, `password`, and `url` for a Natural Language Classifier service instance hosted in the Sydney region:
-
-    ```
-    NATURAL_LANGUAGE_CLASSIFIER_USERNAME=522be-7b41-ab44-dec3-g1eab2ha73c6
-    NATURAL_LANGUAGE_CLASSIFIER_PASSWORD=A4Z5BdGENrwu8
-    NATURAL_LANGUAGE_CLASSIFIER_URL=https://gateway-syd.watsonplatform.net/natural-language-classifier/api
-    ```
-
 8. Add the `CLASSIFIER_ID` to the previous properties
 
     ```

app.js

@@ -18,27 +18,20 @@ const express = require('express');
 
 const app = express();
 const NaturalLanguageClassifierV1 = require('ibm-watson/natural-language-classifier/v1');
+const { IamAuthenticator } = require('ibm-watson/auth');
 
 // Bootstrap application settings
 require('./config/express')(app);
 
 // Create the service wrapper
 
-let classifier;
-
-if (process.env.NATURAL_LANGUAGE_CLASSIFIER_IAM_APIKEY && process.env.NATURAL_LANGUAGE_CLASSIFIER_IAM_APIKEY !== '') {
-  classifier = new NaturalLanguageClassifierV1({
-    url: process.env.NATURAL_LANGUAGE_CLASSIFIER_URL || '<service-url>',
-    iam_apikey: process.env.NATURAL_LANGUAGE_CLASSIFIER_IAM_APIKEY || '<iam_apikey>',
-    iam_url: process.env.ASSISTANT_IAM_URL || 'https://iam.bluemix.net/identity/token',
-  });
-} else {
-  classifier = new NaturalLanguageClassifierV1({
-    url: process.env.NATURAL_LANGUAGE_CLASSIFIER_URL || '<service-url>',
-    username: process.env.NATURAL_LANGUAGE_CLASSIFIER_USERNAME || '<username>',
-    password: process.env.NATURAL_LANGUAGE_CLASSIFIER_PASSWORD || '<password>',
-  });
-}
+const classifier = new NaturalLanguageClassifierV1({
+  version: '2018-04-05',
+  authenticator: new IamAuthenticator({
+    apikey: process.env.NATURAL_LANGUAGE_CLASSIFIER_IAM_APIKEY || '<api-key>',
+  }),
+  url: process.env.NATURAL_LANGUAGE_CLASSIFIER_URL,
+});
 
 app.get('/', (req, res) => {
   res.render('index', {
@@ -52,12 +45,12 @@ app.get('/', (req, res) => {
 app.post('/api/classify', (req, res, next) => {
   classifier.classify({
     text: req.body.text,
-    classifier_id: process.env.CLASSIFIER_ID || '<classifier-id>',
+    classifierId: process.env.CLASSIFIER_ID || '<classifier-id>',
   }, (err, data) => {
     if (err) {
       return next(err);
     }
-    return res.json(data);
+    return res.json(data.result);
   });
 });
 

manifest.yml

@@ -1,11 +1,5 @@
-declared-services:
-  my-nlc-service:
-    label: natural_language_classifier
-    plan: standard
 applications:
-- services:
-  - my-nlc-service
-  name: natural-language-classifier-demo
+- name: natural-language-classifier-demo
   command: npm start
   path: .
   memory: 512M