@webex/internal-plugin-team 3.0.0-beta.8 → 3.0.0-beta.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/internal-plugin-team",
-  "version": "3.0.0-beta.8",
+  "version": "3.0.0-beta.80",
   "description": "",
   "license": "MIT",
   "author": "Josh Dykstra <jodykstr@cisco.com>",
@@ -21,19 +21,19 @@
     ]
   },
   "devDependencies": {
-    "@webex/test-helper-chai": "3.0.0-beta.8",
-    "@webex/test-helper-mocha": "3.0.0-beta.8",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.8",
-    "@webex/test-helper-test-users": "3.0.0-beta.8",
+    "@webex/test-helper-chai": "3.0.0-beta.80",
+    "@webex/test-helper-mocha": "3.0.0-beta.80",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.80",
+    "@webex/test-helper-test-users": "3.0.0-beta.80",
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/internal-plugin-conversation": "3.0.0-beta.8",
-    "@webex/internal-plugin-device": "3.0.0-beta.8",
-    "@webex/internal-plugin-encryption": "3.0.0-beta.8",
-    "@webex/internal-plugin-team": "3.0.0-beta.8",
-    "@webex/internal-plugin-user": "3.0.0-beta.8",
-    "@webex/webex-core": "3.0.0-beta.8",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.80",
+    "@webex/internal-plugin-device": "3.0.0-beta.80",
+    "@webex/internal-plugin-encryption": "3.0.0-beta.80",
+    "@webex/internal-plugin-team": "3.0.0-beta.80",
+    "@webex/internal-plugin-user": "3.0.0-beta.80",
+    "@webex/webex-core": "3.0.0-beta.80",
     "lodash": "^4.17.21",
     "uuid": "^3.3.2"
   }

package/src/config.js

@@ -3,5 +3,5 @@
  */
 
 export default {
-  team: {}
+  team: {},
 };

package/src/index.js

@@ -18,12 +18,15 @@ registerInternalPlugin('team', Team, {
         name: 'decryptTeamRoomStatus',
         direction: 'inbound',
         test(ctx, optionsOrResponse) {
-          return Promise.resolve(has(optionsOrResponse, 'activity.object.activityEvent') && get(optionsOrResponse, 'activity.object.objectType') === 'teamRoomStatus');
+          return Promise.resolve(
+            has(optionsOrResponse, 'activity.object.activityEvent') &&
+              get(optionsOrResponse, 'activity.object.objectType') === 'teamRoomStatus'
+          );
         },
         extract(optionsOrResponse) {
           return Promise.resolve(optionsOrResponse.activity.object);
-        }
-      }
+        },
+      },
     ],
     transforms: [
       {
@@ -33,7 +36,11 @@ registerInternalPlugin('team', Team, {
           const promises = [];
 
           if (team.conversations.items) {
-            promises.push(Promise.all(team.conversations.items.map((item) => ctx.transform('decryptObject', null, item))));
+            promises.push(
+              Promise.all(
+                team.conversations.items.map((item) => ctx.transform('decryptObject', null, item))
+              )
+            );
           }
 
           const usableKey = team.encryptionKeyUrl || key;
@@ -44,7 +51,7 @@ registerInternalPlugin('team', Team, {
           }
 
           return Promise.all(promises);
-        }
+        },
       },
       {
         name: 'decryptTeamRoomStatus',
@@ -53,14 +60,14 @@ registerInternalPlugin('team', Team, {
           const keyUrl = get(teamRoomStatus, 'activityEvent.encryptionKeyUrl');
 
           return ctx.transform('decryptObject', keyUrl, teamRoomStatus.activityEvent);
-        }
+        },
       },
       {
         name: 'decryptPropSummary',
         direction: 'inbound',
         fn(ctx, key, team) {
           return ctx.transform('decryptTextProp', 'summary', key, team);
-        }
+        },
       },
       {
         name: 'encryptTeam',
@@ -70,36 +77,41 @@ registerInternalPlugin('team', Team, {
             return Promise.resolve();
           }
 
-          return Promise.resolve(key || ctx.webex.internal.encryption.kms.createUnboundKeys({count: 1}))
-            .then((keys) => {
-              const k = isArray(keys) ? keys[0] : keys;
+          return Promise.resolve(
+            key || ctx.webex.internal.encryption.kms.createUnboundKeys({count: 1})
+          ).then((keys) => {
+            const k = isArray(keys) ? keys[0] : keys;
 
-              if (team.kmsMessage && team.kmsMessage.keyUris && !team.kmsMessage.keyUris.includes(k.uri)) {
-                team.kmsMessage.keyUris.push(k.uri);
-              }
+            if (
+              team.kmsMessage &&
+              team.kmsMessage.keyUris &&
+              !team.kmsMessage.keyUris.includes(k.uri)
+            ) {
+              team.kmsMessage.keyUris.push(k.uri);
+            }
 
-              return Promise.all([
-                ctx.transform('encryptPropDisplayName', k, team),
-                ctx.transform('encryptPropSummary', k, team)
-              ])
-                .then(() => {
-                  team.encryptionKeyUrl = k.uri || k;
+            return Promise.all([
+              ctx.transform('encryptPropDisplayName', k, team),
+              ctx.transform('encryptPropSummary', k, team),
+            ]).then(() => {
+              team.encryptionKeyUrl = k.uri || k;
 
-                  // we only want to set the defaultActivityEncryptionKeyUrl if we've
-                  // bound a new key
-                  if (!key) {
-                    team.defaultActivityEncryptionKeyUrl = team.defaultActivityEncryptionKeyUrl || k.uri || k;
-                  }
-                });
+              // we only want to set the defaultActivityEncryptionKeyUrl if we've
+              // bound a new key
+              if (!key) {
+                team.defaultActivityEncryptionKeyUrl =
+                  team.defaultActivityEncryptionKeyUrl || k.uri || k;
+              }
             });
-        }
+          });
+        },
       },
       {
         name: 'encryptPropSummary',
         direction: 'outbound',
         fn(ctx, key, team) {
           return ctx.transform('encryptTextProp', 'summary', key, team);
-        }
+        },
       },
       {
         name: 'normalizeTeam',
@@ -110,14 +122,18 @@ registerInternalPlugin('team', Team, {
           team.teamMembers.items = team.teamMembers.items || [];
 
           return Promise.all([
-            Promise.all(team.conversations.items.map((item) => ctx.transform('normalizeObject', item))),
-            Promise.all(team.teamMembers.items.map((item) => ctx.transform('normalizeObject', item)))
+            Promise.all(
+              team.conversations.items.map((item) => ctx.transform('normalizeObject', item))
+            ),
+            Promise.all(
+              team.teamMembers.items.map((item) => ctx.transform('normalizeObject', item))
+            ),
           ]);
-        }
-      }
-    ]
+        },
+      },
+    ],
   },
