@como/como-client 0.7.53 → 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.
- package/lib/como.js +13 -5
- package/lib/services/index.js +9 -6
- package/package.json +1 -1
- package/src/como.js +3 -1
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(
|
|
85
|
+
if (!(expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment()))) {
|
|
86
86
|
_context.next = 8;
|
|
87
87
|
break;
|
|
88
88
|
}
|
|
@@ -1080,13 +1080,17 @@ var Como = function () {
|
|
|
1080
1080
|
case 0:
|
|
1081
1081
|
_comoData9 = this.comoData, env = _comoData9.env_params, locationId = _comoData9.locationId, api = _comoData9.api;
|
|
1082
1082
|
_context17.next = 3;
|
|
1083
|
-
return
|
|
1083
|
+
return this.refreshTokenIfNeeded();
|
|
1084
1084
|
|
|
1085
1085
|
case 3:
|
|
1086
|
+
_context17.next = 5;
|
|
1087
|
+
return api.getShortUserId(env.zapp_root, locationId);
|
|
1088
|
+
|
|
1089
|
+
case 5:
|
|
1086
1090
|
responseJson = _context17.sent;
|
|
1087
1091
|
return _context17.abrupt('return', responseJson.ID);
|
|
1088
1092
|
|
|
1089
|
-
case
|
|
1093
|
+
case 7:
|
|
1090
1094
|
case 'end':
|
|
1091
1095
|
return _context17.stop();
|
|
1092
1096
|
}
|
|
@@ -1208,13 +1212,17 @@ var Como = function () {
|
|
|
1208
1212
|
case 0:
|
|
1209
1213
|
_comoData11 = this.comoData, env = _comoData11.env_params, locationId = _comoData11.locationId, api = _comoData11.api;
|
|
1210
1214
|
_context20.next = 3;
|
|
1211
|
-
return
|
|
1215
|
+
return this.refreshTokenIfNeeded();
|
|
1212
1216
|
|
|
1213
1217
|
case 3:
|
|
1218
|
+
_context20.next = 5;
|
|
1219
|
+
return api.redeemAsset(env.zapp_root, locationId, assetKey);
|
|
1220
|
+
|
|
1221
|
+
case 5:
|
|
1214
1222
|
responseJson = _context20.sent;
|
|
1215
1223
|
return _context20.abrupt('return', responseJson);
|
|
1216
1224
|
|
|
1217
|
-
case
|
|
1225
|
+
case 7:
|
|
1218
1226
|
case 'end':
|
|
1219
1227
|
return _context20.stop();
|
|
1220
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('
|
|
20
|
-
|
|
21
|
-
refreshInterceptor = _require.refreshInterceptor;
|
|
19
|
+
var _require = require('../../package.json'),
|
|
20
|
+
version = _require.version;
|
|
22
21
|
|
|
23
|
-
var _require2 = require('../interceptors/
|
|
24
|
-
|
|
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
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(
|
|
30
|
+
else if (expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment())) {
|
|
31
31
|
await refresher();
|
|
32
32
|
}
|
|
33
33
|
}
|
|
@@ -444,6 +444,7 @@ class Como {
|
|
|
444
444
|
const {
|
|
445
445
|
env_params: env, locationId, api,
|
|
446
446
|
} = this.comoData;
|
|
447
|
+
await this.refreshTokenIfNeeded();
|
|
447
448
|
const responseJson = await api.getShortUserId(env.zapp_root, locationId);
|
|
448
449
|
return responseJson.ID;
|
|
449
450
|
}
|
|
@@ -484,6 +485,7 @@ class Como {
|
|
|
484
485
|
const {
|
|
485
486
|
env_params: env, locationId, api,
|
|
486
487
|
} = this.comoData;
|
|
488
|
+
await this.refreshTokenIfNeeded();
|
|
487
489
|
const responseJson = await api.redeemAsset(env.zapp_root, locationId, assetKey);
|
|
488
490
|
return responseJson;
|
|
489
491
|
}
|