@como/como-client 0.7.95 → 0.7.98

package/lib/como.js

@@ -201,7 +201,7 @@ var Como = function () {
                                 refreshFailed = false;
 
                                 if (!isExpired) {
-                                    _context2.next = 30;
+                                    _context2.next = 29;
                                     break;
                                 }
 
@@ -213,7 +213,7 @@ var Como = function () {
                                 data = _context2.sent;
 
                                 updateCredentials(data, true);
-                                _context2.next = 30;
+                                _context2.next = 29;
                                 break;
 
                             case 24:
@@ -224,75 +224,74 @@ var Como = function () {
                                 //refresh failed - need to revoke and signOn again
                                 initService.logError({ method: 'refreshToken', installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, error: _context2.t0.message });
                                 refreshFailed = true;
-                                credExist = false;
 
-                            case 30:
+                            case 29:
                                 interval = 0;
 
-                                if (credExist) {
-                                    _context2.next = 52;
+                                if (!(refreshFailed || !credExist)) {
+                                    _context2.next = 51;
                                     break;
                                 }
 
-                            case 32:
+                            case 31:
                                 if (!(!credExist && interval < 3000)) {
-                                    _context2.next = 50;
+                                    _context2.next = 49;
                                     break;
                                 }
 
-                                _context2.prev = 33;
-                                _context2.next = 36;
+                                _context2.prev = 32;
+                                _context2.next = 35;
                                 return this.comoData.initApi.signOn(installationId, locationId, source);
 
-                            case 36:
+                            case 35:
                                 _data = _context2.sent;
 
                                 updateCredentials(_data, true);
                                 credExist = true;
-                                _context2.next = 48;
+                                _context2.next = 47;
                                 break;
 
-                            case 41:
-                                _context2.prev = 41;
-                                _context2.t1 = _context2['catch'](33);
+                            case 40:
+                                _context2.prev = 40;
+                                _context2.t1 = _context2['catch'](32);
 
                                 console.error('Failed to signOn, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',interval:' + interval + ', error:' + _context2.t1);
                                 interval += 1000;
                                 initService.logError({ method: 'signOn no accessToken', accessToken: accessToken, isExpired: isExpired, refreshFailed: refreshFailed, credExist: credExist, installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval, error: _context2.t1.message });
-                                _context2.next = 48;
+                                _context2.next = 47;
                                 return new _promise2.default(function (r) {
                                     return setTimeout(r, interval);
                                 });
 
-                            case 48:
-                                _context2.next = 32;
+                            case 47:
+                                _context2.next = 31;
                                 break;
 
-                            case 50:
-                                _context2.next = 75;
+                            case 49:
+                                _context2.next = 74;
                                 break;
 
-                            case 52:
+                            case 51:
                                 if (isExpired) {
-                                    _context2.next = 75;
+                                    _context2.next = 74;
                                     break;
                                 }
 
                                 signOnSuccessfully = false;
 
-                            case 54:
+                            case 53:
                                 if (!(!signOnSuccessfully && interval < 3000)) {
-                                    _context2.next = 75;
+                                    _context2.next = 74;
                                     break;
                                 }
 
-                                _context2.prev = 55;
+                                _context2.prev = 54;
 
                                 console.log('signOn with installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',accessToken:' + accessToken);
-                                _context2.next = 59;
+                                _context2.next = 58;
                                 return this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
 
-                            case 59:
+                            case 58:
                                 _data2 = _context2.sent;
 
                                 console.log('signOn with result " ' + (0, _stringify2.default)(_data2));
@@ -304,37 +303,37 @@ var Como = function () {
                                     this.comoData.reCaptchaSiteKey = _data2.config.recaptchaSiteKey;
                                 }
                                 signOnSuccessfully = true;
-                                _context2.next = 73;
+                                _context2.next = 72;
                                 break;
 
-                            case 66:
-                                _context2.prev = 66;
-                                _context2.t2 = _context2['catch'](55);
+                            case 65:
+                                _context2.prev = 65;
+                                _context2.t2 = _context2['catch'](54);
 
                                 console.error('Failed signOn with accessToken, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',accessToken:' + accessToken + ', error:' + _context2.t2.message);
                                 interval += 1000;
                                 initService.logError({ method: 'signOn with credentials', accessToken: accessToken, isExpired: isExpired, refreshFailed: refreshFailed, credExist: credExist, installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval, error: _context2.t2.message });
-                                _context2.next = 73;
+                                _context2.next = 72;
                                 return new _promise2.default(function (r) {
                                     return setTimeout(r, interval);
                                 });
 
-                            case 73:
-                                _context2.next = 54;
+                            case 72:
+                                _context2.next = 53;
                                 break;
 
-                            case 75:
+                            case 74:
                                 if (!this.comoData.token) {
                                     this.comoData.token = this.comoData.accessToken;
                                 }
                                 return _context2.abrupt('return', this.getCredentials());
 
-                            case 77:
+                            case 76:
                             case 'end':
                                 return _context2.stop();
                         }
                     }
-                }, _callee2, this, [[17, 24], [33, 41], [55, 66]]);
+                }, _callee2, this, [[17, 24], [32, 40], [54, 65]]);
             }));
 
             function init(_x, _x2, _x3) {
@@ -805,12 +804,14 @@ var Como = function () {
          * @param {Object} identifier an object which identifies the user by its credentials
          * @param {string} type login type i.e PhoneNumber/Email/etc
          * @param {reCaptchaToken} reCaptcha token for login chalenge
+         * @param {recaptchaTokenType} recaptcha token type - score/human
+         * @param {devicePlatform} device platform i.e. ios/android
          */
 
     }, {
         key: 'login',
         value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(identifier, type, reCaptchaToken) {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(identifier, type, reCaptchaToken, recaptchaTokenType, devicePlatform) {
                 var api, data, _error$response$data7, code, message;
 
                 return _regenerator2.default.wrap(function _callee11$(_context11) {
@@ -820,7 +821,7 @@ var Como = function () {
                                 api = this.comoData.api;
                                 _context11.prev = 1;
                                 _context11.next = 4;
-                                return api.logIn(type, identifier, reCaptchaToken);
+                                return api.logIn(type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform);
 
                             case 4:
                                 data = _context11.sent;
@@ -849,7 +850,7 @@ var Como = function () {
                 }, _callee11, this, [[1, 8]]);
             }));
 
-            function login(_x30, _x31, _x32) {
+            function login(_x30, _x31, _x32, _x33, _x34) {
                 return _ref11.apply(this, arguments);
             }
 
@@ -862,12 +863,14 @@ var Como = function () {
          * @param {*} type login type i.e PhoneNumber/Email/etc
          * @param {*} code a 2-factor verification code sent to the client
          * @param {reCaptchaToken} reCaptcha token for login challenge
+         * @param {recaptchaTokenType} recaptcha token type - score/human
+         * @param {devicePlatform} device platform i.e. ios/android
          */
 
     }, {
         key: 'loginVerify',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(identifier, type, code, reCaptchaToken) {
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(identifier, type, code, reCaptchaToken, recaptchaTokenType, devicePlatform) {
                 var api, _ref13, consent, _error$response$data8, errCode, message;
 
                 return _regenerator2.default.wrap(function _callee12$(_context12) {
@@ -877,7 +880,7 @@ var Como = function () {
                                 api = this.comoData.api;
                                 _context12.prev = 1;
                                 _context12.next = 4;
-                                return api.logInVerify(code, type, identifier, reCaptchaToken);
+                                return api.logInVerify(code, type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform);
 
                             case 4:
                                 _ref13 = _context12.sent;
@@ -922,7 +925,7 @@ var Como = function () {
                 }, _callee12, this, [[1, 9]]);
             }));
 
-            function loginVerify(_x33, _x34, _x35, _x36) {
+            function loginVerify(_x35, _x36, _x37, _x38, _x39, _x40) {
                 return _ref12.apply(this, arguments);
             }
 
@@ -997,7 +1000,7 @@ var Como = function () {
                 }, _callee14, this);
             }));
 
-            function openApp(_x38) {
+            function openApp(_x42) {
                 return _ref15.apply(this, arguments);
             }
 
@@ -1038,7 +1041,7 @@ var Como = function () {
                 }, _callee15, this, [[1, 5]]);
             }));
 
