@como/como-client - npm Package Compare versions

Comparing version 0.1.20 to 0.1.21

lib/como.js

 'use strict';
 
+var _promise = require('babel-runtime/core-js/promise');
+
+var _promise2 = _interopRequireDefault(_promise);
+
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _extends2 = require('babel-runtime/helpers/extends');
@@ -1023,3 +1031,3 @@
         comoData.app_texts = comoData.mainResources.DefaultAppTexts;
-        Object.keys(comoData.mainResources.AppTexts).forEach(function (key) {
+        (0, _keys2.default)(comoData.mainResources.AppTexts).forEach(function (key) {
             comoData.app_texts[key] = comoData.mainResources.AppTexts[key];
@@ -1056,3 +1064,3 @@ });
                     _context24.next = 4;
-                    return Promise.all(downloads);
+                    return _promise2.default.all(downloads);
 
@@ -1059,0 +1067,0 @@ case 4:

lib/interceptors/refresh.js

@@ -115,4 +115,9 @@ 'use strict';
                         case 0:
+                            if (!error.response) {
+                                _context2.next = 5;
+                                break;
+                            }
+
                             if (error.response.headers['janua-token-expired']) {
-                                _context2.next = 2;
+                                _context2.next = 3;
                                 break;
@@ -123,15 +128,22 @@ }
 
-                        case 2:
+                        case 3:
+                            _context2.next = 6;
+                            break;
+
+                        case 5:
+                            throw error;
+
+                        case 6:
                             config = error.config;
-                            _context2.prev = 3;
-                            _context2.next = 6;
+                            _context2.prev = 7;
+                            _context2.next = 10;
                             return refresher();
 
-                        case 6:
-                            _context2.next = 12;
+                        case 10:
+                            _context2.next = 16;
                             break;
 
-                        case 8:
-                            _context2.prev = 8;
-                            _context2.t0 = _context2['catch'](3);
+                        case 12:
+                            _context2.prev = 12;
+                            _context2.t0 = _context2['catch'](7);
 
@@ -141,11 +153,11 @@ console.log(_context2.t0);
 
-                        case 12:
-                            _context2.next = 14;
+                        case 16:
+                            _context2.next = 18;
                             return service.request(config);
 
-                        case 14:
+                        case 18:
                             res = _context2.sent;
                             return _context2.abrupt('return', res);
 
-                        case 16:
+                        case 20:
                         case 'end':
@@ -155,3 +167,3 @@ return _context2.stop();
                 }
-            }, _callee2, undefined, [[3, 8]]);
+            }, _callee2, undefined, [[7, 12]]);
         }));
@@ -158,0 +170,0 @@

lib/services/index.js

 'use strict';
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _extends2 = require('babel-runtime/helpers/extends');
@@ -7,2 +11,6 @@
 
+var _promise = require('babel-runtime/core-js/promise');
+
+var _promise2 = _interopRequireDefault(_promise);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -50,3 +58,3 @@
     httpClient.interceptors.request.use(tokenInterceptor(getCredentials, refresher), function (err) {
-        return Promise.reject(err);
+        return _promise2.default.reject(err);
     });
@@ -57,3 +65,3 @@ httpClient.interceptors.response.use(responseInterceptor(credentialsRefresh), refreshInterceptor(refresher, httpClient));
     // Inject service instance to all service calls
