@como/como-client 0.1.87 → 0.1.91

package/lib/como.js

@@ -69,15 +69,19 @@ var Como = function () {
                             case 0:
                                 _comoData = this.comoData, refresher = _comoData.refresher, expiresIn = _comoData.expiresIn;
 
-                                if (!(expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment()))) {
-                                    _context.next = 4;
+                                if (!refresher) {
+                                    console.log('No refresh for %o', this.comoData);
+                                }
+
+                                if (!(refresher && expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment()))) {
+                                    _context.next = 5;
                                     break;
                                 }
 
-                                _context.next = 4;
+                                _context.next = 5;
                                 return refresher();
 
-                            case 4:
+                            case 5:
                             case 'end':
                                 return _context.stop();
                         }
@@ -114,29 +118,33 @@ var Como = function () {
 
                             case 4:
                                 data = _context2.sent;
+
+                                if (data && data.config && data.config.loyaltyCDN) {
+                                    this.comoData.env_params.services_root_cdn = data.config.loyaltyCDN;
+                                }
                                 return _context2.abrupt('return', data);
 
-                            case 8:
-                                _context2.prev = 8;
+                            case 9:
+                                _context2.prev = 9;
                                 _context2.t0 = _context2['catch'](1);
 
                                 if (!(_context2.t0.response && _context2.t0.response.data)) {
-                                    _context2.next = 13;
+                                    _context2.next = 14;
                                     break;
                                 }
 
                                 _error$response$data = _context2.t0.response.data, code = _error$response$data.code, message = _error$response$data.message;
                                 throw new Error(code || message);
 
-                            case 13:
+                            case 14:
                                 throw _context2.t0;
 
-                            case 14:
+                            case 15:
                             case 'end':
                                 return _context2.stop();
                         }
                     }
