@como/como-client 0.7.80 → 0.7.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/como.js +14 -4
  2. package/lib/utils/comoExternalUrlTranslator.js +70 -53
  3. package/package.json +1 -1
  4. package/src/como.js +6 -1
package/lib/como.js CHANGED
@@ -174,7 +174,8 @@ var Como = function () {
174
174
  installationId: installationId,
175
175
  locationId: locationId,
176
176
  source: source,
177
- env_params: (0, _extends3.default)({}, INITIAL_COMO_DATA.env[environmentId])
177
+ env_params: (0, _extends3.default)({}, INITIAL_COMO_DATA.env[environmentId]),
178
+ tempTokenData: {}
178
179
  });
179
180
 
180
181
  updateCredentials = function updateCredentials(creds) {
@@ -379,7 +380,7 @@ var Como = function () {
379
380
  key: 'translateExternalUrl',
380
381
  value: function () {
381
382
  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(url, gpsData, assetID, accessibilityData) {
382
- var legacyUrl, externalUrl, _comoData2, api, locationId, token, env, membership, assets, locationData, apiObjects, dataToUse;
383
+ var legacyUrl, externalUrl, _comoData2, api, locationId, token, env, membership, assets, locationData, apiObjects, dataToUse, translatedData;
383
384
 
384
385
  return _regenerator2.default.wrap(function _callee3$(_context3) {
385
386
  while (1) {
@@ -401,9 +402,18 @@ var Como = function () {
401
402
  dataToUse = {
402
403
  locationId: locationId, token: token, membership: membership, locationData: locationData, assets: assets, gpsData: gpsData, assetID: assetID, accessibilityData: accessibilityData
403
404
  };
404
- return _context3.abrupt('return', comoExternalUrlTranslator.translateUrl(externalUrl, apiObjects, dataToUse));
405
+ _context3.next = 11;
406
+ return comoExternalUrlTranslator.translateUrl(externalUrl, apiObjects, dataToUse);
405
407
 
406
- case 10:
408
+ case 11:
409
+ translatedData = _context3.sent;
410
+
411
+ if (translatedData.tempTokenData.TemporaryToken) {
412
+ this.comoData.tempTokenData[translatedData.tempTokenData.TemporaryToken] = translatedData.tempTokenData.ExpirationDate;
413
+ }
414
+ return _context3.abrupt('return', translatedData);
415
+
416
+ case 14:
407
417
  case 'end':
408
418
  return _context3.stop();
409
419
  }
package/lib/utils/comoExternalUrlTranslator.js CHANGED
@@ -16,7 +16,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
16
16
 
17
17
  exports.translateUrl = function () {
18
18
  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(url, apiObjects, dataToUse) {
19
- var elementsToTranslate, toReturn;
19
+ var elementsToTranslate, tempTokenData, toReturn;
20
20
  return _regenerator2.default.wrap(function _callee$(_context) {
21
21
  while (1) {
22
22
  switch (_context.prev = _context.next) {
@@ -26,15 +26,26 @@ exports.translateUrl = function () {
26
26
  return translateElements(elementsToTranslate, apiObjects, dataToUse);
27
27
 
28
28
  case 3:
29
+ _context.t0 = _context.sent;
30
+
31
+ if (_context.t0) {
32
+ _context.next = 6;
33
+ break;
34
+ }
35
+
36
+ _context.t0 = {};
37
+
38
+ case 6:
39
+ tempTokenData = _context.t0;
29
40
  toReturn = url;
30
41
 
31
42
  elementsToTranslate.forEach(function (item) {
32
43
  var replaceWith = item.replaceWith && encodeURIComponent(item.replaceWith) || '';
33
44
  toReturn = toReturn.replace(item.toReplace, replaceWith);
34
45
  });
35
- return _context.abrupt('return', toReturn);
46
+ return _context.abrupt('return', { toReturn: toReturn, tempTokenData: tempTokenData });
36
47
 
37
- case 6:
48
+ case 10:
38
49
  case 'end':
39
50
  return _context.stop();
40
51
  }
@@ -85,13 +96,15 @@ var getElementsToTranslate = function getElementsToTranslate(url) {
85
96
  /* eslint-disable no-param-reassign */
86
97
  var translateElements = function () {
87
98
  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(elementsToTranslate, apiObjects, dataToUse) {
88
- var locationId, token, membership, locationData, assets, gpsData, assetID, accessibilityData, asset, i, item, api, servicesRoot, tempToken;
99
+ var tempTokenData, locationId, token, membership, locationData, assets, gpsData, assetID, accessibilityData, asset, i, item, api, servicesRoot, tempToken;
89
100
  return _regenerator2.default.wrap(function _callee2$(_context2) {
90
101
  while (1) {
91
102
  switch (_context2.prev = _context2.next) {
92
103
  case 0:
104
+ tempTokenData = {};
105
+
93
106
  if (!elementsToTranslate) {
94
- _context2.next = 54;
107
+ _context2.next = 57;
95
108
  break;
96
109
  }
97
110
 
@@ -101,54 +114,55 @@ var translateElements = function () {
101
114
  })[0];
102
115
  i = 0;
103
116
 
104
- case 4:
117
+ case 5:
105
118
  if (!(i < elementsToTranslate.length)) {
106
- _context2.next = 54;
119
+ _context2.next = 56;
107
120
  break;
108
121
  }
109
122
 
110
123
  item = elementsToTranslate[i];
111
124
  _context2.t0 = item.parentKey.toLowerCase();
112
- _context2.next = _context2.t0 === 'temporarytoken' ? 9 : _context2.t0 === 'local' ? 15 : _context2.t0 === 'useratlocation' ? 24 : _context2.t0 === 'locationdata' ? 26 : _context2.t0 === 'getlatlong' ? 28 : _context2.t0 === 'asset' ? 38 : _context2.t0 === 'accessibility' ? 40 : _context2.t0 === 'sessions' ? 42 : 50;
125
+ _context2.next = _context2.t0 === 'temporarytoken' ? 10 : _context2.t0 === 'local' ? 17 : _context2.t0 === 'useratlocation' ? 26 : _context2.t0 === 'locationdata' ? 28 : _context2.t0 === 'getlatlong' ? 30 : _context2.t0 === 'asset' ? 40 : _context2.t0 === 'accessibility' ? 42 : _context2.t0 === 'sessions' ? 44 : 52;
113
126
  break;
114
127
 
115
- case 9:
128
+ case 10:
116
129
  api = apiObjects.api, servicesRoot = apiObjects.servicesRoot;
117
- _context2.next = 12;
130
+ _context2.next = 13;
118
131
  return api.generateTemporaryToken(servicesRoot, locationId, token, item.childKey);
119
132
 
120
- case 12:
133
+ case 13:
121
134
  tempToken = _context2.sent;
122
135
 
123
136
  item.replaceWith = tempToken && tempToken.TemporaryToken || '';
124
- return _context2.abrupt('break', 51);
137
+ tempTokenData = tempToken;
138
+ return _context2.abrupt('break', 53);
125
139
 
126
- case 15:
140
+ case 17:
127
141
  _context2.t1 = item.childKey;
128
- _context2.next = _context2.t1 === 'signedin' ? 18 : _context2.t1 === 'locationid' ? 20 : 22;
142
+ _context2.next = _context2.t1 === 'signedin' ? 20 : _context2.t1 === 'locationid' ? 22 : 24;
129
143
  break;
130
144
 
131
- case 18:
145
+ case 20:
132
146
  item.replaceWith = !membership || membership.Error || membership.MembershipStatus !== 'registered' ? 'N' : 'Y';
133
- return _context2.abrupt('break', 23);
147
+ return _context2.abrupt('break', 25);
134
148
 
135
- case 20:
149
+ case 22:
136
150
  item.replaceWith = locationId;
137
- return _context2.abrupt('break', 23);
151
+ return _context2.abrupt('break', 25);
138
152
 
139
- case 22:
140
- return _context2.abrupt('break', 23);
153
+ case 24:
154
+ return _context2.abrupt('break', 25);
141
155
 
142
- case 23:
143
- return _context2.abrupt('break', 51);
156
+ case 25:
157
+ return _context2.abrupt('break', 53);
144
158
 
145
- case 24:
159
+ case 26:
146
160
  if (membership) {
147
161
  item.replaceWith = getValueFromObjectForUrl(membership, item.childKey);
148
162
  }
149
- return _context2.abrupt('break', 51);
163
+ return _context2.abrupt('break', 53);
150
164
 
151
- case 26:
165
+ case 28:
152
166
  if (item.childKey === 'tag') {
153
167
  (function () {
154
168
  var tagsString = '';
@@ -162,73 +176,76 @@ var translateElements = function () {
162
176
  } else {
163
177
  item.replaceWith = locationData && getValueFromObjectForUrl(locationData, item.childKey) || '';
164
178
  }
165
- return _context2.abrupt('break', 51);
179
+ return _context2.abrupt('break', 53);
166
180
 
167
- case 28:
181
+ case 30:
168
182
  if (!gpsData) {
169
- _context2.next = 37;
183
+ _context2.next = 39;
170
184
  break;
171
185
  }
172
186
 
173
187
  _context2.t2 = item.childKey;
174
- _context2.next = _context2.t2 === 'lat' ? 32 : _context2.t2 === 'long' ? 34 : 36;
188
+ _context2.next = _context2.t2 === 'lat' ? 34 : _context2.t2 === 'long' ? 36 : 38;
175
189
  break;
176
190
 
177
- case 32:
191
+ case 34:
178
192
  item.replaceWith = gpsData.latitude;
179
- return _context2.abrupt('break', 37);
193
+ return _context2.abrupt('break', 39);
180
194
 
181
- case 34:
195
+ case 36:
182
196
  item.replaceWith = gpsData.longitude;
183
- return _context2.abrupt('break', 37);
197
+ return _context2.abrupt('break', 39);
184
198
 
185
- case 36:
186
- return _context2.abrupt('break', 37);
199
+ case 38:
200
+ return _context2.abrupt('break', 39);
187
201
 
188
- case 37:
189
- return _context2.abrupt('break', 51);
202
+ case 39:
203
+ return _context2.abrupt('break', 53);
190
204
 
191
- case 38:
205
+ case 40:
192
206
  if (asset) {
193
207
  item.replaceWith = getValueFromObjectForUrl(asset, item.childKey);
194
208
  }
195
- return _context2.abrupt('break', 51);
209
+ return _context2.abrupt('break', 53);
196
210
 
197
- case 40:
211
+ case 42:
198
212
  if (accessibilityData) {
199
213
  item.replaceWith = getValueFromObjectForUrl(accessibilityData, item.childKey);
200
214
  }
201
- return _context2.abrupt('break', 51);
215
+ return _context2.abrupt('break', 53);
202
216
 
203
- case 42:
217
+ case 44:
204
218
  if (!token) {
205
- _context2.next = 49;
219
+ _context2.next = 51;
206
220
  break;
207
221
  }
208
222
 
209
223
  _context2.t3 = item.childKey;
210
- _context2.next = _context2.t3 === 'appsessiontoken' ? 46 : 48;
224
+ _context2.next = _context2.t3 === 'appsessiontoken' ? 48 : 50;
211
225
  break;
212
226
 
213
- case 46:
214
- item.replaceWith = token;
215
- return _context2.abrupt('break', 49);
216
-
217
227
  case 48:
218
- return _context2.abrupt('break', 49);
219
-
220
- case 49:
228
+ item.replaceWith = token;
221
229
  return _context2.abrupt('break', 51);
222
230
 
223
231
  case 50:
224
232
  return _context2.abrupt('break', 51);
225
233
 
226
234
  case 51:
235
+ return _context2.abrupt('break', 53);
236
+
237
+ case 52:
238
+ return _context2.abrupt('break', 53);
239
+
240
+ case 53:
227
241
  i += 1;
228
- _context2.next = 4;
242
+ _context2.next = 5;
229
243
  break;
230
244
 
231
- case 54:
245
+ case 56:
246
+ return _context2.abrupt('return', tempTokenData);
247
+
248
+ case 57:
232
249
  case 'end':
233
250
  return _context2.stop();
234
251
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@como/como-client",
3
- "version": "0.7.80",
3
+ "version": "0.7.82",
4
4
  "description": "Client module for Como's loaylty API",
5
5
  "main": "src/como.js",
6
6
  "scripts": {
package/src/como.js CHANGED
@@ -84,6 +84,7 @@ class Como {
84
84
  env_params: {
85
85
  ...INITIAL_COMO_DATA.env[environmentId],
86
86
  },
87
+ tempTokenData: {},
87
88
  };
88
89
 
89
90
  const updateCredentials = (creds, isNew = false) => {
@@ -200,7 +201,11 @@ class Como {
200
201
  const dataToUse = {
201
202
  locationId, token, membership, locationData, assets, gpsData, assetID, accessibilityData,
202
203
  };
203
- return comoExternalUrlTranslator.translateUrl(externalUrl, apiObjects, dataToUse);
204
+ const translatedData = await comoExternalUrlTranslator.translateUrl(externalUrl, apiObjects, dataToUse);
205
+ if (translatedData.tempTokenData.TemporaryToken) {
206
+ this.comoData.tempTokenData[translatedData.tempTokenData.TemporaryToken] = translatedData.tempTokenData.ExpirationDate;
207
+ }
208
+ return translatedData;
204
209
  }
205
210
 
206
211
  async getFeedbackFormData() {