@como/como-client 0.7.53 → 0.7.57

package/lib/como.js

@@ -82,7 +82,7 @@ var Como = function () {
                                 break;
 
                             case 5:
-                                if (!(expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment()))) {
+                                if (!(expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment()))) {
                                     _context.next = 8;
                                     break;
                                 }
@@ -148,7 +148,7 @@ var Como = function () {
 
                 var enableSignon = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
-                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;
+                var isExists, environmentId, locationId, installationId, source, binaryVersion, phoenixVersion, updateCredentials, getCredentials, gateway, _APIService$getServic, service, refresher, initService, accessToken, refreshToken, expiresIn, credExist, isExpired, refreshFailed, data, interval, _data, signOnSuccessfully, _data2;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -158,7 +158,7 @@ var Como = function () {
                                     return !ramda.isNil(x) && !ramda.isEmpty(x);
                                 };
 
-                                environmentId = environment.id, locationId = environment.locationId, installationId = environment.installationId, source = environment.source;
+                                environmentId = environment.id, locationId = environment.locationId, installationId = environment.installationId, source = environment.source, binaryVersion = environment.binaryVersion, phoenixVersion = environment.phoenixVersion;
 
                                 if (!(!isExists(environmentId) || !isExists(locationId) || !isExists(installationId))) {
                                     _context2.next = 4;
@@ -187,7 +187,7 @@ var Como = function () {
 
                                 getCredentials = this.getCredentials.bind(this);
                                 gateway = this.comoData.env_params.gateway;
-                                _APIService$getServic = APIService.getService(gateway, installationId, getCredentials, updateCredentials, source), service = _APIService$getServic.service, refresher = _APIService$getServic.refresher, initService = _APIService$getServic.initService;
+                                _APIService$getServic = APIService.getService(gateway, installationId, getCredentials, updateCredentials, source, binaryVersion, phoenixVersion), service = _APIService$getServic.service, refresher = _APIService$getServic.refresher, initService = _APIService$getServic.initService;
 
                                 this.comoData.api = service;
                                 this.comoData.initApi = initService;
@@ -1080,13 +1080,17 @@ var Como = function () {
                             case 0:
                                 _comoData9 = this.comoData, env = _comoData9.env_params, locationId = _comoData9.locationId, api = _comoData9.api;
                                 _context17.next = 3;
-                                return api.getShortUserId(env.zapp_root, locationId);
+                                return this.refreshTokenIfNeeded();
 
                             case 3:
+                                _context17.next = 5;
+                                return api.getShortUserId(env.zapp_root, locationId);
+
+                            case 5:
                                 responseJson = _context17.sent;
                                 return _context17.abrupt('return', responseJson.ID);
 
-                            case 5:
+                            case 7:
                             case 'end':
                                 return _context17.stop();
                         }
@@ -1208,13 +1212,17 @@ var Como = function () {
                             case 0:
                                 _comoData11 = this.comoData, env = _comoData11.env_params, locationId = _comoData11.locationId, api = _comoData11.api;
                                 _context20.next = 3;
-                                return api.redeemAsset(env.zapp_root, locationId, assetKey);
+                                return this.refreshTokenIfNeeded();
 
                             case 3:
+                                _context20.next = 5;
+                                return api.redeemAsset(env.zapp_root, locationId, assetKey);
+
+                            case 5:
                                 responseJson = _context20.sent;
                                 return _context20.abrupt('return', responseJson);
 
-                            case 5:
+                            case 7:
                             case 'end':
                                 return _context20.stop();
                         }

package/lib/services/index.js

@@ -16,12 +16,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var axios = require('axios');
 
-var _require = require('../interceptors/refresh'),
-    tokenInterceptor = _require.tokenInterceptor,
-    refreshInterceptor = _require.refreshInterceptor;
+var _require = require('../../package.json'),
+    version = _require.version;
 
-var _require2 = require('../interceptors/response'),
-    responseInterceptor = _require2.responseInterceptor;
+var _require2 = require('../interceptors/refresh'),
+    tokenInterceptor = _require2.tokenInterceptor,
+    refreshInterceptor = _require2.refreshInterceptor;
+
+var _require3 = require('../interceptors/response'),
+    responseInterceptor = _require3.responseInterceptor;
 
 var auth = require('./auth.service');
 var loyalty = require('./loyalty.service');
@@ -30,7 +33,10 @@ var ssr = require('./ssr.service');
 var log = require('./log.service');
 
 exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh, source) {
-    var httpClient = axios.create({ baseURL: baseURL });
+    var binaryVersion = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'not-defined';
+    var phoenixVersion = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 'not-defined';
+
+    var httpClient = axios.create({ baseURL: baseURL, headers: { 'x-comojs-version': version, 'x-binary-version': binaryVersion, 'x-phoenix-version': phoenixVersion } });
 
     /**
      * TODO: Make refresher prettier.
@@ -72,8 +78,8 @@ exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh,
     return { initService: initService, service: service, refresher: refresher };
 };
 
-function getInitApiCalles(baseURL) {
-    var httpInitClient = axios.create({ baseURL: baseURL });
+function getInitApiCalles(baseURL, binaryVersion, phoenixVersion) {
+    var httpInitClient = axios.create({ baseURL: baseURL, headers: { 'x-comojs-version': version, 'x-binary-version': binaryVersion, 'x-phoenix-version': phoenixVersion } });
     var initApiCalls = { signOn: auth.signOn, refreshToken: auth.refreshToken, logError: log.logError };
     return (0, _keys2.default)(initApiCalls).reduce(function (prev, curr) {
         prev[curr] = initApiCalls[curr](httpInitClient); // eslint-disable-line no-param-reassign

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@como/como-client",
-  "version": "0.7.53",
+  "version": "0.7.57",
   "description": "Client module for Como's loaylty API",
   "main": "src/como.js",
   "scripts": {

package/src/como.js

@@ -27,7 +27,7 @@ class Como {
         if(!refresher){
             console.log('No refresh for %o', this.comoData);
         }
-        else if (expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment())) {
+        else if (expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment())) {
             await refresher();
         }
     }
@@ -69,7 +69,7 @@ class Como {
      */
     async init(environment, credentials, refreshCallback, enableSignon = true) {
         const isExists = (x => !ramda.isNil(x) && !ramda.isEmpty(x));
-        const { id: environmentId, locationId, installationId, source } = environment;
+        const { id: environmentId, locationId, installationId, source, binaryVersion, phoenixVersion } = environment;
         if (!isExists(environmentId) || !isExists(locationId) || !isExists(installationId)) {
             throw new Error(`missing parameters: ${environment}`);
         }
@@ -95,7 +95,7 @@ class Como {
         const getCredentials = this.getCredentials.bind(this);
         const { gateway } = this.comoData.env_params;
         const { service, refresher, initService } = APIService
-            .getService(gateway, installationId, getCredentials, updateCredentials, source);
+            .getService(gateway, installationId, getCredentials, updateCredentials, source, binaryVersion, phoenixVersion);
         this.comoData.api = service;
         this.comoData.initApi = initService;
         this.comoData.refresher = refresher;
@@ -444,6 +444,7 @@ class Como {
         const {
             env_params: env, locationId, api,
         } = this.comoData;
+        await this.refreshTokenIfNeeded();
         const responseJson = await api.getShortUserId(env.zapp_root, locationId);
         return responseJson.ID;
     }
@@ -484,6 +485,7 @@ class Como {
         const {
             env_params: env, locationId, api,
         } = this.comoData;
+        await this.refreshTokenIfNeeded();
         const responseJson = await api.redeemAsset(env.zapp_root, locationId, assetKey);
         return responseJson;
     }