-  config
+  config,
 });
 
 export {default} from './team';

package/src/team.js

@@ -4,6 +4,7 @@
 
 import querystring from 'querystring';
 
+import uuid from 'uuid';
 import {find, pick, uniq} from 'lodash';
 import {WebexPlugin} from '@webex/webex-core';
 
@@ -21,20 +22,22 @@ const Team = WebexPlugin.extend({
    */
   addConversation(team, conversation, activity) {
     return this._ensureGeneralConversation(team)
-      .then((generalConversation) => this.webex.internal.conversation.prepare(activity, {
-        verb: 'add',
-        target: this.webex.internal.conversation.prepareConversation(generalConversation),
-        object: {
-          id: conversation.id,
-          objectType: 'conversation'
-        },
-        kmsMessage: {
-          method: 'create',
-          uri: '/authorizations',
-          resourceUri: conversation.kmsResourceObjectUrl,
-          userIds: [generalConversation.kmsResourceObjectUrl]
-        }
-      }))
+      .then((generalConversation) =>
+        this.webex.internal.conversation.prepare(activity, {
+          verb: 'add',
+          target: this.webex.internal.conversation.prepareConversation(generalConversation),
+          object: {
+            id: conversation.id,
+            objectType: 'conversation',
+          },
+          kmsMessage: {
+            method: 'create',
+            uri: '/authorizations',
+            resourceUri: conversation.kmsResourceObjectUrl,
+            userIds: [generalConversation.kmsResourceObjectUrl],
+          },
+        })
+      )
       .then((a) => this.webex.internal.conversation.submit(a));
   },
 
@@ -48,8 +51,9 @@ const Team = WebexPlugin.extend({
    * @returns {Promise} Resolves with activity that was posted
    */
   addMember(team, participant, activity) {
-    return this._ensureGeneralConversation(team)
-      .then((generalConversation) => this.webex.internal.conversation.add(generalConversation, participant, activity));
+    return this._ensureGeneralConversation(team).then((generalConversation) =>
+      this.webex.internal.conversation.add(generalConversation, participant, activity)
+    );
   },
 
   /**
@@ -69,18 +73,24 @@ const Team = WebexPlugin.extend({
       return Promise.reject(new Error('`params.participants` is required'));
     }
 
-    return Promise.all(params.participants.map((participant) => this.webex.internal.user.asUUID(participant, {create: true})))
+    return Promise.all(
+      params.participants.map((participant) =>
+        this.webex.internal.user.asUUID(participant, {create: true})
+      )
+    )
       .then((participants) => {
         participants.unshift(this.webex.internal.device.userId);
         params.participants = uniq(participants);
       })
       .then(() => this._prepareTeam(params))
-      .then((payload) => this.webex.request({
-        method: 'POST',
-        service: 'conversation',
-        resource: 'teams',
-        body: payload
-      }))
+      .then((payload) =>
+        this.webex.request({
+          method: 'POST',
+          service: 'conversation',
+          resource: 'teams',
+          body: payload,
+        })
+      )
       .then((res) => res.body);
   },
 
@@ -106,18 +116,26 @@ const Team = WebexPlugin.extend({
     }
 
     return this._ensureGeneralConversation(team)
-      .then((generalConversation) => Promise.all(params.participants.map((participant) => this.webex.internal.user.asUUID(participant, {create: true})))
-        .then((participants) => {
-          participants.unshift(this.webex.internal.device.userId);
-          params.participants = uniq(participants);
+      .then((generalConversation) =>
+        Promise.all(
+          params.participants.map((participant) =>
+            this.webex.internal.user.asUUID(participant, {create: true})
+          )
+        )
+          .then((participants) => {
+            participants.unshift(this.webex.internal.device.userId);
+            params.participants = uniq(participants);
+          })
+          .then(() => this._prepareTeamConversation(generalConversation, params))
+      )
+      .then((payload) =>
+        this.webex.request({
+          method: 'POST',
+          uri: `${team.url}/conversations`,
+          qs: pick(options, 'includeAllTeamMembers'),
+          body: payload,
         })
-        .then(() => this._prepareTeamConversation(generalConversation, params)))
-      .then((payload) => this.webex.request({
-        method: 'POST',
-        uri: `${team.url}/conversations`,
-        qs: pick(options, 'includeAllTeamMembers'),
-        body: payload
-      }))
+      )
       .then((res) => res.body);
   },
 
@@ -134,17 +152,18 @@ const Team = WebexPlugin.extend({
     if (!url) {
       return Promise.reject(new Error('`team.url` is required'));
     }
-    const params = Object.assign({
+    const params = {
       includeTeamConversations: false,
-      includeTeamMembers: false
-    }, options);
-
-    return this.webex.request({
-      uri: url,
-      qs: params
-    })
-      .then((res) => this._recordUUIDs(res.body)
-        .then(() => res.body));
+      includeTeamMembers: false,
+      ...options,
+    };
+
+    return this.webex
+      .request({
+        uri: url,
+        qs: params,
+      })
+      .then((res) => this._recordUUIDs(res.body).then(() => res.body));
   },
 
   /**
@@ -158,9 +177,10 @@ const Team = WebexPlugin.extend({
       return Promise.reject(new Error('`team.url` is required'));
     }
 
-    return this.webex.request({
-      uri: `${url}/conversations`
-    })
+    return this.webex
+      .request({
+        uri: `${url}/conversations`,
+      })
       .then((res) => res.body.items);
   },
 
@@ -168,13 +188,37 @@ const Team = WebexPlugin.extend({
    * Join a team conversation
    * @param {TeamObject} team
    * @param {ConversationObject} conversation
+   * @param {userId} userId
    * @returns {Promise} Resolves with the conversation
    */
-  joinConversation(team, conversation) {
-    return this.webex.request({
-      method: 'POST',
-      uri: `${team.url}/conversations/${conversation.id}/participants`
-    })
+  joinConversation(team, conversation, userId) {
+    if (!userId) {
+      return Promise.reject(new Error('`userId` is required'));
+    }
+
+    const body = {
+      kmsMessage: {
+        client: {
+          clientId: this.webex.internal.device.url,
+          credential: {
+            bearer: this.webex.credentials.supertoken.access_token,
+            userId,
+          },
+        },
+        method: 'create',
+        requestId: uuid.v4(),
+        resourceUri: conversation.kmsResourceObjectUrl,
+        uri: '/authorizations',
+        userIds: [userId],
+      },
+    };
+
+    return this.webex
+      .request({
+        method: 'POST',
+        uri: `${team.url}/conversations/${conversation.id}/participants`,
+        body,
+      })
       .then((res) => res.body);
   },
 
@@ -186,16 +230,17 @@ const Team = WebexPlugin.extend({
    * @returns {Promise} Resolves with the requested teams
    */
   async list(options = {}) {
-    const params = Object.assign({
+    const params = {
       includeTeamConversations: false,
-      includeTeamMembers: false
-    }, options);
+      includeTeamMembers: false,
+      ...options,
+    };
     const resource = 'teams';
 
     const res = await this.webex.request({
       api: 'conversation',
       resource,
-      qs: params
+      qs: params,
     });
 
     let list = res.body.items.slice(0);
@@ -207,7 +252,7 @@ const Team = WebexPlugin.extend({
 
           return this.webex.request({
             uri,
-            qs: params
+            qs: params,
           });
         })
       );
@@ -234,8 +279,9 @@ const Team = WebexPlugin.extend({
    * @returns {Promise} Resolves with activity that was posted
    */
   removeMember(team, participant, activity) {
-    return this._ensureGeneralConversation(team)
-      .then((generalConversation) => this.webex.internal.conversation.leave(generalConversation, participant, activity));
+    return this._ensureGeneralConversation(team).then((generalConversation) =>
+      this.webex.internal.conversation.leave(generalConversation, participant, activity)
+    );
   },
 
   /**
@@ -256,8 +302,8 @@ const Team = WebexPlugin.extend({
           target: pick(generalConversation, 'id', 'url', 'objectType'),
           kmsMessage: {
             method: 'delete',
-            uri: `<KRO>/authorizations?${querystring.stringify({authId: conversation.id})}`
-          }
+            uri: `<KRO>/authorizations?${querystring.stringify({authId: conversation.id})}`,
+          },
         };
 
         return this.webex.internal.conversation.prepare(activity, properties);
@@ -285,7 +331,9 @@ const Team = WebexPlugin.extend({
     }
 
     if (team.conversations.items.length) {
-      const generalConversation = find(team.conversations.items, {id: team.generalConversationUuid});
+      const generalConversation = find(team.conversations.items, {
+        id: team.generalConversationUuid,
+      });
 
       if (generalConversation) {
         return Promise.resolve(generalConversation);
@@ -326,19 +374,21 @@ const Team = WebexPlugin.extend({
       return Promise.resolve(team);
     }
 
-    return Promise.all(team.teamMembers.items.map((participant) => {
-      // ROOMs or LYRA_SPACEs do not have email addresses, so there's no point attempting to
-      // record their UUIDs.
-      if (participant.type === 'ROOM' || participant.type === 'LYRA_SPACE') {
-        return Promise.resolve();
-      }
+    return Promise.all(
+      team.teamMembers.items.map((participant) => {
+        // ROOMs or LYRA_SPACEs do not have email addresses, so there's no point attempting to
+        // record their UUIDs.
+        if (participant.type === 'ROOM' || participant.type === 'LYRA_SPACE') {
+          return Promise.resolve();
+        }
 
-      return this.webex.internal.user.recordUUID(participant)
-        .catch((err) => this.logger.warn('Could not record uuid', err));
-    }));
-  }
+        return this.webex.internal.user
+          .recordUUID(participant)
+          .catch((err) => this.logger.warn('Could not record uuid', err));
+      })
+    );
+  },
   /* eslint-enable require-jsdoc */
-
 });
 
 /**
@@ -348,13 +398,11 @@ const Team = WebexPlugin.extend({
  * @param {Object} activity
  * @returns {Promise} Resolves with activity that was posted
  */
-[
-  'assignModerator',
-  'unassignModerator'
-].forEach((verb) => {
+['assignModerator', 'unassignModerator'].forEach((verb) => {
   Team.prototype[verb] = function submitModerationChangeActivity(team, member, activity) {
-    return this._ensureGeneralConversation(team)
-      .then((teamConversation) => this.webex.internal.conversation[verb](teamConversation, member, activity));
+    return this._ensureGeneralConversation(team).then((teamConversation) =>
+      this.webex.internal.conversation[verb](teamConversation, member, activity)
+    );
   };
 });
 
@@ -366,10 +414,7 @@ const Team = WebexPlugin.extend({
  * provisional activity
  * @returns {Promise} Resolves with the posted activity
  */
-[
-  'archive',
-  'unarchive'
-].forEach((verb) => {
+['archive', 'unarchive'].forEach((verb) => {
   Team.prototype[verb] = function submitArchiveStateChangeActivity(target, activity) {
     if (!target.objectType) {
       return Promise.reject(new Error('`target.objectType` is required'));
@@ -378,7 +423,7 @@ const Team = WebexPlugin.extend({
     const properties = {
       verb,
       object: pick(target, 'id', 'url', 'objectType'),
-      target: pick(target, 'id', 'url', 'objectType')
+      target: pick(target, 'id', 'url', 'objectType'),
     };
 
     const teamUrl = this.webex.internal.conversation.getConvoUrl(target);