@webex/internal-plugin-conversation 3.0.0-beta.15 → 3.0.0-beta.151

package/src/conversation.js

@@ -309,10 +309,11 @@ const Conversation = WebexPlugin.extend({
   /**
    * delete a reaction
    * @param {Object} conversation
-   * @param {Object} reactionId
+   * @param {Object} reactionId,
+   * @param {String} recipientId,
    * @returns {Promise<Activity>}
    */
-  deleteReaction(conversation, reactionId) {
+  deleteReaction(conversation, reactionId, recipientId) {
     const deleteReactionPayload = {
       actor: {objectType: 'person', id: this.webex.internal.device.userId},
       object: {
@@ -327,6 +328,11 @@ const Conversation = WebexPlugin.extend({
       verb: 'delete',
     };
 
+    // Is not required for the request to be accepted, but follows specification.
+    if (recipientId) {
+      deleteReactionPayload.recipients = {items: [{id: recipientId, objectType: 'person'}]};
+    }
+
     return this.sendReaction(conversation, deleteReactionPayload);
   },
 
@@ -335,9 +341,10 @@ const Conversation = WebexPlugin.extend({
    * @param {Object} conversation
    * @param {Object} displayName must be 'celebrate', 'heart', 'thumbsup', 'smiley', 'haha', 'confused', 'sad'
    * @param {Object} activity activity object from convo we are reacting to
+   * @param {String} recipientId,
    * @returns {Promise<Activity>}
    */
-  addReaction(conversation, displayName, activity) {
+  addReaction(conversation, displayName, activity, recipientId) {
     return this.createReactionHmac(displayName, activity).then((hmac) => {
       const addReactionPayload = {
         actor: {objectType: 'person', id: this.webex.internal.device.userId},
@@ -358,6 +365,10 @@ const Conversation = WebexPlugin.extend({
         },
       };
 
+      if (recipientId) {
+        addReactionPayload.recipients = {items: [{id: recipientId, objectType: 'person'}]};
+      }
+
       return this.sendReaction(conversation, addReactionPayload);
     });
   },
@@ -1053,6 +1064,10 @@ const Conversation = WebexPlugin.extend({
         };
       }
 
+      if (activity.recipients) {
+        act.recipients = activity.recipients;
+      }
+
       if (isString(act.actor)) {
         act.actor = {
           objectType: 'person',

package/src/share-activity.js

@@ -156,7 +156,7 @@ const ShareActivity = WebexPlugin.extend({
    */
   add(file, options) {
     options = options || {};
-    options.claimedFileType = file.displayName.substring(file.displayName.lastIndexOf('.'));
+    options.claimedFileType = file.name.substring(file.name.lastIndexOf('.'));
     let upload = this.uploads.get(file);
 
     if (upload) {

package/test/integration/spec/create.js

@@ -43,7 +43,6 @@ describe('plugin-conversation', function () {
         },
       });
 
-      // eslint-disable-next-line no-unused-expressions
       await webex.internal.mercury.connect();
       await mccoy.webex.internal.mercury.connect();
 
@@ -51,9 +50,9 @@ describe('plugin-conversation', function () {
     });
 
     after(async () => {
-      // eslint-disable-next-line no-unused-expressions
+      // eslint-disable-next-line chai-friendly/no-unused-expressions
       webex && (await webex.internal.mercury.disconnect());
-      // eslint-disable-next-line no-unused-expressions
+      // eslint-disable-next-line chai-friendly/no-unused-expressions
       mccoy && (await mccoy.webex.internal.mercury.disconnect());
     });
 

package/test/integration/spec/encryption.js

@@ -204,7 +204,6 @@ describe('plugin-conversation', () => {
                 )
                 .then((ci) => {
                   assert.property(c, 'defaultActivityEncryptionKeyUrl');
-                  /* eslint-disable no-unused-expressions */
                   expect(ci.activities.items[0].object.inputs).to.not.be.null;
                 });
             }));

package/test/integration/spec/get.js

@@ -467,7 +467,8 @@ describe('plugin-conversation', function () {
             }));
       });
 
-      describe('with conversation from remote clusters', () => {
+      // SPARK-413317
+      describe.skip('with conversation from remote clusters', () => {
         let conversation3, conversation4;
 
         before('create conversations in EU cluster', () =>
@@ -959,7 +960,7 @@ describe('plugin-conversation', function () {
           .then(({edit}) => {
             assert.include(edit, parent.id);
           }));
-
+      
       it('retrieves parent IDs for reactions', () =>
         webex.internal.conversation
           .addReaction(conversation, 'heart', parent)

package/test/unit/spec/conversation.js

@@ -35,6 +35,47 @@ describe('plugin-conversation', () => {
       webex.internal.services.getServiceFromClusterId = sinon.stub().returns({url: convoUrl});
     });
 
+    describe('addReaction()', () => {
+      it('should add recipients to the payload if provided', () => {
+        const {conversation} = webex.internal;
+        const recipientId = 'example-recipient-id';
+        const expected = {items: [{id: recipientId, objectType: 'person'}]}
+        conversation.sendReaction = sinon.stub().returns(Promise.resolve())
+        conversation.createReactionHmac = sinon.stub().returns(Promise.resolve('hmac'))
+        
+        return conversation.addReaction({}, 'example-display-name', {}, recipientId)
+          .then(() => {
+            assert.deepEqual(conversation.sendReaction.args[0][1].recipients, expected);
+          });
+      });
+    });
+
+    describe('deleteReaction()', () => {
+      it('should add recipients to the payload if provided', () => {
+        const {conversation} = webex.internal;
+        const recipientId = 'example-recipient-id';
+        const expected = {items: [{id: recipientId, objectType: 'person'}]}
+        conversation.sendReaction = sinon.stub().returns(Promise.resolve())
+        
+        return conversation.deleteReaction({}, 'example-reaction-id', recipientId)
+          .then(() => {
+            assert.deepEqual(conversation.sendReaction.args[0][1].recipients, expected);
+          });
+      });
+    });
+
+    describe('prepare()', () => {
+      it('should ammend activity recipients to the returned object', () => {
+        const {conversation} = webex.internal;
+        const activity = { recipients: 'example-recipients' };
+
+        return conversation.prepare(activity)
+          .then((results) => {
+            assert.deepEqual(results.recipients, activity.recipients);
+        });
+      });
+    });
+
     describe('processInmeetingchatEvent()', () => {
       beforeEach(() => {
         webex.transform = sinon.stub().callsFake((obj) => Promise.resolve(obj));