@como/como-client 0.7.5 → 0.7.54

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 +54 -22
  2. package/lib/services/index.js +9 -6
  3. package/package.json +1 -1
  4. package/src/como.js +24 -15
package/lib/como.js CHANGED
@@ -82,7 +82,7 @@ var Como = function () {
82
82
  break;
83
83
 
84
84
  case 5:
85
- if (!(expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment()))) {
85
+ if (!(expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment()))) {
86
86
  _context.next = 8;
87
87
  break;
88
88
  }
@@ -148,7 +148,7 @@ var Como = function () {
148
148
 
149
149
  var enableSignon = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
150
150
 
151
- var isExists, environmentId, locationId, installationId, source, updateCredentials, getCredentials, gateway, _APIService$getServic, service, refresher, initService, accessToken, refreshToken, expiresIn, credExist, isExpired, refreshFailed, data, interval, _data, _data2;
151
+ var isExists, environmentId, locationId, installationId, source, updateCredentials, getCredentials, gateway, _APIService$getServic, service, refresher, initService, accessToken, refreshToken, expiresIn, credExist, isExpired, refreshFailed, data, interval, _data, signOnSuccessfully, _data2;
152
152
 
153
153
  return _regenerator2.default.wrap(function _callee2$(_context2) {
154
154
  while (1) {
@@ -218,9 +218,9 @@ var Como = function () {
218
218
  _context2.prev = 24;
219
219
  _context2.t0 = _context2['catch'](17);
220
220
 
221
- console.log('Failed to refresh token, installationId:' + installationId + ', refreshToken:' + this.comoData.refreshToken + ', locationId:' + locationId + ', source:' + source);
221
+ console.error('Failed to refresh token, installationId:' + installationId + ', refreshToken:' + this.comoData.refreshToken + ', locationId:' + locationId + ', source:' + source);
222
222
  //refresh failed - need to revoke and signOn again
223
- initService.logError({ method: 'refreshToken', installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken });
223
+ initService.logError({ method: 'refreshToken', installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, error: _context2.t0.message });
224
224
  refreshFailed = true;
225
225
 
226
226
  case 29:
@@ -253,9 +253,9 @@ var Como = function () {
253
253
  _context2.prev = 40;
254
254
  _context2.t1 = _context2['catch'](32);
255
255
 
256
- console.log('Failed to signOn, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',interval:' + interval + ', error:' + _context2.t1);
256
+ console.error('Failed to signOn, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',interval:' + interval + ', error:' + _context2.t1);
257
257
  interval += 1000;
258
- initService.logError({ method: 'signOn', installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval });
258
+ initService.logError({ method: 'signOn no accessToken', accessToken: accessToken, isExpired: isExpired, refreshFailed: refreshFailed, credExist: credExist, installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval, error: _context2.t1.message });
259
259
  _context2.next = 47;
260
260
  return new _promise2.default(function (r) {
261
261
  return setTimeout(r, interval);
@@ -266,17 +266,30 @@ var Como = function () {
266
266
  break;
267
267
 
268
268
  case 49:
269
- _context2.next = 63;
269
+ _context2.next = 73;
270
270
  break;
271
271
 
272
272
  case 51:
273
- _context2.prev = 51;
273
+ if (isExpired) {
274
+ _context2.next = 73;
275
+ break;
276
+ }
277
+
278
+ signOnSuccessfully = false;
279
+
280
+ case 53:
281
+ if (!(!signOnSuccessfully && interval < 3000)) {
282
+ _context2.next = 73;
283
+ break;
284
+ }
285
+
286
+ _context2.prev = 54;
274
287
 
275
288
  console.log('signOn with installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',accessToken:' + accessToken);
276
- _context2.next = 55;
289
+ _context2.next = 58;
277
290
  return this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
278
291
 
279
- case 55:
292
+ case 58:
280
293
  _data2 = _context2.sent;
281
294
 
282
295
  console.log('signOn with result " ' + (0, _stringify2.default)(_data2));
@@ -284,27 +297,38 @@ var Como = function () {
284
297
  console.log('signOn- updating credentials');
285
298
  updateCredentials(_data2, true);
286
299
  }
287
- _context2.next = 63;
300
+ signOnSuccessfully = true;
301
+ _context2.next = 71;
288
302
  break;
289
303
 
290
- case 60:
291
- _context2.prev = 60;
292
- _context2.t2 = _context2['catch'](51);
304
+ case 64:
305
+ _context2.prev = 64;
306
+ _context2.t2 = _context2['catch'](54);
293
307
 
294
- console.log('Failed signOn with accessToken, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',accessToken:' + accessToken + ', error:' + _context2.t2);
308
+ console.error('Failed signOn with accessToken, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',accessToken:' + accessToken + ', error:' + _context2.t2.message);
309
+ interval += 1000;
310
+ initService.logError({ method: 'signOn with credentials', accessToken: accessToken, isExpired: isExpired, refreshFailed: refreshFailed, credExist: credExist, installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval, error: _context2.t2.message });
311
+ _context2.next = 71;
312
+ return new _promise2.default(function (r) {
313
+ return setTimeout(r, interval);
314
+ });
295
315
 
296
- case 63:
316
+ case 71:
317
+ _context2.next = 53;
318
+ break;
319
+
320
+ case 73:
297
321
  if (!this.comoData.token) {
298
322
  this.comoData.token = this.comoData.accessToken;
299
323
  }
300
324
  return _context2.abrupt('return', this.getCredentials());
301
325
 
302
- case 65:
326
+ case 75:
303
327
  case 'end':
304
328
  return _context2.stop();
305
329
  }
306
330
  }
307
- }, _callee2, this, [[17, 24], [32, 40], [51, 60]]);
331
+ }, _callee2, this, [[17, 24], [32, 40], [54, 64]]);
308
332
  }));
309
333
 
310
334
  function init(_x, _x2, _x3) {
@@ -1056,13 +1080,17 @@ var Como = function () {
1056
1080
  case 0:
1057
1081
  _comoData9 = this.comoData, env = _comoData9.env_params, locationId = _comoData9.locationId, api = _comoData9.api;
1058
1082
  _context17.next = 3;
1059
- return api.getShortUserId(env.zapp_root, locationId);
1083
+ return this.refreshTokenIfNeeded();
1060
1084
 
1061
1085
  case 3:
1086
+ _context17.next = 5;
1087
+ return api.getShortUserId(env.zapp_root, locationId);
1088
+
1089
+ case 5:
1062
1090
  responseJson = _context17.sent;
1063
1091
  return _context17.abrupt('return', responseJson.ID);
1064
1092
 
1065
- case 5:
1093
+ case 7:
1066
1094
  case 'end':
1067
1095
  return _context17.stop();
1068
1096
  }
@@ -1184,13 +1212,17 @@ var Como = function () {
1184
1212
  case 0:
1185
1213
  _comoData11 = this.comoData, env = _comoData11.env_params, locationId = _comoData11.locationId, api = _comoData11.api;
1186
1214
  _context20.next = 3;
1187
- return api.redeemAsset(env.zapp_root, locationId, assetKey);
1215
+ return this.refreshTokenIfNeeded();
1188
1216
 
1189
1217
  case 3:
1218
+ _context20.next = 5;
1219
+ return api.redeemAsset(env.zapp_root, locationId, assetKey);
1220
+
1221
+ case 5:
1190
1222
  responseJson = _context20.sent;
1191
1223
  return _context20.abrupt('return', responseJson);
1192
1224
 
1193
- case 5:
1225
+ case 7:
1194
1226
  case 'end':
1195
1227
  return _context20.stop();
1196
1228
  }
package/lib/services/index.js CHANGED
@@ -16,12 +16,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
16
16
 
17
17
  var axios = require('axios');
18
18
 
19
- var _require = require('../interceptors/refresh'),
20
- tokenInterceptor = _require.tokenInterceptor,
21
- refreshInterceptor = _require.refreshInterceptor;
19
+ var _require = require('../../package.json'),
20
+ version = _require.version;
22
21
 
23
- var _require2 = require('../interceptors/response'),
24
- responseInterceptor = _require2.responseInterceptor;
22
+ var _require2 = require('../interceptors/refresh'),
23
+ tokenInterceptor = _require2.tokenInterceptor,
24
+ refreshInterceptor = _require2.refreshInterceptor;
25
+
26
+ var _require3 = require('../interceptors/response'),
27
+ responseInterceptor = _require3.responseInterceptor;
25
28
 
26
29
  var auth = require('./auth.service');
27
30
  var loyalty = require('./loyalty.service');
@@ -30,7 +33,7 @@ var ssr = require('./ssr.service');
30
33
  var log = require('./log.service');
31
34
 
32
35
  exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh, source) {
33
- var httpClient = axios.create({ baseURL: baseURL });
36
+ var httpClient = axios.create({ baseURL: baseURL, headers: { 'x-phoenix-version': version } });
34
37
 
35
38
  /**
36
39
  * TODO: Make refresher prettier.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@como/como-client",
3
- "version": "0.7.5",
3
+ "version": "0.7.54",
4
4
  "description": "Client module for Como's loaylty API",
5
5
  "main": "src/como.js",
6
6
  "scripts": {
package/src/como.js CHANGED
@@ -27,7 +27,7 @@ class Como {
27
27
  if(!refresher){
28
28
  console.log('No refresh for %o', this.comoData);
29
29
  }
30
- else if (expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment())) {
30
+ else if (expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment())) {
31
31
  await refresher();
32
32
  }
33
33
  }
@@ -109,9 +109,9 @@ class Como {
109
109
  const data = await this.comoData.initApi.refreshToken(installationId, refreshToken? refreshToken: 'none', locationId, source);
110
110
  updateCredentials(data, true);
111
111
  }catch(e){
112
- console.log(`Failed to refresh token, installationId:${installationId}, refreshToken:${this.comoData.refreshToken}, locationId:${locationId}, source:${source}`);
112
+ console.error(`Failed to refresh token, installationId:${installationId}, refreshToken:${this.comoData.refreshToken}, locationId:${locationId}, source:${source}`);
113
113
  //refresh failed - need to revoke and signOn again
114
- initService.logError({method: 'refreshToken', installationId, locationId, source, refreshToken});
114
+ initService.logError({method: 'refreshToken', installationId, locationId, source, refreshToken, error : e.message});
115
115
  refreshFailed = true;
116
116
  }
117
117
  }
@@ -123,24 +123,31 @@ class Como {
123
123
  updateCredentials(data, true);
124
124
  credExist = true;
125
125
  }catch(e){
126
- console.log(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source},interval:${interval}, error:${e}`);
126
+ console.error(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source},interval:${interval}, error:${e}`);
127
127
  interval += 1000;
128
- initService.logError({method: 'signOn', installationId, locationId, source, refreshToken, interval});
128
+ initService.logError({method: 'signOn no accessToken', accessToken, isExpired, refreshFailed , credExist, installationId, locationId, source, refreshToken, interval, error : e.message});
129
129
  await new Promise(r => setTimeout(r, interval));
130
130
  }
131
131
  }
132
132
  }
133
- else{
134
- try{
135
- console.log(`signOn with installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}`);
136
- const data = await this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
137
- console.log(`signOn with result " ${JSON.stringify(data)}`);
138
- if(data && data.accessToken){
139
- console.log(`signOn- updating credentials`);
140
- updateCredentials(data, true);
133
+ else if(!isExpired){
134
+ let signOnSuccessfully = false;
135
+ while(!signOnSuccessfully && interval < 3000){
136
+ try{
137
+ console.log(`signOn with installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}`);
138
+ const data = await this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
139
+ console.log(`signOn with result " ${JSON.stringify(data)}`);
140
+ if(data && data.accessToken){
141
+ console.log(`signOn- updating credentials`);
142
+ updateCredentials(data, true);
143
+ }
144
+ signOnSuccessfully = true;
145
+ }catch(e){
146
+ console.error(`Failed signOn with accessToken, installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}, error:${e.message}`);
147
+ interval += 1000;
148
+ initService.logError({method: 'signOn with credentials', accessToken, isExpired, refreshFailed , credExist, installationId, locationId, source, refreshToken, interval, error : e.message});
149
+ await new Promise(r => setTimeout(r, interval));
141
150
  }
142
- }catch(e){
143
- console.log(`Failed signOn with accessToken, installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}, error:${e}`);
144
151
  }
145
152
  }
146
153
  if(!this.comoData.token){
@@ -437,6 +444,7 @@ class Como {
437
444
  const {
438
445
  env_params: env, locationId, api,
439
446
  } = this.comoData;
447
+ await this.refreshTokenIfNeeded();
440
448
  const responseJson = await api.getShortUserId(env.zapp_root, locationId);
441
449
  return responseJson.ID;
442
450
  }
@@ -477,6 +485,7 @@ class Como {
477
485
  const {
478
486
  env_params: env, locationId, api,
479
487
  } = this.comoData;
488
+ await this.refreshTokenIfNeeded();
480
489
  const responseJson = await api.redeemAsset(env.zapp_root, locationId, assetKey);
481
490
  return responseJson;
482
491
  }