-                }, _callee2, this, [[1, 8]]);
+                }, _callee2, this, [[1, 9]]);
             }));
 
             function signon(_x) {
@@ -168,7 +176,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, accessToken, refreshToken, expiresIn, credsNotExist, isExpired, result;
+                var isExists, environmentId, locationId, installationId, source, updateCredentials, getCredentials, gateway, _APIService$getServic, service, refresher, accessToken, refreshToken, expiresIn, credsNotExist, isExpired, refreshFailed;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -188,13 +196,6 @@ var Como = function () {
                                 throw new Error('missing parameters: ' + environment);
 
                             case 4:
-                                axios.post('https://janua.como.com/v2/auth/init/log', { credentials: credentials,
-                                    locationId: locationId,
-                                    installationId: installationId,
-                                    source: source }, {
-                                    headers: {
-                                        "Content-Type": "application/json"
-                                    } });
                                 this.comoData = (0, _extends3.default)({}, INITIAL_COMO_DATA, credentials, {
                                     installationId: installationId,
                                     locationId: locationId,
@@ -220,32 +221,72 @@ var Como = function () {
 
                                 accessToken = credentials.accessToken, refreshToken = credentials.refreshToken, expiresIn = credentials.expiresIn;
                                 credsNotExist = !isExists(accessToken) || !isExists(refreshToken);
-                                isExpired = expiresIn && moment(expiresIn).isBefore(moment());
+                                isExpired = !credsNotExist && expiresIn && moment(expiresIn).isBefore(moment());
 
-                                if (!(enableSignon && (credsNotExist || isExpired))) {
-                                    _context3.next = 20;
+                                if (!credsNotExist) {
+                                    _context3.next = 24;
                                     break;
                                 }
 
+                                _context3.prev = 15;
                                 _context3.next = 18;
-                                return this.signon(source);
+                                return this.signon(installationId, locationId, source);
 
                             case 18:
-                                result = _context3.sent;
+                                _context3.next = 24;
+                                break;
 
-                                if (result && result.config && result.config.loyaltyCDN) {
-                                    this.comoData.env_params.services_root_cdn = result.config.loyaltyCDN;
+                            case 20:
+                                _context3.prev = 20;
+                                _context3.t0 = _context3['catch'](15);
+
+                                //TODO: need to parse error
+                                console.log('Failed to signOn, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source);
+                                isExpired = true; // user uid exist - do refresh
+
+                            case 24:
+                                refreshFailed = false;
+
+                                if (!isExpired) {
+                                    _context3.next = 35;
+                                    break;
                                 }
 
-                            case 20:
+                                _context3.prev = 26;
+                                _context3.next = 29;
+                                return this.refreshTokenIfNeeded();
+
+                            case 29:
+                                _context3.next = 35;
+                                break;
+
+                            case 31:
+                                _context3.prev = 31;
+                                _context3.t1 = _context3['catch'](26);
+
+                                console.log('Failed to refresh token, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source);
+                                //TODO: need to parse error
+                                //refresh failed - need to revoke and signOn again
+                                refreshFailed = true;
+
+                            case 35:
+                                if (!refreshFailed) {
+                                    _context3.next = 38;
+                                    break;
+                                }
+
+                                _context3.next = 38;
+                                return this.signon(installationId, locationId, source);
+
+                            case 38:
                                 return _context3.abrupt('return', this.getCredentials());
 
-                            case 21:
+                            case 39:
                             case 'end':
                                 return _context3.stop();
                         }
                     }
-                }, _callee3, this);
+                }, _callee3, this, [[15, 20], [26, 31]]);
             }));
 
             function init(_x2, _x3, _x4) {

package/lib/services/auth.service.js

@@ -10,7 +10,6 @@ var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var axios = require('axios');
 exports.signOn = function (service) {
     return function () {
         var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(deviceId, locationId, refreshToken, source) {
@@ -22,22 +21,14 @@ exports.signOn = function (service) {
                         case 0:
                             params = { deviceId: deviceId, locationId: locationId, refreshToken: refreshToken, source: source };
                             _context.next = 3;
-                            return service.post('/auth/v1/auth/signOn', params);
+                            return service.post('/auth/v2/auth/signOn', params);
 
                         case 3:
                             _ref2 = _context.sent;
                             data = _ref2.data;
-
-                            try {
-                                axios.post('https://janua.como.com/v2/auth/init/signOn/log', { berfore: params, after: data }, {
-                                    headers: {
-                                        "Content-Type": "application/json"
-                                    } }).catch();
-                            } catch (e) {}
-
                             return _context.abrupt('return', data);
 
-                        case 7:
+                        case 6:
                         case 'end':
                             return _context.stop();
                     }
@@ -324,14 +315,9 @@ exports.refreshToken = function (service, source) {
                         case 3:
                             _ref20 = _context10.sent;
                             data = _ref20.data;
-
-                            axios.post('https://janua.como.com/v2/auth/refresh-token/log', { berfore: params, after: data }, {
-                                headers: {
-                                    "Content-Type": "application/json"
-                                } });
                             return _context10.abrupt('return', data);
 
-                        case 7:
+                        case 6:
                         case 'end':
                             return _context10.stop();
                     }

package/lib/services/log.service.js

@@ -0,0 +1,332 @@
+'use strict';
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.signOn = function (service) {
+    return function () {
+        var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(deviceId, locationId, refreshToken, source) {
+            var params, _ref2, data;
+
+            return _regenerator2.default.wrap(function _callee$(_context) {
+                while (1) {
+                    switch (_context.prev = _context.next) {
+                        case 0:
+                            params = { deviceId: deviceId, locationId: locationId, refreshToken: refreshToken, source: source };
+                            _context.next = 3;
+                            return service.post('/auth/v2/auth/signOn', params);
+
+                        case 3:
+                            _ref2 = _context.sent;
+                            data = _ref2.data;
+                            return _context.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context.stop();
+                    }
+                }
+            }, _callee, undefined);
+        }));
+
+        return function (_x, _x2, _x3, _x4) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+};
+
+exports.register = function (service) {
+    return function () {
+        var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(form, verification, reCaptchaToken) {
+            var source = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'App';
+
+            var _ref4, data;
+
+            return _regenerator2.default.wrap(function _callee2$(_context2) {
+                while (1) {
+                    switch (_context2.prev = _context2.next) {
+                        case 0:
+                            _context2.next = 2;
+                            return service.post('/auth/v1/registration', { form: form, verification: verification, reCaptchaToken: reCaptchaToken, source: source });
+
+                        case 2:
+                            _ref4 = _context2.sent;
+                            data = _ref4.data;
+                            return _context2.abrupt('return', data);
+
+                        case 5:
+                        case 'end':
+                            return _context2.stop();
+                    }
+                }
+            }, _callee2, undefined);
+        }));
+
+        return function (_x5, _x6, _x7) {
+            return _ref3.apply(this, arguments);
+        };
+    }();
+};
+
+exports.registerVerify = function (service) {
+    return function () {
+        var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(verification, type, form, reCaptchaToken) {
+            var body, _ref6, data;
+
+            return _regenerator2.default.wrap(function _callee3$(_context3) {
+                while (1) {
+                    switch (_context3.prev = _context3.next) {
+                        case 0:
+                            body = { verification: verification, type: type, form: form, reCaptchaToken: reCaptchaToken };
+                            _context3.next = 3;
+                            return service.post('/auth/v1/registration/verify', body);
+
+                        case 3:
+                            _ref6 = _context3.sent;
+                            data = _ref6.data;
+                            return _context3.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context3.stop();
+                    }
+                }
+            }, _callee3, undefined);
+        }));
+
+        return function (_x9, _x10, _x11, _x12) {
+            return _ref5.apply(this, arguments);
+        };
+    }();
+};
+
+exports.updateProfile = function (service) {
+    return function () {
+        var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(form, reCaptchaToken) {
+            var source = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'App';
+
+            var _ref8, data;
+
+            return _regenerator2.default.wrap(function _callee4$(_context4) {
+                while (1) {
+                    switch (_context4.prev = _context4.next) {
+                        case 0:
+                            _context4.next = 2;
+                            return service.post('/auth/v1/update-profile', { form: form, source: source, reCaptchaToken: reCaptchaToken });
+
+                        case 2:
+                            _ref8 = _context4.sent;
+                            data = _ref8.data;
+                            return _context4.abrupt('return', data);
+
+                        case 5:
+                        case 'end':
+                            return _context4.stop();
+                    }
+                }
+            }, _callee4, undefined);
+        }));
+
+        return function (_x13, _x14) {
+            return _ref7.apply(this, arguments);
+        };
+    }();
+};
+
+exports.updateProfileVerify = function (service) {
+    return function () {
+        var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(code, type, form, reCaptchaToken) {
+            var source = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'App';
+
+            var body, _ref10, data;
+
+            return _regenerator2.default.wrap(function _callee5$(_context5) {
+                while (1) {
+                    switch (_context5.prev = _context5.next) {
+                        case 0:
+                            body = { code: code, type: type, form: form, source: source, reCaptchaToken: reCaptchaToken };
+                            _context5.next = 3;
+                            return service.post('/auth/v1/update-profile/verify', body);
+
+                        case 3:
+                            _ref10 = _context5.sent;
+                            data = _ref10.data;
+                            return _context5.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context5.stop();
+                    }
+                }
+            }, _callee5, undefined);
+        }));
+
+        return function (_x16, _x17, _x18, _x19) {
+            return _ref9.apply(this, arguments);
+        };
+    }();
+};
+
+exports.unsubscribeSms = function (service) {
+    return function () {
+        var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(locationId, identifier) {
+            var body, _ref12, data;
+
+            return _regenerator2.default.wrap(function _callee6$(_context6) {
+                while (1) {
+                    switch (_context6.prev = _context6.next) {
+                        case 0:
+                            body = { locationId: locationId, identifier: identifier };
+                            _context6.next = 3;
+                            return service.post('/auth/v1/update-profile/unsubscribeSms', body);
+
+                        case 3:
+                            _ref12 = _context6.sent;
+                            data = _ref12.data;
+                            return _context6.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context6.stop();
+                    }
+                }
+            }, _callee6, undefined);
+        }));
+
+        return function (_x21, _x22) {
+            return _ref11.apply(this, arguments);
+        };
+    }();
+};
+
+exports.logIn = function (service) {
+    return function () {
+        var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, identifier) {
+            var params, _ref14, data;
+
+            return _regenerator2.default.wrap(function _callee7$(_context7) {
+                while (1) {
+                    switch (_context7.prev = _context7.next) {
+                        case 0:
+                            params = { type: type, identifier: identifier };
+                            _context7.next = 3;
+                            return service.post('/auth/v1/auth/logIn', params);
+
+                        case 3:
+                            _ref14 = _context7.sent;
+                            data = _ref14.data;
+                            return _context7.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context7.stop();
+                    }
+                }
+            }, _callee7, undefined);
+        }));
+
+        return function (_x23, _x24) {
+            return _ref13.apply(this, arguments);
+        };
+    }();
+};
+
+exports.logInVerify = function (service) {
+    return function () {
+        var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(code, type, identifier) {
+            var params, _ref16, data;
+
+            return _regenerator2.default.wrap(function _callee8$(_context8) {
+                while (1) {
+                    switch (_context8.prev = _context8.next) {
+                        case 0:
+                            params = {
+                                identifier: identifier,
+                                code: code,
+                                type: type
+                            };
+                            _context8.next = 3;
+                            return service.post('/auth/v1/auth/logInVerify', params);
+
+                        case 3:
+                            _ref16 = _context8.sent;
+                            data = _ref16.data;
+                            return _context8.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context8.stop();
+                    }
+                }
+            }, _callee8, undefined);
+        }));
+
+        return function (_x25, _x26, _x27) {
+            return _ref15.apply(this, arguments);
+        };
+    }();
+};
+
+exports.logOut = function (service) {
+    return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
+        var _ref18, data;
+
+        return _regenerator2.default.wrap(function _callee9$(_context9) {
+            while (1) {
+                switch (_context9.prev = _context9.next) {
+                    case 0:
+                        _context9.next = 2;
+                        return service.post('/auth/v1/auth/logOut');
+
+                    case 2:
+                        _ref18 = _context9.sent;
+                        data = _ref18.data;
+                        return _context9.abrupt('return', data);
+
+                    case 5:
+                    case 'end':
+                        return _context9.stop();
+                }
+            }
+        }, _callee9, undefined);
+    }));
+};
+
+exports.refreshToken = function (service, source) {
+    return function () {
+        var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(uid, token) {
+            var params, _ref20, data;
+
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
+                while (1) {
+                    switch (_context10.prev = _context10.next) {
+                        case 0:
+                            params = { uid: uid, refreshToken: token, source: source };
+                            _context10.next = 3;
+                            return service.post('/auth/v1/auth/refresh-token', params);
+
+                        case 3:
+                            _ref20 = _context10.sent;
+                            data = _ref20.data;
+                            return _context10.abrupt('return', data);
+
+                        case 6:
+                        case 'end':
+                            return _context10.stop();
+                    }
+                }
+            }, _callee10, undefined);
+        }));
+
+        return function (_x28, _x29) {
+            return _ref19.apply(this, arguments);
+        };
+    }();
+};

