@como/como-client 0.8.6 → 0.8.8

package/lib/services/auth.service.js

@@ -265,28 +265,25 @@ exports.unsubscribeSms = function (service) {
     }();
 };
 
-exports.logIn = function (service) {
+exports.unsubscribeWhatsapp = function (service) {
     return function () {
-        var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform) {
-            var params, headers, _ref16, data;
+        var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(locationId, identifier) {
+            var body, _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, recaptchaTokenType: recaptchaTokenType, devicePlatform: devicePlatform
-                            };
-                            headers = getHashHeader(params);
-                            _context8.next = 4;
-                            return service.post('/auth/v4/auth/logIn', params, { headers: headers });
+                            body = { locationId: locationId, identifier: identifier };
+                            _context8.next = 3;
+                            return service.post('/auth/v1/update-profile/unsubscribeWhatsapp', body);
 
-                        case 4:
+                        case 3:
                             _ref16 = _context8.sent;
                             data = _ref16.data;
                             return _context8.abrupt("return", data);
 
-                        case 7:
+                        case 6:
                         case "end":
                             return _context8.stop();
                     }
@@ -294,15 +291,15 @@ exports.logIn = function (service) {
             }, _callee8, undefined);
         }));
 
-        return function (_x25, _x26, _x27, _x28, _x29) {
+        return function (_x25, _x26) {
             return _ref15.apply(this, arguments);
         };
     }();
 };
 
-exports.logInVerify = function (service) {
+exports.logIn = function (service) {
     return function () {
-        var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(code, type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform) {
+        var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform) {
             var params, headers, _ref18, data;
 
             return _regenerator2.default.wrap(function _callee9$(_context9) {
@@ -310,16 +307,11 @@ exports.logInVerify = function (service) {
                     switch (_context9.prev = _context9.next) {
                         case 0:
                             params = {
-                                identifier: identifier,
-                                code: code,
-                                type: type,
-                                reCaptchaToken: reCaptchaToken,
-                                recaptchaTokenType: recaptchaTokenType,
-                                devicePlatform: devicePlatform
+                                type: type, identifier: identifier, reCaptchaToken: reCaptchaToken, recaptchaTokenType: recaptchaTokenType, devicePlatform: devicePlatform
                             };
                             headers = getHashHeader(params);
                             _context9.next = 4;
-                            return service.post('/auth/v4/auth/logInVerify', params, { headers: headers });
+                            return service.post('/auth/v4/auth/logIn', params, { headers: headers });
 
                         case 4:
                             _ref18 = _context9.sent;
@@ -334,66 +326,106 @@ exports.logInVerify = function (service) {
             }, _callee9, undefined);
         }));
 
-        return function (_x30, _x31, _x32, _x33, _x34, _x35) {
+        return function (_x27, _x28, _x29, _x30, _x31) {
             return _ref17.apply(this, arguments);
         };
     }();
 };
 
+exports.logInVerify = function (service) {
+    return function () {
+        var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(code, type, identifier, reCaptchaToken, recaptchaTokenType, devicePlatform) {
+            var params, headers, _ref20, data;
+
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
+                while (1) {
+                    switch (_context10.prev = _context10.next) {
+                        case 0:
+                            params = {
+                                identifier: identifier,
+                                code: code,
+                                type: type,
+                                reCaptchaToken: reCaptchaToken,
+                                recaptchaTokenType: recaptchaTokenType,
+                                devicePlatform: devicePlatform
+                            };
+                            headers = getHashHeader(params);
+                            _context10.next = 4;
+                            return service.post('/auth/v4/auth/logInVerify', params, { headers: headers });
+
+                        case 4:
+                            _ref20 = _context10.sent;
+                            data = _ref20.data;
+                            return _context10.abrupt("return", data);
+
+                        case 7:
+                        case "end":
+                            return _context10.stop();
+                    }
+                }
+            }, _callee10, undefined);
+        }));
+
+        return function (_x32, _x33, _x34, _x35, _x36, _x37) {
+            return _ref19.apply(this, arguments);
+        };
+    }();
+};
+
 exports.logOut = function (service) {
-    return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
-        var _ref20, data;
+    return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
+        var _ref22, data;
 
-        return _regenerator2.default.wrap(function _callee10$(_context10) {
+        return _regenerator2.default.wrap(function _callee11$(_context11) {
             while (1) {
-                switch (_context10.prev = _context10.next) {
+                switch (_context11.prev = _context11.next) {
                     case 0:
-                        _context10.next = 2;
+                        _context11.next = 2;
                         return service.post('/auth/v1/auth/logOut');
 
                     case 2:
-                        _ref20 = _context10.sent;
-                        data = _ref20.data;
-                        return _context10.abrupt("return", data);
+                        _ref22 = _context11.sent;
+                        data = _ref22.data;
+                        return _context11.abrupt("return", data);
 
                     case 5:
                     case "end":
-                        return _context10.stop();
+                        return _context11.stop();
                 }
             }
-        }, _callee10, undefined);
+        }, _callee11, undefined);
     }));
 };
 
 exports.refreshToken = function (service) {
     return function () {
-        var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(uid, token, locationId, source) {
-            var params, headers, _ref22, data;
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(uid, token, locationId, source) {
+            var params, headers, _ref24, data;
 
-            return _regenerator2.default.wrap(function _callee11$(_context11) {
+            return _regenerator2.default.wrap(function _callee12$(_context12) {
                 while (1) {
-                    switch (_context11.prev = _context11.next) {
+                    switch (_context12.prev = _context12.next) {
                         case 0:
                             params = { uid: uid, refreshToken: token, locationId: locationId, source: source };
                             headers = getHashHeader(params);
-                            _context11.next = 4;
+                            _context12.next = 4;
                             return service.post('/auth/v2/auth/refresh-token', params, { headers: headers });
 
                         case 4:
-                            _ref22 = _context11.sent;
-                            data = _ref22.data;
-                            return _context11.abrupt("return", data);
+                            _ref24 = _context12.sent;
+                            data = _ref24.data;
+                            return _context12.abrupt("return", data);
 
                         case 7:
                         case "end":
-                            return _context11.stop();
+                            return _context12.stop();
                     }
                 }
-            }, _callee11, undefined);
+            }, _callee12, undefined);
         }));
 
-        return function (_x36, _x37, _x38, _x39) {
-            return _ref21.apply(this, arguments);
+        return function (_x38, _x39, _x40, _x41) {
+            return _ref23.apply(this, arguments);
         };
     }();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@como/como-client",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "Client module for Como's loaylty API",
   "main": "src/como.js",
   "scripts": {
@@ -26,12 +26,12 @@
   },
   "homepage": "https://github.com/ConduitMobileRND/como-client-lib#readme",
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": "^0.30.2",
     "chai": "^4.1.2",
     "json-stable-stringify": "1.0.1",
     "jssha": "^3.2.0",
     "mocha": "^5.2.0",
-    "moment-timezone": "^0.5.17",
+    "moment-timezone": "^0.5.35",
     "ramda": "^0.25.0"
   },
   "devDependencies": {
@@ -50,4 +50,4 @@
     "webpack": "^4.8.3",
     "webpack-cli": "^2.1.4"
   }
-}
+}