-            function clientUpdateMembership(_x39, _x40) {
+            function clientUpdateMembership(_x43, _x44) {
                 return _ref16.apply(this, arguments);
             }
 
@@ -1099,7 +1102,7 @@ var Como = function () {
                 }, _callee16, this, [[0, 12]]);
             }));
 
-            function downloadMainResource(_x41) {
+            function downloadMainResource(_x45) {
                 return _ref17.apply(this, arguments);
             }
 
@@ -1317,7 +1320,7 @@ var Como = function () {
                 }, _callee21, this);
             }));
 
-            function redeemAsset(_x42) {
+            function redeemAsset(_x46) {
                 return _ref22.apply(this, arguments);
             }
 
@@ -1355,7 +1358,7 @@ var Como = function () {
                 }, _callee22, this);
             }));
 
-            function purchaseAsset(_x43) {
+            function purchaseAsset(_x47) {
                 return _ref23.apply(this, arguments);
             }
 
@@ -1419,7 +1422,7 @@ var Como = function () {
                 }, _callee24, this);
             }));
 
-            function purchaseAssetAPI2(_x44) {
+            function purchaseAssetAPI2(_x48) {
                 return _ref25.apply(this, arguments);
             }
 
@@ -1649,10 +1652,11 @@ var Como = function () {
                 refreshToken = _comoData22.refreshToken,
                 expiresIn = _comoData22.expiresIn,
                 consent = _comoData22.consent,
-                locationId = _comoData22.locationId;
+                locationId = _comoData22.locationId,
+                recaptchaConfig = _comoData22.recaptchaConfig;
 
             return {
-                accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiresIn, consent: consent, locationId: locationId
+                accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiresIn, consent: consent, locationId: locationId, recaptchaConfig: recaptchaConfig
             };
         }
 
@@ -1706,7 +1710,7 @@ var Como = function () {
     }, {
         key: 'getRecaptchaConfig',
         value: function getRecaptchaConfig() {
-            return { reCaptchaSiteKey: this.comoData.reCaptchaSiteKey, baseUrl: this.comoData.env_params.gateway };
+            return { reCaptchaSiteKey: this.comoData.reCaptchaSiteKey, baseUrl: this.comoData.env_params.gateway, recaptchaConfig: this.comoData.recaptchaConfig };
         }
 
         /**
@@ -1741,7 +1745,7 @@ var Como = function () {
                 }, _callee27, this);
             }));
 
-            function getRegistrationUrl(_x45) {
+            function getRegistrationUrl(_x49) {
                 return _ref28.apply(this, arguments);
             }
 
@@ -1780,7 +1784,7 @@ var Como = function () {
                 }, _callee28, this);
             }));
 
-            function getProfileUrl(_x46) {
+            function getProfileUrl(_x50) {
                 return _ref29.apply(this, arguments);
             }
 
@@ -1853,7 +1857,7 @@ var Como = function () {
                 }, _callee30, this);
             }));
 
-            function getDataPortabilityUrl(_x47, _x48) {
+            function getDataPortabilityUrl(_x51, _x52) {
                 return _ref31.apply(this, arguments);
             }
 
@@ -2046,7 +2050,7 @@ var Como = function () {
                 }, _callee33, this);
             }));
 
-            function addPaymentMethod(_x50) {
+            function addPaymentMethod(_x54) {
                 return _ref34.apply(this, arguments);
             }
 
@@ -2073,7 +2077,7 @@ var Como = function () {
                 }, _callee34, this);
             }));
 
-            function knowYourData(_x51) {
+            function knowYourData(_x55) {
                 return _ref35.apply(this, arguments);
             }
 
@@ -2100,7 +2104,7 @@ var Como = function () {
                 }, _callee35, this);
             }));
 
-            function consentWithdraw(_x52) {
+            function consentWithdraw(_x56) {
                 return _ref36.apply(this, arguments);
             }
 
@@ -2173,7 +2177,7 @@ var Como = function () {
                 }, _callee37, this);
             }));
 
-            function payInApp(_x53, _x54, _x55, _x56, _x57) {
+            function payInApp(_x57, _x58, _x59, _x60, _x61) {
                 return _ref38.apply(this, arguments);
             }
 
@@ -2210,7 +2214,7 @@ var Como = function () {
                 }, _callee38, this);
             }));
 
-            function deletePayment(_x58) {
+            function deletePayment(_x62) {
                 return _ref39.apply(this, arguments);
             }
 
@@ -2247,7 +2251,7 @@ var Como = function () {
                 }, _callee39, this);
             }));
 
-            function getMemberMessages(_x59, _x60, _x61) {
+            function getMemberMessages(_x63, _x64, _x65) {
                 return _ref40.apply(this, arguments);
             }
 
@@ -2297,7 +2301,7 @@ var Como = function () {
                 }, _callee40, this);
             }));
 
-            function budgetTransfer(_x63, _x64, _x65, _x66) {
+            function budgetTransfer(_x67, _x68, _x69, _x70) {
                 return _ref41.apply(this, arguments);
             }
 
@@ -2343,7 +2347,7 @@ var Como = function () {
                 }, _callee41, this);
             }));
 
-            function budgetTransferClaim(_x67) {
+            function budgetTransferClaim(_x71) {
                 return _ref42.apply(this, arguments);
             }
 
@@ -2395,7 +2399,7 @@ var Como = function () {
                 }, _callee42, this);
             }));
 
-            function logUserAction(_x68, _x69) {
+            function logUserAction(_x72, _x73) {
                 return _ref43.apply(this, arguments);
             }
 
@@ -2429,7 +2433,7 @@ var Como = function () {
                 }, _callee43, this);
             }));
 
-            function getPurchaseHistory(_x70, _x71) {
+            function getPurchaseHistory(_x74, _x75) {
                 return _ref44.apply(this, arguments);
             }
 

package/lib/services/auth.service.js

@@ -267,14 +267,16 @@ exports.unsubscribeSms = function (service) {
 
 exports.logIn = function (service) {
     return function () {
-        var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(type, identifier, reCaptchaToken) {
+        var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform) {
             var params, headers, _ref16, data;
 
             return _regenerator2.default.wrap(function _callee8$(_context8) {
                 while (1) {
                     switch (_context8.prev = _context8.next) {
                         case 0:
-                            params = { type: type, identifier: identifier, reCaptchaToken: reCaptchaToken };
+                            params = {
+                                type: type, identifier: identifier, reCaptchaToken: reCaptchaToken, recaptchaTokenType: recaptchaTokenType, devicePlatform: devicePlatform
+                            };
                             headers = getHashHeader(params);
                             _context8.next = 4;
                             return service.post('/auth/v2/auth/logIn', params, { headers: headers });
@@ -292,7 +294,7 @@ exports.logIn = function (service) {
             }, _callee8, undefined);
         }));
 
-        return function (_x25, _x26, _x27) {
+        return function (_x25, _x26, _x27, _x28, _x29) {
             return _ref15.apply(this, arguments);
         };
     }();
@@ -300,7 +302,7 @@ exports.logIn = function (service) {
 
 exports.logInVerify = function (service) {
     return function () {
-        var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(code, type, identifier, reCaptchaToken) {
+        var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(code, type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform) {
             var params, headers, _ref18, data;
 
             return _regenerator2.default.wrap(function _callee9$(_context9) {
@@ -311,7 +313,9 @@ exports.logInVerify = function (service) {
                                 identifier: identifier,
                                 code: code,
                                 type: type,
-                                reCaptchaToken: reCaptchaToken
+                                reCaptchaToken: reCaptchaToken,
+                                recaptchaTokenType: recaptchaTokenType,
+                                devicePlatform: devicePlatform
                             };
                             headers = getHashHeader(params);
                             _context9.next = 4;
@@ -330,7 +334,7 @@ exports.logInVerify = function (service) {
             }, _callee9, undefined);
         }));
 
-        return function (_x28, _x29, _x30, _x31) {
+        return function (_x30, _x31, _x32, _x33, _x34, _x35) {
             return _ref17.apply(this, arguments);
         };
     }();
@@ -388,7 +392,7 @@ exports.refreshToken = function (service) {
             }, _callee11, undefined);
         }));
 
-        return function (_x32, _x33, _x34, _x35) {
+        return function (_x36, _x37, _x38, _x39) {
             return _ref21.apply(this, arguments);
         };
     }();

package/package.json

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

package/src/como.js

@@ -115,11 +115,10 @@ class Como {
                 //refresh failed - need to revoke and signOn again
                 initService.logError({method: 'refreshToken', installationId, locationId, source, refreshToken, error :  e.message});
                 refreshFailed = true;
-                credExist = false;
             }
         }
         let interval = 0;
-        if(!credExist){
+        if(refreshFailed || !credExist){
             while(!credExist && interval < 3000){
                 try{
                     const data = await this.comoData.initApi.signOn(installationId, locationId, source);
@@ -135,7 +134,7 @@ class Como {
         }
         else if(!isExpired){
             let signOnSuccessfully = false;
-            while (!signOnSuccessfully && interval < 3000) {
+            while(!signOnSuccessfully && interval < 3000){
                 try{
                     console.log(`signOn with installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}`);
                     const data = await this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
@@ -349,11 +348,13 @@ class Como {
      * @param {Object} identifier an object which identifies the user by its credentials
      * @param {string} type login type i.e PhoneNumber/Email/etc
      * @param {reCaptchaToken} reCaptcha token for login chalenge
+     * @param {recaptchaTokenType} recaptcha token type - score/human
+     * @param {devicePlatform} device platform i.e. ios/android
      */
-    async login(identifier, type, reCaptchaToken) {
+    async login(identifier, type, reCaptchaToken, recaptchaTokenType, devicePlatform) {
         const { api } = this.comoData;
         try {
-            const data = await api.logIn(type, identifier, reCaptchaToken);
+            const data = await api.logIn(type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform);
             return data;
         } catch (error) {
             if (error.response && error.response.data) {
@@ -370,11 +371,13 @@ class Como {
      * @param {*} type login type i.e PhoneNumber/Email/etc
      * @param {*} code a 2-factor verification code sent to the client
      * @param {reCaptchaToken} reCaptcha token for login challenge
+     * @param {recaptchaTokenType} recaptcha token type - score/human
+     * @param {devicePlatform} device platform i.e. ios/android
      */
-    async loginVerify(identifier, type, code, reCaptchaToken) {
+    async loginVerify(identifier, type, code, reCaptchaToken, recaptchaTokenType, devicePlatform) {
         const { api } = this.comoData;
         try {
-            const { consent } = await api.logInVerify(code, type, identifier, reCaptchaToken);
+            const { consent } = await api.logInVerify(code, type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform);
             this.comoData.consent = consent;
         } catch (error) {
             if (error.response && error.response.data) {
@@ -687,10 +690,10 @@ class Como {
      */
     getCredentials() {
         const {
-            accessToken, refreshToken, expiresIn, consent, locationId
+            accessToken, refreshToken, expiresIn, consent, locationId, recaptchaConfig,
         } = this.comoData;
         return {
-            accessToken, refreshToken, expiresIn, consent, locationId
+            accessToken, refreshToken, expiresIn, consent, locationId, recaptchaConfig,
         };
     }
 
@@ -720,7 +723,7 @@ class Como {
     /**
      * Return service recaptch config
      */
-    getRecaptchaConfig() { return {reCaptchaSiteKey: this.comoData.reCaptchaSiteKey, baseUrl: this.comoData.env_params.gateway } }
+    getRecaptchaConfig() { return { reCaptchaSiteKey: this.comoData.reCaptchaSiteKey, baseUrl: this.comoData.env_params.gateway, recaptchaConfig: this.comoData.recaptchaConfig } }
 
     /**
      * Returns the location specific registration web url