From 07264e2750a58a1c1edd2972ec20743bf5490823 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Mon, 23 Apr 2018 11:08:07 +0200
Subject: [PATCH] openvidu-testapp: openvidu-node-client builder patterns to
 objects

---
 .../openvidu-instance.component.ts            | 54 +++++++++----------
 .../test-apirest/test-apirest.component.ts    | 10 ++--
 .../src/app/services/openvidu-rest.service.ts |  9 ++--
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts b/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts
index f09d32df..4d2a09bf 100644
--- a/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts
+++ b/openvidu-testapp/src/app/components/openvidu-instance/openvidu-instance.component.ts
@@ -966,36 +966,36 @@ export class OpenviduInstanceComponent implements OnInit, OnChanges, OnDestroy {
         frameRate: 10,
       }
     )
-    .then((mediaStream: MediaStream) => {
-      const videoStreamTrack = mediaStream.getVideoTracks()[0];
-      const video = document.createElement('video');
-      video.srcObject = new MediaStream([videoStreamTrack]);
-      video.play();
-      const canvas = document.createElement('canvas') as any;
-      const ctx = canvas.getContext('2d');
-      ctx.filter = 'grayscale(100%)';
+      .then((mediaStream: MediaStream) => {
+        const videoStreamTrack = mediaStream.getVideoTracks()[0];
+        const video = document.createElement('video');
+        video.srcObject = new MediaStream([videoStreamTrack]);
+        video.play();
+        const canvas = document.createElement('canvas') as any;
+        const ctx = canvas.getContext('2d');
+        ctx.filter = 'grayscale(100%)';
 
-      video.addEventListener('play', () => {
-        const loop = () => {
-          if (!video.paused && !video.ended) {
-            ctx.drawImage(video, 0, 0, 300, 170);
-            setTimeout(loop, 100); // Drawing at 10fps
-          }
-        };
-        loop();
-      });
-      const grayVideoTrack = canvas.captureStream(30).getVideoTracks()[0];
-      this.OV.initPublisher(
-          document.body,
-        {
-          audioSource: false,
-          videoSource: grayVideoTrack,
-          insertMode: 'APPEND'
+        video.addEventListener('play', () => {
+          const loop = () => {
+            if (!video.paused && !video.ended) {
+              ctx.drawImage(video, 0, 0, 300, 170);
+              setTimeout(loop, 100); // Drawing at 10fps
+            }
+          };
+          loop();
         });
+        const grayVideoTrack = canvas.captureStream(30).getVideoTracks()[0];
+        this.OV.initPublisher(
+          document.body,
+          {
+            audioSource: false,
+            videoSource: grayVideoTrack,
+            insertMode: 'APPEND'
+          });
       })
-    .catch(error => {
-      console.error(error);
-    });
+      .catch(error => {
+        console.error(error);
+      });
   }
 
 }
diff --git a/openvidu-testapp/src/app/components/test-apirest/test-apirest.component.ts b/openvidu-testapp/src/app/components/test-apirest/test-apirest.component.ts
index 3dca9934..9ce08019 100644
--- a/openvidu-testapp/src/app/components/test-apirest/test-apirest.component.ts
+++ b/openvidu-testapp/src/app/components/test-apirest/test-apirest.component.ts
@@ -70,11 +70,11 @@ export class TestApirestComponent implements OnInit, OnDestroy {
 
   private getSessionId() {
     this.openviduRestService.getSessionId(this.openviduUrl, this.openviduSecret,
-      new SessionProperties.Builder()
-        .recordingMode(RecordingMode[this.selectedRecordingMode])
-        .defaultRecordingLayout(RecordingLayout[this.selectedDefaultRecordingLayout])
-        .mediaMode(MediaMode[this.selectedMediaMode])
-        .build())
+      {
+        recordingMode: RecordingMode[this.selectedRecordingMode],
+        defaultRecordingLayout: RecordingLayout[this.selectedDefaultRecordingLayout],
+        mediaMode: MediaMode[this.selectedMediaMode]
+      })
       .then((sessionId) => {
         this.updateData();
       })
diff --git a/openvidu-testapp/src/app/services/openvidu-rest.service.ts b/openvidu-testapp/src/app/services/openvidu-rest.service.ts
index 56a2ebb5..e949e320 100644
--- a/openvidu-testapp/src/app/services/openvidu-rest.service.ts
+++ b/openvidu-testapp/src/app/services/openvidu-rest.service.ts
@@ -37,11 +37,10 @@ export class OpenviduRestService {
     const OVRole: OpenViduRoleAPI = OpenViduRoleAPI[role];
 
     return new Promise((resolve, reject) => {
-      const tokenOptions: TokenOptionsAPI = new TokenOptionsAPI.Builder()
-        .role(OVRole)
-        .data(serverData)
-        .build();
-      session.generateToken(tokenOptions)
+      session.generateToken({
+        role: OVRole,
+        data: serverData
+      })
         .then(token => {
           this.sessionIdTokenOpenViduRole.get(sessionId).set(token, OVRole);
           resolve(token);