package/src/como.js

@@ -25,7 +25,7 @@ class Como {
 
     async refreshTokenIfNeeded() {
         const { refresher, expiresIn } = this.comoData;
-        if(!refresher){
+        if (!refresher) {
             console.log('No refresh for %o', this.comoData);
         }
         else if (expiresIn && moment(expiresIn).subtract(60, 'seconds').isBefore(moment())) {
@@ -107,61 +107,61 @@ class Como {
         let credExist = isExists(accessToken) && isExists(refreshToken);
         let isExpired = credExist && expiresIn && moment(expiresIn).isBefore(moment());
         let refreshFailed = false;
-        if(isExpired){
-            try{
-                const data = await this.comoData.initApi.refreshToken(installationId, refreshToken?  refreshToken: 'none', locationId, source);
+        if (isExpired) {
+            try {
+                const data = await this.comoData.initApi.refreshToken(installationId, refreshToken ? refreshToken : 'none', locationId, source);
                 this.comoData.config = data.config;
                 console.log(`signOn with isExpired true result:${JSON.stringify(data)}`);
                 updateCredentials(data, true);
-            }catch(e){
+            } catch (e) {
                 console.error(`Failed to refresh token, installationId:${installationId}, refreshToken:${this.comoData.refreshToken}, locationId:${locationId}, source:${source}`);
                 //refresh failed - need to revoke and signOn again
-                initService.logError({method: 'refreshToken', installationId, locationId, source, refreshToken, error :  e.message});
+                initService.logError({ method: 'refreshToken', installationId, locationId, source, refreshToken, error: e.message });
                 refreshFailed = true;
             }
         }
         let interval = 0;
-        if(refreshFailed || !credExist){
-            while(!credExist && interval < 3000){
-                try{
+        if (refreshFailed || !credExist) {
+            while (!credExist && interval < 3000) {
+                try {
                     const data = await this.comoData.initApi.signOn(installationId, locationId, source);
                     this.comoData.config = data.config;
                     console.log(`signOn with refreshFailed result:${JSON.stringify(data)}`);
                     updateCredentials(data, true);
                     credExist = true;
-                }catch(e){
+                } catch (e) {
                     console.error(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source},interval:${interval}, error:${e}`);
                     interval += 1000;
-                    initService.logError({method: 'signOn no accessToken', accessToken, isExpired, refreshFailed , credExist, installationId, locationId, source, refreshToken, interval, error :  e.message});
+                    initService.logError({ method: 'signOn no accessToken', accessToken, isExpired, refreshFailed, credExist, installationId, locationId, source, refreshToken, interval, error: e.message });
                     await new Promise(r => setTimeout(r, interval));
                 }
             }
         }
-        else if(!isExpired){
+        else if (!isExpired) {
             let signOnSuccessfully = false;
-            while(!signOnSuccessfully && interval < 3000){
-                try{
+            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);
                     this.comoData.config = data.config;
                     console.log(`signOn with result " ${JSON.stringify(data)}`);
-                    if(data && data.accessToken){
+                    if (data && data.accessToken) {
                         console.log(`signOn- updating credentials`);
                         updateCredentials(data, true);
                     }
-                    if(data && data.config && data.config.recaptchaSiteKey){
+                    if (data && data.config && data.config.recaptchaSiteKey) {
                         this.comoData.reCaptchaSiteKey = data.config.recaptchaSiteKey;
                     }
                     signOnSuccessfully = true;
-                }catch(e){
+                } catch (e) {
                     console.error(`Failed signOn with accessToken, installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}, error:${e.message}`);
                     interval += 1000;
-                    initService.logError({method: 'signOn with credentials', accessToken, isExpired, refreshFailed , credExist, installationId, locationId, source, refreshToken, interval, error :  e.message});
+                    initService.logError({ method: 'signOn with credentials', accessToken, isExpired, refreshFailed, credExist, installationId, locationId, source, refreshToken, interval, error: e.message });
                     await new Promise(r => setTimeout(r, interval));
                 }
             }
         }
-        if(!this.comoData.token){
+        if (!this.comoData.token) {
             this.comoData.token = this.comoData.accessToken;
         }
         return this.getCredentials();
@@ -349,6 +349,26 @@ class Como {
         }
     }
 
+    /**
+     *
+     * @param {string} unsubscribeWhatsapp unsubscribe user at location
+     * @param {string} PhoneNumber phone number to identify user
+     */
+    async unsubscribeWhatsapp(PhoneNumber) {
+        const { api, locationId } = this.comoData;
+        try {
+            const identifier = { PhoneNumber };
+            const data = await api.unsubscribeWhatsapp(locationId, identifier);
+            return data;
+        } catch (error) {
+            if (error.response && error.response.data) {
+                const { code, message } = error.response.data;
+                throw new Error(code || message);
+            }
+            throw error;
+        }
+    }
+
     /**
      *
      * @param {Object} identifier an object which identifies the user by its credentials
@@ -433,10 +453,10 @@ class Como {
         const {
             api, locationId, token, env_params: env,
         } = this.comoData;
-        try{
+        try {
             return api.clientUpdateMembership(env.services_root, locationId, pushEnable, locationEnable);
         }
-        catch(e){
+        catch (e) {
             console.log(`clientUpdateMembership failed, token:${token}, locationId:${locationId}, error: ${e}`);
 
         }
@@ -448,13 +468,13 @@ class Como {
      */
 
     async downloadMainResource(resourceId) {
-        try{
+        try {
             const resource = this.comoData.mainResourcesMap[resourceId];
             if (!resource) {
                 const err = `resource ${resourceId} not found!`;
                 throw new Error(err);
             }
-    
+
             const { env_params: env, api } = this.comoData;
             const responseJson = await api.getLoyaltyResource(
                 env.services_root_cdn,
@@ -463,9 +483,9 @@ class Como {
                 resource.Version,
                 this.comoData.locationId
             );
-    
+
             this.comoData.mainResources[resourceId] = responseJson;
-        }catch(e){
+        } catch (e) {
             console.log(`downloadMainResource failed, resourceId:${resourceId}, locationId:${this.comoData.locationId}, this.comoData.mainResourcesMap: ${this.comoData.mainResourcesMap}, error: ${e}`);
             throw new Error(e);
         }
@@ -783,9 +803,9 @@ class Como {
         return `${env.app_modules_root}/login?token=${token}&locationid=${locationId}`;
     }
 
-     /**
-     * Returns the location data Portability url
-     */
+    /**
+    * Returns the location data Portability url
+    */
     async getDataPortabilityUrl(url, overrides) {
         await this.refreshTokenIfNeeded();
         const {