-    var service = Object.keys(apiCalls).reduce(function (prev, curr) {
+    var service = (0, _keys2.default)(apiCalls).reduce(function (prev, curr) {
         prev[curr] = apiCalls[curr](httpClient); // eslint-disable-line no-param-reassign
@@ -60,0 +68,0 @@ return prev;

lib/services/loyalty.service.js

@@ -597,3 +597,2 @@ 'use strict';
         var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee18(baseUrl, locationId, token, cardToken) {
-            var url, response;
             return _regenerator2.default.wrap(function _callee18$(_context18) {
@@ -603,11 +602,9 @@ while (1) {
                         case 0:
-                            url = baseUrl + '/payments/v2/methods/' + cardToken + '?locationId=' + locationId;
-                            _context18.next = 3;
-                            return service.post(url);
+                            return _context18.abrupt('return', service({
+                                method: 'post',
+                                url: baseUrl + '/payments/v2/methods/' + cardToken + '?locationId=' + locationId,
+                                timeout: 5000 // Wait for 5 seconds
+                            }));
 
-                        case 3:
-                            response = _context18.sent;
-                            return _context18.abrupt('return', response);
-
-                        case 5:
+                        case 1:
                         case 'end':
@@ -629,3 +626,2 @@ return _context18.stop();
         var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee19(baseUrl, locationId) {
-            var url, res;
             return _regenerator2.default.wrap(function _callee19$(_context19) {
@@ -635,11 +631,9 @@ while (1) {
                         case 0:
-                            url = baseUrl + '/payments/v2/methods?locationId=' + locationId + '&InputType=json&MimeType=application/json';
-                            _context19.next = 3;
-                            return service.get(url);
+                            return _context19.abrupt('return', service({
+                                method: 'get',
+                                url: baseUrl + '/payments/v2/methods?locationId=' + locationId + '&InputType=json&MimeType=application/json',
+                                timeout: 5000 // Wait for 5 seconds
+                            }));
 
-                        case 3:
-                            res = _context19.sent;
-                            return _context19.abrupt('return', res);
-
-                        case 5:
+                        case 1:
                         case 'end':
@@ -661,3 +655,2 @@ return _context19.stop();
         var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee20(baseUrl, locationId, token, amount, creditCardToken, itemName, itemNumber, membershipKey) {
-            var url, response;
             return _regenerator2.default.wrap(function _callee20$(_context20) {
@@ -667,24 +660,23 @@ while (1) {
                         case 0:
-                            url = baseUrl + '/payments/v2/payments/charge?locationId=' + locationId;
-                            _context20.next = 3;
-                            return service.post(url, {
-                                amount: amount,
-                                payment_method: {
-                                    type: 'tokenized',
-                                    token: creditCardToken
-                                },
-                                additional_details: {
-                                    paymentFlow: 'PayInApp',
-                                    quantity: '1',
-                                    itemNumber: itemNumber,
-                                    itemName: itemName,
-                                    membershipKey: membershipKey
+                            return _context20.abrupt('return', service({
+                                method: 'post',
+                                url: baseUrl + '/payments/v2/payments/charge?locationId=' + locationId,
+                                timeout: 5000, // Wait for 5 seconds
+                                data: {
+                                    amount: amount,
+                                    payment_method: {
+                                        type: 'tokenized',
+                                        token: creditCardToken
+                                    },
+                                    additional_details: {
+                                        paymentFlow: 'PayInApp',
+                                        quantity: '1',
+                                        itemNumber: itemNumber,
+                                        itemName: itemName,
+                                        membershipKey: membershipKey
+                                    }
                                 }
-                            });
+                            }));
 
-                        case 3:
-                            response = _context20.sent;
-                            return _context20.abrupt('return', response);
-
-                        case 5:
+                        case 1:
                         case 'end':
@@ -691,0 +683,0 @@ return _context20.stop();

lib/utils/comoExternalUrlTranslator.js

 'use strict';
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _regenerator = require('babel-runtime/regenerator');
@@ -50,3 +54,3 @@
     var keyToFind = keyName.toLowerCase();
-    var foundKey = Object.keys(obj).filter(function (item) {
+    var foundKey = (0, _keys2.default)(obj).filter(function (item) {
         return item.toLowerCase() === keyToFind;
@@ -53,0 +57,0 @@ });

lib/utils/urls.js

 'use strict';
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 exports.appendQuery = function (url, query) {
-    return Object.keys(query || {}).reduce(function (modifiedURL, key) {
+    return (0, _keys2.default)(query || {}).reduce(function (modifiedURL, key) {
         return updateQueryStringParameter(modifiedURL, key, query[key]);
@@ -6,0 +12,0 @@ }, url);

package.json

 {
   "name": "@como/como-client",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Client module for Como's loaylty API",
@@ -5,0 +5,0 @@ "main": "src/como.js",

src/interceptors/refresh.js

@@ -57,3 +57,7 @@ const moment = require('moment-timezone');
 exports.refreshInterceptor = (refresher, service) => async error => {
-    if (!error.response.headers['janua-token-expired']) {
+    if (error.response) {
+        if (!error.response.headers['janua-token-expired']) {
+            throw error;
+        }
+    } else {
         throw error;
@@ -60,0 +64,0 @@ }

src/services/loyalty.service.js

@@ -145,30 +145,38 @@ const moment = require('moment-timezone');
 exports.addPaymentMethod = service => async (baseUrl, locationId, token, cardToken) => {
-    const url = `${baseUrl}/payments/v2/methods/${cardToken}?locationId=${locationId}`;
-    const response = await service.post(url);
-    return response;
+    return service({
+        method: 'post',
+        url: `${baseUrl}/payments/v2/methods/${cardToken}?locationId=${locationId}`,
+        timeout: 5000, // Wait for 5 seconds
+    });
 };
 
 exports.getPaymentMethods = service => async (baseUrl, locationId) => {
-    const url = `${baseUrl}/payments/v2/methods?locationId=${locationId}&InputType=json&MimeType=application/json`;
-    const res = await service.get(url);
-    return res;
+    return service({
+        method: 'get',
+        url: `${baseUrl}/payments/v2/methods?locationId=${locationId}&InputType=json&MimeType=application/json`,
+        timeout: 5000, // Wait for 5 seconds
+    });
 };
 
 exports.payInApp = service => async (baseUrl, locationId, token, amount, creditCardToken, itemName, itemNumber, membershipKey) => {
-    const url = `${baseUrl}/payments/v2/payments/charge?locationId=${locationId}`;
-    const response = await service.post(url, {
-        amount,
-        payment_method: {
-            type: 'tokenized',
-            token: creditCardToken,
+
+    return service({
+        method: 'post',
+        url: `${baseUrl}/payments/v2/payments/charge?locationId=${locationId}`,
+        timeout: 5000, // Wait for 5 seconds
+        data: {
+            amount,
+            payment_method: {
+                type: 'tokenized',
+                token: creditCardToken,
+            },
+            additional_details: {
+                paymentFlow: 'PayInApp',
+                quantity: '1',
+                itemNumber,
+                itemName,
+                membershipKey,
+            },
         },
-        additional_details: {
-            paymentFlow: 'PayInApp',
-            quantity: '1',
-            itemNumber,
-            itemName,
-            membershipKey,
-        },
     });
-    return response;
 };
@@ -175,0 +183,0 @@

No alert changes

Improved metrics

Total package byte prevSize

354764

0.36%

Lines of code

4035

0.7%

No dependency changes