add context support for V2

Author: spoeck

README.md

@@ -24,7 +24,9 @@ npm install --save react-native-dialogflow
 
 react-native link react-native-dialogflow
 react-native link react-native-speech-to-text-ios
+# for V2
 react-native link react-native-voice
+
 ```
 
 ### iOS: IMPORTANT xCode plist settings
@@ -46,9 +48,13 @@ Import Dialogflow:
 ```javascript
 import Dialogflow from "react-native-dialogflow";
 ```
+or for V2
+```javascript
+import { Dialogflow_V2 } from "react-native-dialogflow"
+```
 
 ### Configuration
-Set the `clientAccessToken` and the language in your constructor:
+Set the `accessToken` and the language in your constructor:
 ```javascript
  constructor(props) {
         super(props);
@@ -60,6 +66,19 @@ Set the `clientAccessToken` and the language in your constructor:
 
 ```
 
+For V2 you can set the OAUTH accessToken of the (auth setup)[https://dialogflow.com/docs/reference/v2-auth-setup]. In addition you have to set your projectId:
+```javascript
+ constructor(props) {
+        super(props);
+
+        Dialogflow_V2.setConfiguration(
+          "4xxxxxxxe90xxxxxxxxc372", Dialogflow.LANG_GERMAN, 'testV2-3a5bc'
+        );
+    }
+
+```
+
+
 ### Listening
 Start listening with integrated speech recognition:
 ```javascript
@@ -213,7 +232,7 @@ Dialogflow.setConfiguration("4xxxxxxxe90xxxxxxxxc372", Dialogflow.LANG_GERMAN);
 ## Methods
 | name                  | platform | param1    | param2    | param3    | param4    |
 | --------------------- | -------- | --------- | --------- | --------- | --------- |
-| `setConfiguration`    | both     | clientAccessToken: String | languageTag: String | |
+| `setConfiguration`    | both     | accessToken: String | languageTag: String | (V2 only: projectId) |
 | `startListening`      | both     | resultCallback: (result: object)=>{} | errorCallback: (error: object)=>{}  | |
 | `finishListening`     | ios      |  |   | |
 | `requestQuery`        | both     | query: String |  resultCallback: (result: object)=>{} | errorCallback: (error: object)=>{}   |
@@ -225,7 +244,7 @@ Dialogflow.setConfiguration("4xxxxxxxe90xxxxxxxxc372", Dialogflow.LANG_GERMAN);
 | `setContexts`         | both     | array    || |
 | `resetContexts`       | both     | resultCallback: (result: object)=>{} | errorCallback: (error: object)=>{} | |
 | `setPermanentContexts`| both     | array    || |
-| `setEntities`         | both     | array    || |
+| `setEntities` (V1 only)| both     | array    || |
 
 
 ## Blogpost

example/App.android.js

@@ -25,7 +25,7 @@ export default class App extends Component {
     );
 
     Dialogflow_V2.setConfiguration(
-      "ya29.c.El92BV4aRCnGyaJ0VWKF0ewGNprivoW68g9lm0IrbsIi7T9m3QEL-JoPnfq3tWU07WhAjmIhD14z6X-1d8N_jzLz7o_8sB-c5OgAJE4cswJPoOzixZDTmCBvMbD901_0RA",
+      "ya29.c.El93BfD5CZBWUrPJAyUdfWuHkmdzyjo0seL56z-reryvae4j8oVwLO38ARqrpj0Q5LxeUTndPLrA6GYPx4CyrlVmJRKvq_Dtwl9OO0zxiWTVK7boCV-aCVJVHbaFSGstgA",
       Dialogflow_V2.LANG_GERMAN,
       'testv2-3b5ca'
     );
@@ -41,16 +41,9 @@ export default class App extends Component {
     }];
 
 
-    const contexts_V2 = [{
-      "name": "deals",
-      "lifespanCount": 1,
-      "parameters": {
-        "name": "Sam"
-      }
-    }];
 
     Dialogflow.setContexts(contexts);
-    //Dialogflow_V2.setContexts(contexts_V2);
+    Dialogflow_V2.setContexts(contexts);
 
 
     const permanentContexts = [{
@@ -60,15 +53,9 @@ export default class App extends Component {
       }
     }];
 
