@webex/internal-plugin-avatar 3.0.0-beta.2 → 3.0.0-beta.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/internal-plugin-avatar",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.21",
   "description": "",
   "license": "MIT",
   "author": "Joe Fuhrman <jofuhrma@cisco.com>",
@@ -21,20 +21,20 @@
     ]
   },
   "devDependencies": {
-    "@webex/test-helper-chai": "3.0.0-beta.2",
-    "@webex/test-helper-file": "3.0.0-beta.2",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.2",
-    "@webex/test-helper-test-users": "3.0.0-beta.2",
+    "@webex/test-helper-chai": "3.0.0-beta.21",
+    "@webex/test-helper-file": "3.0.0-beta.21",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.21",
+    "@webex/test-helper-test-users": "3.0.0-beta.21",
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.2",
-    "@webex/common-timers": "3.0.0-beta.2",
-    "@webex/helper-image": "3.0.0-beta.2",
-    "@webex/internal-plugin-avatar": "3.0.0-beta.2",
-    "@webex/internal-plugin-device": "3.0.0-beta.2",
-    "@webex/internal-plugin-user": "3.0.0-beta.2",
-    "@webex/webex-core": "3.0.0-beta.2",
+    "@webex/common": "3.0.0-beta.21",
+    "@webex/common-timers": "3.0.0-beta.21",
+    "@webex/helper-image": "3.0.0-beta.21",
+    "@webex/internal-plugin-avatar": "3.0.0-beta.21",
+    "@webex/internal-plugin-device": "3.0.0-beta.21",
+    "@webex/internal-plugin-user": "3.0.0-beta.21",
+    "@webex/webex-core": "3.0.0-beta.21",
     "lodash": "^4.17.21"
   }
 }

package/src/avatar-url-batcher.js

