Merge pull request #239 from Oliver-I/chore/refactor-context-for-v2-api

chore(context):Removed context in line with API V2

Author: Steve Green

app.js

@@ -1,4 +1,5 @@
 /**
+ * 
  * Copyright 2015 IBM Corp. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +19,7 @@
 
 var express = require('express'); // app server
 var bodyParser = require('body-parser'); // parser for post requests
-var AssistantV2 = require('watson-developer-cloud/assistant/v2'); // watson sdk
+var AssistantV2 = require('ibm-watson/assistant/v2'); // watson sdk
 
 var app = express();
 
@@ -29,34 +30,20 @@ app.use(bodyParser.json());
 // Create the service wrapper
 
 var assistant = new AssistantV2({
-  version: '2018-11-08'
+  version: '2019-02-28'
 });
 
-var newContext = {
-  global : {
-    system : {
-      turn_count : 1
-    }
-  }
-};
 
 // Endpoint to be call from the client side
 app.post('/api/message', function (req, res) {
   var assistantId = process.env.ASSISTANT_ID || '<assistant-id>';
-  if (!assistantId || assistantId === '<assistant-id>>') {
+  if (!assistantId || assistantId === '<assistant-id>') {
     return res.json({
       'output': {
         'text': 'The app has not been configured with a <b>ASSISTANT_ID</b> environment variable. Please refer to the ' + '<a href="https://github.com/watson-developer-cloud/assistant-simple">README</a> documentation on how to set this variable. <br>' + 'Once a workspace has been defined the intents may be imported from ' + '<a href="https://github.com/watson-developer-cloud/assistant-simple/blob/master/training/car_workspace.json">here</a> in order to get a working application.'
       }
     });
   }
-  var contextWithAcc = (req.body.context) ? req.body.context : newContext;
-
-  if (req.body.context) {
-    contextWithAcc.global.system.turn_count += 1;
-  }
-
-  //console.log(JSON.stringify(contextWithAcc, null, 2));
 
   var textIn = '';
 
@@ -67,13 +54,9 @@ app.post('/api/message', function (req, res) {
   var payload = {
     assistant_id: assistantId,
     session_id: req.body.session_id,
-    context: contextWithAcc,
     input: {
       message_type : 'text',
-      text : textIn,
-      options : {
-        return_context : true
-      }
+      text : textIn
     }
   };