@webex/internal-plugin-lyra 3.0.0-beta.14 → 3.0.0-beta.15

package/src/space.js

@@ -21,11 +21,12 @@ const Space = WebexPlugin.extend({
    * @returns {Promise<Array>} spaces
    */
   list() {
-    return this.webex.request({
-      method: 'GET',
-      api: 'lyra',
-      resource: '/spaces'
-    })
+    return this.webex
+      .request({
+        method: 'GET',
+        api: 'lyra',
+        resource: '/spaces',
+      })
       .then((res) => res.body.items);
   },
 
@@ -37,17 +38,18 @@ const Space = WebexPlugin.extend({
    * @returns {Promise<LyraSpace>} response body
    */
   get(space = {}) {
-    const spaceId = space.id || space.identity && space.identity.id;
+    const spaceId = space.id || (space.identity && space.identity.id);
 
     if (!spaceId) {
       return Promise.reject(new Error('space.id is required'));
     }
 
-    return this.webex.request({
-      method: 'GET',
-      api: 'lyra',
-      resource: `/spaces/${spaceId}`
-    })
+    return this.webex
+      .request({
+        method: 'GET',
+        api: 'lyra',
+        resource: `/spaces/${spaceId}`,
+      })
       .then((res) => res.body);
   },
 
@@ -62,15 +64,16 @@ const Space = WebexPlugin.extend({
    * @returns {Promise}
    */
   join(space, options) {
-    options = Object.assign({
-      passType: 'MANUAL'
-    }, options);
+    options = {
+      passType: 'MANUAL',
+      ...options,
+    };
 
     const body = {
       pass: {
-        type: options.passType
+        type: options.passType,
       },
-      deviceUrl: this.webex.internal.device.url
+      deviceUrl: this.webex.internal.device.url,
     };
 
     if (options.data) {
@@ -87,7 +90,7 @@ const Space = WebexPlugin.extend({
       return this.webex.request({
         method: 'PUT',
         uri: options.uri,
-        body
+        body,
       });
     }
 
@@ -95,7 +98,7 @@ const Space = WebexPlugin.extend({
       method: 'PUT',
       api: 'lyra',
       resource: `${space.url}/occupants/@me`,
-      body
+      body,
     });
   },
 
@@ -113,7 +116,7 @@ const Space = WebexPlugin.extend({
 
     if (!options.removeAllDevices) {
       const params = {
-        deviceUrl: base64.toBase64Url(this.webex.internal.device.url)
+        deviceUrl: base64.toBase64Url(this.webex.internal.device.url),
       };
 
       uri += `?${querystring.stringify(params)}`;
@@ -122,7 +125,7 @@ const Space = WebexPlugin.extend({
     return this.webex.request({
       method: 'DELETE',
       api: 'lyra',
-      resource: uri
+      resource: uri,
     });
   },
 
@@ -136,18 +139,17 @@ const Space = WebexPlugin.extend({
   verifyOccupant(space, occupantId) {
     const body = {
       pass: {
-        type: 'VERIFICATION'
-      }
+        type: 'VERIFICATION',
+      },
     };
 
     return this.webex.request({
       method: 'PUT',
       uri: `${space.url}/occupants/${occupantId}`,
-      body
+      body,
     });
   },
 
-
   /**
    * Gets the state of bindings in this Lyra space
    * @param {Types~LyraSpace} space
@@ -155,10 +157,11 @@ const Space = WebexPlugin.extend({
    * @returns {Promise<LyraBindings>} bindings response body
    */
   getCurrentBindings(space) {
-    return this.webex.request({
-      method: 'GET',
-      uri: `${space.url}/bindings`
-    })
+    return this.webex
+      .request({
+        method: 'GET',
+        uri: `${space.url}/bindings`,
+      })
       .then((res) => res.body);
   },
 
@@ -176,7 +179,7 @@ const Space = WebexPlugin.extend({
    * @returns {Promise<LyraBindings>} bindings response body
    */
   bindConversation(space = {}, conversation = {}, options = {}) {
-    const spaceId = space.id || space.identity && space.identity.id;
+    const spaceId = space.id || (space.identity && space.identity.id);
 
     if (!space.url) {
       return Promise.reject(new Error('space.url is required'));
@@ -199,22 +202,21 @@ const Space = WebexPlugin.extend({
         method: 'create',
         uri: '/authorizations',
         resourceUri: `${conversation.kmsResourceObjectUrl}`,
-        userIds: [spaceId]
+        userIds: [spaceId],
       },
-      conversationUrl: conversation.url
+      conversationUrl: conversation.url,
     };
 
     const request = {
       method: 'POST',
-      body
+      body,
     };
 
     // if options.uri is available use it, since that would have the
     // complete lyra service URL
     if (options.uri) {
       request.uri = options.uri;
-    }
-    else {
+    } else {
       request.api = 'lyra';
       request.resource = `${space.url}/bindings`;
     }
@@ -246,8 +248,8 @@ const Space = WebexPlugin.extend({
       api: 'lyra',
       resource,
       body: {
-        bindingCleanupAfterCall: true
-      }
+        bindingCleanupAfterCall: true,
+      },
     });
   },
 
@@ -266,7 +268,7 @@ const Space = WebexPlugin.extend({
    * @returns {Promise<LyraBindings>} bindings response body
    */
   unbindConversation(space = {}, conversation = {}, options = {}) {
-    const spaceId = space.id || space.identity && space.identity.id;
+    const spaceId = space.id || (space.identity && space.identity.id);
 
     if (!space.url) {
       return Promise.reject(new Error('space.url is required'));
@@ -287,29 +289,30 @@ const Space = WebexPlugin.extend({
     const parameters = {
       kmsMessage: {
         method: 'delete',
-        uri: `${conversation.kmsResourceObjectUrl}/authorizations?${querystring.stringify({authId: spaceId})}`
+        uri: `${conversation.kmsResourceObjectUrl}/authorizations?${querystring.stringify({
+          authId: spaceId,
+        })}`,
       },
-      conversationUrl: base64.toBase64Url(conversation.url)
+      conversationUrl: base64.toBase64Url(conversation.url),
     };
 
-    return this.webex.internal.encryption.kms.prepareRequest(parameters.kmsMessage)
-      .then((req) => {
-        parameters.kmsMessage = req.wrapped;
-        // if options.uri is available use it, since that would have the
-        // complete lyra service URL
-        if (options.uri) {
-          return this.webex.request({
-            method: 'DELETE',
-            uri: `${options.uri}?${querystring.stringify(parameters)}`
-          });
-        }
-
+    return this.webex.internal.encryption.kms.prepareRequest(parameters.kmsMessage).then((req) => {
+      parameters.kmsMessage = req.wrapped;
+      // if options.uri is available use it, since that would have the
+      // complete lyra service URL
+      if (options.uri) {
         return this.webex.request({
           method: 'DELETE',
-          api: 'lyra',
-          resource: `${space.url}/bindings?${querystring.stringify(parameters)}`
+          uri: `${options.uri}?${querystring.stringify(parameters)}`,
         });
+      }
+
+      return this.webex.request({
+        method: 'DELETE',
+        api: 'lyra',
+        resource: `${space.url}/bindings?${querystring.stringify(parameters)}`,
       });
+    });
   },
 
   /**
@@ -323,7 +326,7 @@ const Space = WebexPlugin.extend({
    * @returns {Promise<LyraBindings>} bindings response body
    */
   deleteBinding(space = {}, options = {}) {
-    const spaceId = space.id || space.identity && space.identity.id;
+    const spaceId = space.id || (space.identity && space.identity.id);
 
     if (!space.url) {
       return Promise.reject(new Error('space.url is required'));
@@ -344,20 +347,21 @@ const Space = WebexPlugin.extend({
     const parameters = {
       kmsMessage: {
         method: 'delete',
-        uri: `${options.kmsResourceObjectUrl}/authorizations?${querystring.stringify({authId: spaceId})}`
-      }
+        uri: `${options.kmsResourceObjectUrl}/authorizations?${querystring.stringify({
+          authId: spaceId,
+        })}`,
+      },
     };
 
-    return this.webex.internal.encryption.kms.prepareRequest(parameters.kmsMessage)
-      .then((req) => {
-        parameters.kmsMessage = req.wrapped;
+    return this.webex.internal.encryption.kms.prepareRequest(parameters.kmsMessage).then((req) => {
+      parameters.kmsMessage = req.wrapped;
 
-        return this.webex.request({
-          method: 'DELETE',
-          uri: `${space.url}/bindings/${options.bindingId}?${querystring.stringify(parameters)}`
-        });
+      return this.webex.request({
+        method: 'DELETE',
+        uri: `${space.url}/bindings/${options.bindingId}?${querystring.stringify(parameters)}`,
       });
-  }
+    });
+  },
 });
 
 export default Space;

package/test/integration/spec/device.js

@@ -24,20 +24,22 @@ describe('plugin-lyra', () => {
     before('create lyra machine', function () {
       this.timeout(retry.timeout(20000));
 
-      return retry(() => testUsers.create({
-        count: 1,
-        config: {
-          machineType: 'LYRA_SPACE',
-          type: 'MACHINE',
-          password: `${generateRandomString(32)}d_wA*`
-        }
-      }))
+      return retry(() =>
+        testUsers.create({
+          count: 1,
+          config: {
+            machineType: 'LYRA_SPACE',
+            type: 'MACHINE',
+            password: `${generateRandomString(32)}d_wA*`,
+          },
+        })
+      )
         .then((machines) => {
           lyraMachine = machines[0];
           lyraMachine.webex = new WebexCore({
             credentials: {
-              authorization: lyraMachine.token
-            }
+              authorization: lyraMachine.token,
+            },
           });
 
           // binding to conversation only works with webex board device
@@ -56,31 +58,37 @@ describe('plugin-lyra', () => {
         });
     });
 
-    before('create users', () => testUsers.create({count: 2})
-      .then((users) => {
+    before('create users', () =>
+      testUsers.create({count: 2}).then((users) => {
         participants = users;
         spock = participants[0];
 
-        return Promise.all(Array.map(participants, (participant) => {
-          participant.webex = new WebexCore({
-            credentials: {
-              authorization: participant.token
-            }
-          });
-
-          return participant.webex.internal.mercury.connect();
-        }));
-      }));
-
-    before('create conversation', () => retry(() => participants[0].webex.internal.conversation.create({
-      displayName: 'Test Lyra Conversation',
-      participants
-    }))
-      .then((c) => {
+        return Promise.all(
+          Array.map(participants, (participant) => {
+            participant.webex = new WebexCore({
+              credentials: {
+                authorization: participant.token,
+              },
+            });
+
+            return participant.webex.internal.mercury.connect();
+          })
+        );
+      })
+    );
+
+    before('create conversation', () =>
+      retry(() =>
+        participants[0].webex.internal.conversation.create({
+          displayName: 'Test Lyra Conversation',
+          participants,
+        })
+      ).then((c) => {
         conversation = c;
 
         return conversation;
-      }));
+      })
+    );
 
     describe('#getAudioState', () => {
       let audioState;
@@ -88,19 +96,19 @@ describe('plugin-lyra', () => {
       before('put audio state', () => {
         audioState = {
           volume: {
-            level: 2
+            level: 2,
           },
           microphones: {
-            muted: false
+            muted: false,
           },
-          deviceUrl: lyraMachine.webex.internal.device.url
+          deviceUrl: lyraMachine.webex.internal.device.url,
         };
 
         return lyraMachine.webex.internal.lyra.device.putAudioState(lyraMachine.space, audioState);
       });
 
-      it('returns audio state', () => lyraMachine.webex.internal.lyra.device.getAudioState(lyraMachine.space)
-        .then((res) => {
+      it('returns audio state', () =>
+        lyraMachine.webex.internal.lyra.device.getAudioState(lyraMachine.space).then((res) => {
           assert.equal(res.microphones.muted, audioState.microphones.muted);
           assert.equal(res.volume.level, audioState.volume.level);
         }));
@@ -108,14 +116,19 @@ describe('plugin-lyra', () => {
 
     // Skip until we can bind a conversation to lyra space by posting capabilities to Lyra.
     describe.skip('when a call is in progress', () => {
-      before('ensure participant joined space', () => spock.webex.internal.lyra.space.join(lyraSpace)
-        .then(() => lyraMachine.webex.internal.lyra.space.verifyOccupant(lyraMachine.space, spock.id))
-        .then(() => spock.webex.internal.lyra.space.bindConversation(lyraSpace, conversation)));
+      before('ensure participant joined space', () =>
+        spock.webex.internal.lyra.space
+          .join(lyraSpace)
+          .then(() =>
+            lyraMachine.webex.internal.lyra.space.verifyOccupant(lyraMachine.space, spock.id)
+          )
+          .then(() => spock.webex.internal.lyra.space.bindConversation(lyraSpace, conversation))
+      );
 
       before('make a call', () => {
         const locus = {
           url: conversation.locusUrl,
-          correlationId: uuid.v4()
+          correlationId: uuid.v4(),
         };
 
         return spock.webex.request({
@@ -124,19 +137,23 @@ describe('plugin-lyra', () => {
           body: {
             correlationId: locus.correlationId,
             deviceUrl: spock.webex.internal.device.url,
-            localMedias: []
-          }
+            localMedias: [],
+          },
         });
       });
 
-      after('remove binding', () => spock.webex.internal.lyra.space.unbindConversation(lyraMachine.space, conversation)
-        // After hooks shouldn't be able to break tests
-        .catch((err) => console.error(err)));
+      after('remove binding', () =>
+        spock.webex.internal.lyra.space
+          .unbindConversation(lyraMachine.space, conversation)
+          // After hooks shouldn't be able to break tests
+          .catch((err) => console.error(err))
+      );
 
       it('mutes', () => {
         spock.webex.internal.lyra.device.mute(lyraMachine.space);
 
-        return lyraMachine.webex.internal.mercury.when('event:lyra.space_audio_microphones_mute_action')
+        return lyraMachine.webex.internal.mercury
+          .when('event:lyra.space_audio_microphones_mute_action')
           .then(([event]) => {
             assert.equal(event.data.action, 'mute');
           });
@@ -145,7 +162,8 @@ describe('plugin-lyra', () => {
       it('unmutes', () => {
         spock.webex.internal.lyra.device.unmute(lyraMachine.space);
 
-        return lyraMachine.webex.internal.mercury.when('event:lyra.space_audio_microphones_mute_action')
+        return lyraMachine.webex.internal.mercury
+          .when('event:lyra.space_audio_microphones_mute_action')
           .then(([event]) => {
             assert.equal(event.data.action, 'unMute');
           });
@@ -154,7 +172,8 @@ describe('plugin-lyra', () => {
       it('increases volume', () => {
         spock.webex.internal.lyra.device.increaseVolume(lyraMachine.space);
 
-        return lyraMachine.webex.internal.mercury.when('event:lyra.space_audio_volume_change_action')
+        return lyraMachine.webex.internal.mercury
+          .when('event:lyra.space_audio_volume_change_action')
           .then(([event]) => {
             assert.equal(event.data.action, 'increase');
           });
@@ -163,7 +182,8 @@ describe('plugin-lyra', () => {
       it('decreases volume', () => {
         spock.webex.internal.lyra.device.decreaseVolume(lyraMachine.space);
 
-        return lyraMachine.webex.internal.mercury.when('event:lyra.space_audio_volume_change_action')
+        return lyraMachine.webex.internal.mercury
+          .when('event:lyra.space_audio_volume_change_action')
           .then(([event]) => {
             assert.equal(event.data.action, 'decrease');
           });
@@ -172,7 +192,8 @@ describe('plugin-lyra', () => {
       it('sets volume', () => {
         spock.webex.internal.lyra.device.setVolume(lyraMachine.space, 2);
 
-        return lyraMachine.webex.internal.mercury.when('event:lyra.space_audio_volume_set_action')
+        return lyraMachine.webex.internal.mercury
+          .when('event:lyra.space_audio_volume_set_action')
           .then(([event]) => {
             assert.equal(event.data.level, 2);
           });