@como/como-client 0.7.55 → 0.7.59

package/lib/como.js

@@ -42,6 +42,8 @@ var comoExternalUrlTranslator = require('./utils/comoExternalUrlTranslator');
 var resourceNames = require('./constants/resourceNames');
 var urlsUtils = require('./utils/urls');
 
+var internalServices = ['como_connect'];
+
 var INITIAL_COMO_DATA = {
     env: environmentConfig,
     token: null,
@@ -148,7 +150,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 +160,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,14 +189,14 @@ 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;
                                 this.comoData.refresher = refresher;
 
                                 accessToken = credentials.accessToken, refreshToken = credentials.refreshToken, expiresIn = credentials.expiresIn;
-                                credExist = isExists(accessToken) && isExists(refreshToken);
+                                credExist = isExists(accessToken) && isExists(refreshToken) || internalServices.includes(source);
                                 isExpired = credExist && expiresIn && moment(expiresIn).isBefore(moment());
                                 refreshFailed = false;
 

package/lib/services/index.js

@@ -33,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, headers: { 'x-phoenix-version': version } });
+    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.
@@ -70,13 +73,13 @@ exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh,
         prev[curr] = apiCalls[curr](httpClient); // eslint-disable-line no-param-reassign
         return prev;
     }, {});
-    var initService = getInitApiCalles(baseURL);
+    var initService = getInitApiCalles(baseURL, binaryVersion, phoenixVersion);
 
     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.55",
+  "version": "0.7.59",
   "description": "Client module for Como's loaylty API",
   "main": "src/como.js",
   "scripts": {

package/src/como.js

@@ -6,6 +6,8 @@ const comoExternalUrlTranslator = require('./utils/comoExternalUrlTranslator');
 const resourceNames = require('./constants/resourceNames');
 const urlsUtils = require('./utils/urls');
 
+const internalServices = ['como_connect'];
+
 const INITIAL_COMO_DATA = {
     env: environmentConfig,
     token: null,
@@ -69,7 +71,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,13 +97,13 @@ 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;
 
         const { accessToken, refreshToken, expiresIn } = credentials;
-        let credExist = isExists(accessToken) && isExists(refreshToken);
+        let credExist = isExists(accessToken) && isExists(refreshToken) ||  internalServices.includes(source);
         let isExpired = credExist && expiresIn && moment(expiresIn).isBefore(moment());
         let refreshFailed = false;
         if(isExpired){