@@ -10,17 +10,21 @@ const AvatarUrlBatcher = Batcher.extend({
 
   handleHttpSuccess(res) {
     // eslint-disable-next-line arrow-body-style
-    return Promise.all(res.options.body.map((req) => {
-      return Promise.all(req.sizes.map((size) => {
-        const response = res.body[req.uuid] && res.body[req.uuid][size] || undefined;
-
-        return this.acceptItem({
-          response,
-          uuid: req.uuid,
-          size
-        });
-      }));
-    }));
+    return Promise.all(
+      res.options.body.map((req) => {
+        return Promise.all(
+          req.sizes.map((size) => {
+            const response = (res.body[req.uuid] && res.body[req.uuid][size]) || undefined;
+
+            return this.acceptItem({
+              response,
+              uuid: req.uuid,
+              size,
+            });
+          })
+        );
+      })
+    );
   },
 
   handleHttpError(reason) {
@@ -28,15 +32,21 @@ const AvatarUrlBatcher = Batcher.extend({
 
     // avoid multiple => on same line
     // eslint-disable-next-line arrow-body-style
-    return Promise.all(reason.options.body.map((item) => {
-      return Promise.all(item.sizes.map((size) => this.getDeferredForRequest({
-        uuid: item.uuid,
-        size
+    return Promise.all(
+      reason.options.body.map((item) => {
+        return Promise.all(
+          item.sizes.map((size) =>
+            this.getDeferredForRequest({
+              uuid: item.uuid,
+              size,
+            })
+              // I don't see a better way to do this than with an additional nesting
+              // eslint-disable-next-line max-nested-callbacks
+              .then((defer) => defer.reject(msg instanceof Error ? msg : new Error(msg)))
+          )
+        );
       })
-        // I don't see a better way to do this than with an additional nesting
-        // eslint-disable-next-line max-nested-callbacks
-        .then((defer) => defer.reject(msg instanceof Error ? msg : new Error(msg)))));
-    }));
+    );
   },
 
   didItemFail(item) {
@@ -52,20 +62,20 @@ const AvatarUrlBatcher = Batcher.extend({
   },
 
   handleItemFailure(item) {
-    return this.getDeferredForRequest(item)
-      .then((defer) => {
-        defer.reject(new Error(item.response || 'Failed to retrieve avatar'));
-      });
+    return this.getDeferredForRequest(item).then((defer) => {
+      defer.reject(new Error(item.response || 'Failed to retrieve avatar'));
+    });
   },
 
   handleItemSuccess(item) {
-    return this.getDeferredForResponse(item)
-      .then((defer) => defer.resolve({
+    return this.getDeferredForResponse(item).then((defer) =>
+      defer.resolve({
         hasDefaultAvatar: item.response.defaultAvatar,
         uuid: item.uuid,
         size: item.size,
-        url: item.response.url
-      }));
+        url: item.response.url,
+      })
+    );
   },
 
   fingerprintRequest(item) {
@@ -94,7 +104,7 @@ const AvatarUrlBatcher = Batcher.extend({
     map.forEach((value, key) => {
       payload.push({
         uuid: key,
-        sizes: uniq(value)
+        sizes: uniq(value),
       });
     });
 
@@ -106,10 +116,9 @@ const AvatarUrlBatcher = Batcher.extend({
       method: 'POST',
       api: 'avatar',
       resource: 'profiles/urls',
-      body: payload
+      body: payload,
     });
-  }
-
+  },
 });
 
 export default AvatarUrlBatcher;

package/src/avatar-url-store.js

@@ -102,7 +102,7 @@ export default class AvatarUrlStore {
    * @returns {Promise<true>}
    */
   remove(item) {
-    const sizes = item.size && [item.size] || [40, 50, 80, 110, 135, 192, 640, 1600];
+    const sizes = (item.size && [item.size]) || [40, 50, 80, 110, 135, 192, 640, 1600];
 
     sizes.forEach((one) => urlByUuid.get(this).delete(`${item.uuid} - ${one}`));
 

package/src/avatar.js

@@ -14,7 +14,7 @@ const Avatar = WebexPlugin.extend({
   namespace: 'Avatar',
 
   children: {
-    batcher: AvatarUrlBatcher
+    batcher: AvatarUrlBatcher,
   },
 
   session: {
@@ -22,19 +22,24 @@ const Avatar = WebexPlugin.extend({
       default() {
         return new AvatarUrlStore();
       },
-      type: 'any'
+      type: 'any',
     },
     enableThumbnails: {
       default: true,
-      type: 'boolean'
-    }
+      type: 'boolean',
+    },
   },
 
   @oneFlight({keyFactory: (uuid) => uuid})
   _fetchAllAvatarUrlSizes(uuid, options) {
     // fetch all possible sizes of avatar and store in cache
-    return Promise.all(this.config.sizes.map((size) => this.batcher.request({uuid, size})
-      .then((item) => this.store.add(defaults({cacheControl: options.cacheControl}, item)))));
+    return Promise.all(
+      this.config.sizes.map((size) =>
+        this.batcher
+          .request({uuid, size})
+          .then((item) => this.store.add(defaults({cacheControl: options.cacheControl}, item)))
+      )
+    );
   },
 
   /**
@@ -48,14 +53,17 @@ const Avatar = WebexPlugin.extend({
    */
   @oneFlight({keyFactory: (uuid, options) => uuid + String(options && options.size)})
   _fetchAvatarUrl(uuid, options) {
-    return this.store.get({uuid, size: options.size})
-      .catch(() => Promise.all([
+    return this.store.get({uuid, size: options.size}).catch(() =>
+      Promise.all([
         this._fetchAllAvatarUrlSizes(uuid, options),
         // just in case options.size does not fall into the predefined values above
-        this.batcher.request({uuid, size: options.size})
+        this.batcher.request({uuid, size: options.size}),
       ])
         // eslint-disable-next-line no-unused-vars
-        .then(([ignore, item]) => this.store.add(defaults({cacheControl: options.cacheControl}, item))));
+        .then(([ignore, item]) =>
+          this.store.add(defaults({cacheControl: options.cacheControl}, item))
+        )
+    );
   },
 
   /**
@@ -70,15 +78,16 @@ const Avatar = WebexPlugin.extend({
    */
   retrieveAvatarUrl(user, options) {
     if (!user) {
-      return Promise.reject(new Error('\'user\' is a required parameter'));
+      return Promise.reject(new Error("'user' is a required parameter"));
     }
 
     options = defaults(options, {
       cacheControl: this.config.cacheControl,
-      size: this.config.defaultAvatarSize
+      size: this.config.defaultAvatarSize,
     });
 
-    return this.webex.internal.user.asUUID(user)
+    return this.webex.internal.user
+      .asUUID(user)
       .then((uuid) => this._fetchAvatarUrl(uuid, options))
       .then((item) => {
         if (options.hideDefaultAvatar) {
@@ -97,41 +106,43 @@ const Avatar = WebexPlugin.extend({
    */
   setAvatar(file) {
     return detectFileType(file, this.logger)
-      .then((type) => processImage({
-        file,
-        type,
-        thumbnailMaxWidth: this.config.thumbnailMaxWidth,
-        thumbnailMaxHeight: this.config.thumbnailMaxHeight,
-        enableThumbnails: this.enableThumbnails,
-        logger: this.logger,
-        isAvatar: true
-      }))
-      .then((processedImage) => this.upload({
-        api: 'avatar',
-        resource: `profile/${this.webex.internal.device.userId}/session`,
-        file: processedImage[0],
-        phases: {
-          upload: {
-            $uri: (session) => session.url
+      .then((type) =>
+        processImage({
+          file,
+          type,
+          thumbnailMaxWidth: this.config.thumbnailMaxWidth,
+          thumbnailMaxHeight: this.config.thumbnailMaxHeight,
+          enableThumbnails: this.enableThumbnails,
+          logger: this.logger,
+          isAvatar: true,
+        })
+      )
+      .then((processedImage) =>
+        this.upload({
+          api: 'avatar',
+          resource: `profile/${this.webex.internal.device.userId}/session`,
+          file: processedImage[0],
+          phases: {
+            upload: {
+              $uri: (session) => session.url,
+            },
+            finalize: {
+              method: 'PUT',
+              api: 'avatar',
+              $resource: (session) =>
+                // eslint-disable-next-line max-len
+                `profile/${this.webex.internal.device.userId}/session/${session.id}`,
+            },
           },
-          finalize: {
-            method: 'PUT',
-            api: 'avatar',
-            $resource: (session) =>
-              // eslint-disable-next-line max-len
-              `profile/${this.webex.internal.device.userId}/session/${session.id}`
-          }
-        }
-      }))
+        })
+      )
       .then((res) => {
         // invalidate user's cached avatar
         this.store.remove({uuid: this.webex.internal.device.userId});
 
         return res.url;
       });
-  }
-
+  },
 });
 
-
 export default Avatar;

package/src/config.js

@@ -28,6 +28,6 @@ export default {
      * Max width for thumbnails generated when sharing an image
      * @type {number}
      */
-    thumbnailMaxWidth: 640
-  }
+    thumbnailMaxWidth: 640,
+  },
 };

package/src/index.js

@@ -11,7 +11,7 @@ import Avatar from './avatar';
 import config from './config';
 
 registerInternalPlugin('avatar', Avatar, {
-  config
+  config,
 });
 
 export {default} from './avatar';

package/test/integration/spec/avatar.js

@@ -13,34 +13,35 @@ import testUsers from '@webex/test-helper-test-users';
 describe('plugin-avatar', () => {
   let mccoy, webex, spock;
 
-  before('create users', () => testUsers.create({count: 2})
-    .then((users) => {
+  before('create users', () =>
+    testUsers.create({count: 2}).then((users) => {
       [spock, mccoy] = users;
 
       webex = new WebexCore({
         credentials: {
-          authorization: spock.token
-        }
+          authorization: spock.token,
+        },
       });
 
       mccoy.webex = new WebexCore({
         credentials: {
-          authorization: mccoy.token
-        }
+          authorization: mccoy.token,
+        },
       });
-    }));
+    })
+  );
 
-  before('register with wdm', () => Promise.all([
-    webex.internal.device.register(),
-    mccoy.webex.internal.device.register()
-  ]));
+  before('register with wdm', () =>
+    Promise.all([webex.internal.device.register(), mccoy.webex.internal.device.register()])
+  );
 
   let sampleImageSmallOnePng = 'sample-image-small-one.png';
 
-  before(() => fh.fetch(sampleImageSmallOnePng)
-    .then((file) => {
+  before(() =>
+    fh.fetch(sampleImageSmallOnePng).then((file) => {
       sampleImageSmallOnePng = file;
-    }));
+    })
+  );
 
   // describe('#setAvatar()', () => {
   //   it('sets a user\'s avatar', () => webex.internal.avatar.setAvatar(sampleImageSmallOnePng)

package/test/unit/spec/avatar-url-batcher.js

@@ -14,17 +14,21 @@ describe('plugin-avatar', () => {
     beforeEach(() => {
       webex = new MockWebex({
         children: {
-          avatar: Avatar
-        }
+          avatar: Avatar,
+        },
       });
       batcher = webex.internal.avatar.batcher;
     });
 
     describe('#fingerprints', () => {
-      it('fingerprintRequest returns \'uuid-size\'', () => batcher.fingerprintRequest({uuid: 'uuid1', size: 80})
-        .then((result) => assert.deepEqual(result, 'uuid1-80')));
-      it('fingerprintResponse returns \'uuid-size\'', () => batcher.fingerprintRequest({uuid: 'uuid1', size: 80})
-        .then((result) => assert.deepEqual(result, 'uuid1-80')));
+      it("fingerprintRequest returns 'uuid-size'", () =>
+        batcher
+          .fingerprintRequest({uuid: 'uuid1', size: 80})
+          .then((result) => assert.deepEqual(result, 'uuid1-80')));
+      it("fingerprintResponse returns 'uuid-size'", () =>
+        batcher
+          .fingerprintRequest({uuid: 'uuid1', size: 80})
+          .then((result) => assert.deepEqual(result, 'uuid1-80')));
     });
 
     describe('#submitHttpRequest()', () => {
@@ -32,7 +36,7 @@ describe('plugin-avatar', () => {
         method: 'POST',
         api: 'avatar',
         resource: 'profiles/urls',
-        body: 'foo'
+        body: 'foo',
       };
 
       it('calls webex.request with expected params', () => {
@@ -41,7 +45,8 @@ describe('plugin-avatar', () => {
         };
 
         // webex.requestPromise = Promise.resolve(mockRequest);
-        return batcher.submitHttpRequest(mockRequest.body)
+        return batcher
+          .submitHttpRequest(mockRequest.body)
           .then((req) => assert.deepEqual(req, mockRequest));
       });
     });
@@ -54,7 +59,7 @@ describe('plugin-avatar', () => {
         warn = batcher.logger.warn;
         loggerWarned = false;
         batcher.logger.warn = (msg) => {
-          loggerWarned = (msg === 'Avatar: substituted size "256" for "80"');
+          loggerWarned = msg === 'Avatar: substituted size "256" for "80"';
         };
       });
 
@@ -62,14 +67,18 @@ describe('plugin-avatar', () => {
         batcher.logger.warn = warn;
       });
 
-      it('returns true if no response in item', () => batcher.didItemFail({})
-        .then((res) => assert.isTrue(res)));
+      it('returns true if no response in item', () =>
+        batcher.didItemFail({}).then((res) => assert.isTrue(res)));
 
-      it('returns false, warns reqested size does not equal response size', () => batcher.didItemFail({size: 80, response: {size: 256}})
-        .then((res) => assert.isFalse(res && loggerWarned)));
+      it('returns false, warns reqested size does not equal response size', () =>
+        batcher
+          .didItemFail({size: 80, response: {size: 256}})
+          .then((res) => assert.isFalse(res && loggerWarned)));
 
-      it('returns false no warning', () => batcher.didItemFail({size: 80, response: {size: 80}})
-        .then((res) => assert.isFalse(res && !loggerWarned)));
+      it('returns false no warning', () =>
+        batcher
+          .didItemFail({size: 80, response: {size: 80}})
+          .then((res) => assert.isFalse(res && !loggerWarned)));
     });
   });
 });