@como/como-client 0.1.9-1.1 → 0.1.9-1.5

package/lib/como.js

@@ -214,7 +214,7 @@ var Como = function () {
 
                                 getCredentials = this.getCredentials.bind(this);
                                 gateway = this.comoData.env_params.gateway;
-                                _APIService$getServic = APIService.getService(gateway, installationId, getCredentials, updateCredentials, source, locationId), service = _APIService$getServic.service, refresher = _APIService$getServic.refresher;
+                                _APIService$getServic = APIService.getService(gateway, installationId, getCredentials, updateCredentials, source), service = _APIService$getServic.service, refresher = _APIService$getServic.refresher;
 
                                 this.comoData.api = service;
                                 this.comoData.refresher = refresher;
@@ -1506,10 +1506,11 @@ var Como = function () {
                 accessToken = _comoData22.accessToken,
                 refreshToken = _comoData22.refreshToken,
                 expiresIn = _comoData22.expiresIn,
-                consent = _comoData22.consent;
+                consent = _comoData22.consent,
+                locationId = _comoData22.locationId;
 
             return {
-                accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiresIn, consent: consent
+                accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiresIn, consent: consent, locationId: locationId
             };
         }
 

package/lib/interceptors/refresh.js

@@ -52,7 +52,7 @@ exports.tokenInterceptor = function (getCredentials, refresher) {
                         case 0:
                             _getCredentials = getCredentials(), expiresIn = _getCredentials.expiresIn;
 
-                            if (!(expiresIn && isExpired(expiresIn))) {
+                            if (!(expiresIn && isExpired(expiresIn) && (!config.url.toLocaleLowerCase().includes('signon') || !config.url.toLocaleLowerCase().includes('refresh')))) {
                                 _context.next = 11;
                                 break;
                             }

package/lib/services/auth.service.js

@@ -299,9 +299,9 @@ exports.logOut = function (service) {
     }));
 };
 
-exports.refreshToken = function (service, source) {
+exports.refreshToken = function (service, source, locationId) {
     return function () {
-        var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(uid, token, locationId) {
+        var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(uid, token) {
             var params, _ref20, data;
 
             return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -325,7 +325,7 @@ exports.refreshToken = function (service, source) {
             }, _callee10, undefined);
         }));
 
-        return function (_x28, _x29, _x30) {
+        return function (_x28, _x29) {
             return _ref19.apply(this, arguments);
         };
     }();

package/lib/services/index.js

@@ -28,7 +28,7 @@ var loyalty = require('./loyalty.service');
 var form = require('./form.service');
 var ssr = require('./ssr.service');
 
-exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh, source, locationId) {
+exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh, source) {
     var httpClient = axios.create({ baseURL: baseURL });
 
     /**
@@ -43,11 +43,13 @@ exports.getService = function (baseURL, uid, getCredentials, credentialsRefresh,
         }
 
         var _getCredentials = getCredentials(),
-            refreshToken = _getCredentials.refreshToken;
+            refreshToken = _getCredentials.refreshToken,
+            locationId = _getCredentials.locationId;
 
         credentialsRefresh({ accessToken: false });
-        var refreshService = auth.refreshToken(httpClient, source);
-        refreshPromise = refreshService(uid, refreshToken, locationId).then(function (creds) {
+        console.log('fefdsdfewfewgwgwghwh44w3h43wh3h =' + locationId);
+        var refreshService = auth.refreshToken(httpClient, source, locationId);
+        refreshPromise = refreshService(uid, refreshToken).then(function (creds) {
             refreshPromise = null;
             return creds;
         });

package/package.json

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

package/src/como.js

@@ -95,7 +95,7 @@ class Como {
         const getCredentials = this.getCredentials.bind(this);
         const { gateway } = this.comoData.env_params;
         const { service, refresher } = APIService
-            .getService(gateway, installationId, getCredentials, updateCredentials, source, locationId);
+            .getService(gateway, installationId, getCredentials, updateCredentials, source);
         this.comoData.api = service;
         this.comoData.refresher = refresher;
 
@@ -112,7 +112,7 @@ class Como {
             }
         }
         let refreshFailed = false;
-        if(isExpired){
+        if(isExpired){       
             try{
                 await this.refreshTokenIfNeeded();
             }catch(e){
@@ -610,10 +610,10 @@ class Como {
      */
     getCredentials() {
         const {
-            accessToken, refreshToken, expiresIn, consent,
+            accessToken, refreshToken, expiresIn, consent, locationId
         } = this.comoData;
         return {
-            accessToken, refreshToken, expiresIn, consent,
+            accessToken, refreshToken, expiresIn, consent, locationId
         };
     }