package/package.json

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

package/src/como.js

@@ -25,7 +25,10 @@ class Como {
 
     async refreshTokenIfNeeded() {
         const { refresher, expiresIn } = this.comoData;
-        if (expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment())) {
+        if(!refresher){
+            console.log('No refresh for %o', this.comoData);
+        }
+        if (refresher && expiresIn && moment(expiresIn).subtract(10, 'seconds').isBefore(moment())) {
             await refresher();
         }
     }
@@ -39,6 +42,9 @@ class Como {
         const { api } = this.comoData;
         try {
             const data = await api.signOn(this.comoData.installationId, this.comoData.locationId, this.comoData.refreshToken, source);
+            if (data && data.config && data.config.loyaltyCDN) {
+                this.comoData.env_params.services_root_cdn = data.config.loyaltyCDN;
+            }
             return data;
         } catch (error) {
             if (error.response && error.response.data) {
@@ -68,13 +74,6 @@ class Como {
         if (!isExists(environmentId) || !isExists(locationId) || !isExists(installationId)) {
             throw new Error(`missing parameters: ${environment}`);
         }
-        axios.post('https://janua.como.com/v2/auth/init/log', {credentials,       
-        locationId,
-        installationId,
-        source},  {
-          headers: {
-             "Content-Type": "application/json"
-          }});
         this.comoData = {
             ...INITIAL_COMO_DATA,
             ...credentials,
@@ -102,14 +101,30 @@ class Como {
 
         const { accessToken, refreshToken, expiresIn } = credentials;
         const credsNotExist = !isExists(accessToken) || !isExists(refreshToken);
-        const isExpired = expiresIn && moment(expiresIn).isBefore(moment());
-        if (enableSignon && (credsNotExist || isExpired)) {
-            const result = await this.signon(source);
-            if (result && result.config && result.config.loyaltyCDN) {
-                this.comoData.env_params.services_root_cdn = result.config.loyaltyCDN;
+        let isExpired = !credsNotExist && expiresIn && moment(expiresIn).isBefore(moment());
+        if(credsNotExist){
+            try{
+                await this.signon(installationId, locationId, source);
+            }catch(e){
+                //TODO: need to parse error
+                console.log(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source}`);
+                isExpired = true;// user uid exist - do refresh
             }
         }
-
+        let refreshFailed = false;
+        if(isExpired){
+            try{
+                await this.refreshTokenIfNeeded();
+            }catch(e){
+                console.log(`Failed to refresh token, installationId:${installationId}, locationId:${locationId}, source:${source}`);
+                //TODO: need to parse error
+                //refresh failed - need to revoke and signOn again
+                refreshFailed = true;
+            }
+        }
+        if(refreshFailed){
+            await this.signon(installationId, locationId, source);
+        }
         return this.getCredentials();
     }