-    const permanentContexts_V2 = [{
-      "name": "config",
-      "parameters": {
-        "access_token": "42 yo 42 tiny rick"
-      }
-    }];
 
     Dialogflow.setPermanentContexts(permanentContexts);
-    //Dialogflow_V2.setPermanentContexts(permanentContexts_V2);
+    Dialogflow_V2.setPermanentContexts(permanentContexts);
 
 
     const entities = [{

example/README.md

@@ -0,0 +1,11 @@
+# Example App
+
+How to run:
+```
+git clone https://github.com/innFactory/react-native-dialogflow.git
+cd react-native-dialogflow/example
+npm install
+react-native run-android
+```
+
+<img src="screenshot.png" alt="Screenshot"/>

example/screenshot.png

@@ -4,7 +4,6 @@ import { NativeModules, NativeAppEventEmitter } from 'react-native';
 import requestEvent from './ResetContextsRequest';
 import ResetContextsRequest from './ResetContextsRequest';
 export const DEFAULT_BASE_URL = "https://dialogflow.googleapis.com/v2beta1/projects/";
-export const lol = "testv2-3b5ca/agent/sessions/0:detectIntent";
 
 export class Dialogflow_V2 {
 
@@ -21,16 +20,20 @@ export class Dialogflow_V2 {
     }
 
     setContexts(contexts) {
-        this.contexts = contexts;
+        var array = contexts;
 
-        contexts.forEach(c => {
-            this.createContext(c);
+        array.forEach((c, i, a) => {
+            a[i] = this.normalizeContext(c);
         })
+
+        this.contexts = array;
     }
 
     setPermanentContexts(contexts) {
         // set lifespan to 1 if it's not set
         contexts.forEach((c, i, a) => {
+            a[i] = this.normalizeContext(c);
+
             if (!c.lifespanCount) {
                 a[i] = { ...c, lifespanCount: 1 };
             }
@@ -39,22 +42,34 @@ export class Dialogflow_V2 {
         this.permanentContexts = contexts;
     }
 
+    normalizeContext(context) {
+        // rename property lifespan to lifespanCount
+        if (context.lifespan) {
+            context.lifespanCount = context.lifespan;
+            delete context.lifespan;
+        }
+
+        // add context name path: projects/<Project ID>/agent/sessions/<Session ID>/contexts/<Context ID>
+        // https://dialogflow.com/docs/reference/api-v2/rest/v2beta1/projects.agent.sessions.contexts#Context
+        if (!context.name.startsWith("projects/")) {
+            context.name = "projects/" + this.projectId + "/agent/sessions/" + this.sessionId + "/contexts/" + context.name;
+        }
+
+        return context;
+    }
+
+    /*
     setEntities(entities) {
         this.entities = entities;
     }
+    */
 
     onAudioLevel(callback) {
 
     }
 
     requestEvent = async (eventName, eventParameters, onResult, onError) => {
 
-        /*
-        this.permanentContexts.forEach(c => {
-            this.createContext(c);
-        })
-        */
-
         const data = {
             "queryParams": {
                 "contexts": this.mergeContexts(this.contexts, this.permanentContexts),
@@ -90,12 +105,6 @@ export class Dialogflow_V2 {
 
     requestQuery = async (query, onResult, onError) => {
 
-        /*
-        this.permanentContexts.forEach(c => {
-            this.createContext(c);
-        })
-        */
-
         const data = {
             "queryParams": {
                 "contexts": this.mergeContexts(this.contexts, this.permanentContexts),
@@ -127,31 +136,6 @@ export class Dialogflow_V2 {
             .catch(onError);
     };
 
-    /**
-   * https://dialogflow.com/docs/reference/api-v2/rest/v2beta1/projects.agent.sessions.contexts
-   * 
-   * @param {*} context 
-   */
-    createContext = async (context) => {
-
-        const data = context;
-
-        try {
-            const response = await fetch(DEFAULT_BASE_URL + this.projectId + "/agent/sessions/" + this.sessionId + "/contexts:create", {
-                method: "POST",
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': 'Bearer ' + this.accessToken,
-                    'charset': "utf-8"
-                },
-                body: JSON.stringify(data)
-            });
-            console.log(response);
-        } catch (error) {
-            console.log(error);
-        }
-    };
-
 
     mergeContexts(context1, context2) {
         if (!context1) {