@ciscospark/internal-plugin-avatar
Advanced tools
Comparing version 1.50.16 to 1.50.17
@@ -33,2 +33,3 @@ 'use strict'; | ||
var response = res.body[req.uuid] && res.body[req.uuid][size] || undefined; | ||
return _this.acceptItem({ | ||
@@ -46,2 +47,3 @@ response: response, | ||
var msg = reason.message || reason.body || reason; | ||
// avoid multiple => on same line | ||
@@ -68,4 +70,6 @@ // eslint-disable-next-line arrow-body-style | ||
} | ||
return _promise2.default.resolve(false); | ||
} | ||
return _promise2.default.resolve(true); | ||
@@ -97,2 +101,3 @@ }, | ||
var o = m.get(item.uuid); | ||
if (!o) { | ||
@@ -103,2 +108,3 @@ o = []; | ||
o.push(item.size); | ||
return m; | ||
@@ -108,2 +114,3 @@ }, new _map2.default()); | ||
var payload = []; | ||
map.forEach(function (value, key) { | ||
@@ -110,0 +117,0 @@ payload.push({ |
@@ -92,5 +92,7 @@ 'use strict'; | ||
var ret = urlByUuid.get(this).get(item.uuid + ' - ' + item.size); | ||
if (ret) { | ||
return _promise2.default.resolve(ret); | ||
} | ||
return _promise2.default.reject(new Error('No URL found by specified id: ' + (0, _stringify2.default)(item))); | ||
@@ -134,2 +136,3 @@ } | ||
urlByUuid.get(this).set(item.uuid + ' - ' + item.size, item); | ||
return _promise2.default.resolve(item); | ||
@@ -154,5 +157,7 @@ } | ||
var sizes = item.size && [item.size] || [40, 50, 80, 110, 135, 192, 640, 1600]; | ||
sizes.forEach(function (one) { | ||
return urlByUuid.get(_this).delete(item.uuid + ' - ' + one); | ||
}); | ||
return _promise2.default.resolve(true); | ||
@@ -159,0 +164,0 @@ } |
@@ -154,2 +154,3 @@ 'use strict'; | ||
} | ||
return item.url; | ||
@@ -206,6 +207,7 @@ }); | ||
_this4.store.remove({ uuid: _this4.spark.internal.device.userId }); | ||
return res.url; | ||
}); | ||
}, | ||
version: '1.50.16' | ||
version: '1.50.17' | ||
}, (_applyDecoratedDescriptor(_obj, '_fetchAllAvatarUrlSizes', [_dec], (0, _getOwnPropertyDescriptor2.default)(_obj, '_fetchAllAvatarUrlSizes'), _obj), _applyDecoratedDescriptor(_obj, '_fetchAvatarUrl', [_dec2], (0, _getOwnPropertyDescriptor2.default)(_obj, '_fetchAvatarUrl'), _obj)), _obj))); | ||
@@ -212,0 +214,0 @@ |
{ | ||
"name": "@ciscospark/internal-plugin-avatar", | ||
"version": "1.50.16", | ||
"version": "1.50.17", | ||
"description": "", | ||
@@ -21,10 +21,10 @@ "license": "MIT", | ||
"lodash": "^4.17.11", | ||
"@ciscospark/spark-core": "1.50.16", | ||
"@ciscospark/common": "1.50.16", | ||
"@ciscospark/common-timers": "1.50.16", | ||
"@ciscospark/helper-image": "1.50.16", | ||
"@ciscospark/internal-plugin-user": "1.50.16", | ||
"@ciscospark/internal-plugin-wdm": "1.50.16", | ||
"@ciscospark/spark-core": "1.50.17", | ||
"@ciscospark/common": "1.50.17", | ||
"@ciscospark/common-timers": "1.50.17", | ||
"@ciscospark/helper-image": "1.50.17", | ||
"@ciscospark/internal-plugin-user": "1.50.17", | ||
"@ciscospark/internal-plugin-wdm": "1.50.17", | ||
"envify": "^4.1.0" | ||
} | ||
} |
@@ -16,2 +16,3 @@ /*! | ||
const response = res.body[req.uuid] && res.body[req.uuid][size] || undefined; | ||
return this.acceptItem({ | ||
@@ -28,2 +29,3 @@ response, | ||
const msg = reason.message || reason.body || reason; | ||
// avoid multiple => on same line | ||
@@ -47,4 +49,6 @@ // eslint-disable-next-line arrow-body-style | ||
} | ||
return Promise.resolve(false); | ||
} | ||
return Promise.resolve(true); | ||
@@ -81,2 +85,3 @@ }, | ||
let o = m.get(item.uuid); | ||
if (!o) { | ||
@@ -87,2 +92,3 @@ o = []; | ||
o.push(item.size); | ||
return m; | ||
@@ -92,2 +98,3 @@ }, new Map()); | ||
const payload = []; | ||
map.forEach((value, key) => { | ||
@@ -94,0 +101,0 @@ payload.push({ |
@@ -51,5 +51,7 @@ /*! | ||
const ret = urlByUuid.get(this).get(`${item.uuid} - ${item.size}`); | ||
if (ret) { | ||
return Promise.resolve(ret); | ||
} | ||
return Promise.reject(new Error(`No URL found by specified id: ${JSON.stringify(item)}`)); | ||
@@ -90,2 +92,3 @@ } | ||
urlByUuid.get(this).set(`${item.uuid} - ${item.size}`, item); | ||
return Promise.resolve(item); | ||
@@ -105,5 +108,7 @@ } | ||
const sizes = item.size && [item.size] || [40, 50, 80, 110, 135, 192, 640, 1600]; | ||
sizes.forEach((one) => urlByUuid.get(this).delete(`${item.uuid} - ${one}`)); | ||
return Promise.resolve(true); | ||
} | ||
} |
@@ -86,2 +86,3 @@ /*! | ||
} | ||
return item.url; | ||
@@ -134,2 +135,3 @@ }); | ||
this.store.remove({uuid: this.spark.internal.device.userId}); | ||
return res.url; | ||
@@ -136,0 +138,0 @@ }); |
@@ -42,2 +42,3 @@ /*! | ||
}; | ||
// spark.requestPromise = Promise.resolve(mockRequest); | ||
@@ -52,2 +53,3 @@ return batcher.submitHttpRequest(mockRequest.body) | ||
let loggerWarned; | ||
beforeEach(() => { | ||
@@ -54,0 +56,0 @@ warn = batcher.logger.warn; |
@@ -95,2 +95,3 @@ /*! | ||
})); | ||
return avatar.retrieveAvatarUrl('88888888-4444-4444-4444-aaaaaaaaaaa0') | ||
@@ -316,2 +317,3 @@ .then((result) => assert.deepEqual(result, 'https://example.com/88888888-4444-4444-4444-aaaaaaaaaaa0~80')); | ||
const deferred = avatar.retrieveAvatarUrl('88888888-4444-4444-4444-aaaaaaaaaaa0', {hideDefaultAvatar: true}); | ||
return deferred | ||
@@ -378,2 +380,3 @@ .then((res) => assert.isNotOk(res)); | ||
const deferred = avatar.retrieveAvatarUrl('88888888-4444-4444-4444-aaaaaaaaaaa0', {hideDefaultAvatar: true}); | ||
return deferred | ||
@@ -1362,2 +1365,3 @@ .then((res) => assert.deepEqual(res, 'https://example.com/88888888-4444-4444-4444-aaaaaaaaaaa0~80')); | ||
})); | ||
return Promise.all([ | ||
@@ -1364,0 +1368,0 @@ avatar.retrieveAvatarUrl('88888888-4444-4444-4444-aaaaaaaaaaa0') |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
119863
+ Added@ciscospark/common@1.50.17(transitive)
+ Added@ciscospark/common-timers@1.50.17(transitive)
+ Added@ciscospark/helper-image@1.50.17(transitive)
+ Added@ciscospark/http-core@1.50.17(transitive)
+ Added@ciscospark/internal-plugin-user@1.50.17(transitive)
+ Added@ciscospark/internal-plugin-wdm@1.50.17(transitive)
+ Added@ciscospark/spark-core@1.50.17(transitive)
- Removed@ciscospark/common@1.50.16(transitive)
- Removed@ciscospark/common-timers@1.50.16(transitive)
- Removed@ciscospark/helper-image@1.50.16(transitive)
- Removed@ciscospark/http-core@1.50.16(transitive)
- Removed@ciscospark/internal-plugin-user@1.50.16(transitive)
- Removed@ciscospark/internal-plugin-wdm@1.50.16(transitive)
- Removed@ciscospark/spark-core@1.50.16(transitive)
Updated@ciscospark/common@1.50.17