@como/como-client 0.6.7 → 0.7.1

package/lib/como.js

@@ -1,13 +1,13 @@
 '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 _promise = require('babel-runtime/core-js/promise');
+
+var _promise2 = _interopRequireDefault(_promise);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -223,13 +223,13 @@ var Como = function () {
                                 interval = 0;
 
                                 if (!(refreshFailed || !credExist)) {
-                                    _context2.next = 48;
+                                    _context2.next = 51;
                                     break;
                                 }
 
                             case 31:
                                 if (!(!credExist && interval < 3000)) {
-                                    _context2.next = 48;
+                                    _context2.next = 49;
                                     break;
                                 }
 
@@ -242,34 +242,56 @@ var Como = function () {
 
                                 updateCredentials(_data, true);
                                 credExist = true;
-                                _context2.next = 46;
+                                _context2.next = 47;
                                 break;
 
                             case 40:
                                 _context2.prev = 40;
                                 _context2.t1 = _context2['catch'](32);
 
-                                console.log('Failed to signOn, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ', error:' + _context2.t1);
-                                initService.logError({ method: 'signOn', installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval });
-
+                                console.log('Failed to signOn, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',interval:' + interval + ', error:' + _context2.t1);
                                 interval += 1000;
-                                setTimeout(function () {
-                                    console.log('waking for another try of signOn, interval: ' + interval + ', installationId:' + installationId + ', locationId:' + locationId + ', source:' + source);
-                                }, interval);
+                                initService.logError({ method: 'signOn', installationId: installationId, locationId: locationId, source: source, refreshToken: refreshToken, interval: interval });
+                                _context2.next = 47;
+                                return new _promise2.default(function (r) {
+                                    return setTimeout(r, interval);
+                                });
 
-                            case 46:
+                            case 47:
                                 _context2.next = 31;
                                 break;
 
-                            case 48:
+                            case 49:
+                                _context2.next = 59;
+                                break;
+
+                            case 51:
+                                _context2.prev = 51;
+                                _context2.next = 54;
+                                return this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
+
+                            case 54:
+                                _context2.next = 59;
+                                break;
+
+                            case 56:
+                                _context2.prev = 56;
+                                _context2.t2 = _context2['catch'](51);
+
+                                console.log('Failed signOn with accessToken, installationId:' + installationId + ', locationId:' + locationId + ', source:' + source + ',accessToken:' + accessToken + ', error:' + _context2.t2);
+
+                            case 59:
+                                if (!this.comoData.token) {
+                                    this.comoData.token = this.comoData.accessToken;
+                                }
                                 return _context2.abrupt('return', this.getCredentials());
 
-                            case 49:
+                            case 61:
                             case 'end':
                                 return _context2.stop();
                         }
                     }
-                }, _callee2, this, [[17, 24], [32, 40]]);
+                }, _callee2, this, [[17, 24], [32, 40], [51, 56]]);
             }));
 
             function init(_x, _x2, _x3) {
@@ -885,14 +907,21 @@ var Como = function () {
                         switch (_context14.prev = _context14.next) {
                             case 0:
                                 _comoData7 = this.comoData, api = _comoData7.api, locationId = _comoData7.locationId, token = _comoData7.token, env = _comoData7.env_params;
+                                _context14.prev = 1;
                                 return _context14.abrupt('return', api.clientUpdateMembership(env.services_root, token, locationId, pushEnable, locationEnable));
 
-                            case 2:
+                            case 5:
+                                _context14.prev = 5;
+                                _context14.t0 = _context14['catch'](1);
+
+                                console.log('clientUpdateMembership failed, token:' + token + ', locationId:' + locationId + ', error: ' + _context14.t0);
+
+                            case 8:
                             case 'end':
                                 return _context14.stop();
                         }
                     }
-                }, _callee14, this);
+                }, _callee14, this, [[1, 5]]);
             }));
 
             function clientUpdateMembership(_x35, _x36) {
@@ -2238,6 +2267,20 @@ var Como = function () {
 
             return getPurchaseHistory;
         }()
+
+        /**
+         * Get app texts for multi languages - only for apps that has project set in translation service
+         */
+
+    }, {
+        key: 'getAppTextsV2',
+        value: function getAppTextsV2() {
+            var _comoData44 = this.comoData,
+                api = _comoData44.api,
+                locationId = _comoData44.locationId;
+
+            return api.getAllTranslations(locationId);
+        }
     }]);
     return Como;
 }();

package/lib/services/auth.service.js

@@ -27,24 +27,28 @@ function getHashHeader(data) {
 
 exports.signOn = function (service) {
     return function () {
-        var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(deviceId, locationId, source) {
+        var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(deviceId, locationId, source, accessToken) {
             var params, headers, _ref2, data;
 
             return _regenerator2.default.wrap(function _callee$(_context) {
                 while (1) {
                     switch (_context.prev = _context.next) {
                         case 0:
-                            params = { deviceId: deviceId, locationId: locationId, source: source };
+                            params = { deviceId: deviceId, locationId: locationId, source: source, accessToken: accessToken };
                             headers = getHashHeader(params);
-                            _context.next = 4;
+
+                            if (accessToken) {
+                                headers['Authorization'] = "Bearer " + token;
+                            }
+                            _context.next = 5;
                             return service.post('/auth/v2/auth/signOn', params, { headers: headers });
 
-                        case 4:
+                        case 5:
                             _ref2 = _context.sent;
                             data = _ref2.data;
                             return _context.abrupt("return", data);
 
-                        case 7:
+                        case 8:
                         case "end":
                             return _context.stop();
                     }
@@ -52,7 +56,7 @@ exports.signOn = function (service) {
             }, _callee, undefined);
         }));
 
-        return function (_x, _x2, _x3) {
+        return function (_x, _x2, _x3, _x4) {
             return _ref.apply(this, arguments);
         };
     }();
@@ -85,7 +89,7 @@ exports.register = function (service) {
             }, _callee2, undefined);
         }));
 
-        return function (_x4, _x5, _x6) {
+        return function (_x5, _x6, _x7) {
             return _ref3.apply(this, arguments);
         };
     }();
@@ -117,7 +121,7 @@ exports.registerVerify = function (service) {
             }, _callee3, undefined);
         }));
 
-        return function (_x8, _x9, _x10, _x11) {
+        return function (_x9, _x10, _x11, _x12) {
             return _ref5.apply(this, arguments);
         };
     }();
@@ -150,7 +154,7 @@ exports.updateProfile = function (service) {
             }, _callee4, undefined);
         }));
 
-        return function (_x12, _x13) {
+        return function (_x13, _x14) {
             return _ref7.apply(this, arguments);
         };
     }();
@@ -184,7 +188,7 @@ exports.updateProfileVerify = function (service) {
             }, _callee5, undefined);
         }));
 
-        return function (_x15, _x16, _x17, _x18) {
+        return function (_x16, _x17, _x18, _x19) {
             return _ref9.apply(this, arguments);
         };
     }();
@@ -216,7 +220,7 @@ exports.unsubscribeSms = function (service) {
             }, _callee6, undefined);
         }));
 
-        return function (_x20, _x21) {
+        return function (_x21, _x22) {
             return _ref11.apply(this, arguments);
         };
     }();
@@ -249,7 +253,7 @@ exports.logIn = function (service) {
             }, _callee7, undefined);
         }));
 
-        return function (_x22, _x23) {
+        return function (_x23, _x24) {
             return _ref13.apply(this, arguments);
         };
     }();
@@ -286,7 +290,7 @@ exports.logInVerify = function (service) {
             }, _callee8, undefined);
         }));
 
-        return function (_x24, _x25, _x26) {
+        return function (_x25, _x26, _x27) {
             return _ref15.apply(this, arguments);
         };
     }();
@@ -344,7 +348,7 @@ exports.refreshToken = function (service) {
             }, _callee10, undefined);
         }));
 
-        return function (_x27, _x28, _x29, _x30) {
+        return function (_x28, _x29, _x30, _x31) {
             return _ref19.apply(this, arguments);
         };
     }();

package/lib/services/form.service.js

@@ -136,4 +136,36 @@ exports.getZappResource = function (service) {
             return _ref7.apply(this, arguments);
         };
     }();
+};
+
+exports.getAllTranslations = function (service) {
+    return function () {
+        var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(locationId) {
+            var url, _ref10, data;
+
+            return _regenerator2.default.wrap(function _callee5$(_context5) {
+                while (1) {
+                    switch (_context5.prev = _context5.next) {
+                        case 0:
+                            url = "/v1/translation/" + locationId;
+                            _context5.next = 3;
+                            return service.get(url);
+
+                        case 3:
+                            _ref10 = _context5.sent;
+                            data = _ref10.data;
+                            return _context5.abrupt("return", data);
+
+                        case 6:
+                        case "end":
+                            return _context5.stop();
+                    }
+                }
+            }, _callee5, undefined);
+        }));
+
+        return function (_x9) {
+            return _ref9.apply(this, arguments);
+        };
+    }();
 };

package/package.json

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

package/src/como.js

@@ -123,17 +123,25 @@ class Como {
                     updateCredentials(data, true);
                     credExist = true;
                 }catch(e){
-                    console.log(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source}, error:${e}`);
-                    initService.logError({method: 'signOn', installationId, locationId, source, refreshToken, interval});
-
+                    console.log(`Failed to signOn, installationId:${installationId}, locationId:${locationId}, source:${source},interval:${interval}, error:${e}`);
                     interval += 1000;
-                    setTimeout(() => {
-                        console.log(`waking for another try of signOn, interval: ${interval}, installationId:${installationId}, locationId:${locationId}, source:${source}`);
-                    }, interval);
+                    initService.logError({method: 'signOn', installationId, locationId, source, refreshToken, interval});
+                    await new Promise(r => setTimeout(r, interval));
                 }
             }
         }
+        else{
+            try{
+                await this.comoData.initApi.signOn(installationId, locationId, source, accessToken);
+            }catch(e){
+                console.log(`Failed signOn with accessToken, installationId:${installationId}, locationId:${locationId}, source:${source},accessToken:${accessToken}, error:${e}`);
+                
+            }
 
+        }
+        if(!this.comoData.token){
+            this.comoData.token = this.comoData.accessToken;
+        }
         return this.getCredentials();
     }
 
@@ -369,8 +377,13 @@ class Como {
         const {
             api, locationId, token, env_params: env,
         } = this.comoData;
+        try{
+            return api.clientUpdateMembership(env.services_root, token, locationId, pushEnable, locationEnable);
+        }
+        catch(e){
+            console.log(`clientUpdateMembership failed, token:${token}, locationId:${locationId}, error: ${e}`);
 
-        return api.clientUpdateMembership(env.services_root, token, locationId, pushEnable, locationEnable);
+        }
     }
 
     /**
@@ -934,6 +947,14 @@ class Como {
         } = this.comoData;
         return api.getPurchaseHistory(locationId, membership.Key, limit, offset);
     }
+
+    /**
+     * Get app texts for multi languages - only for apps that has project set in translation service
+     */
+     getAppTextsV2() {
+        const { api, locationId } = this.comoData;
+        return api.getAllTranslations(locationId);
+    }
 }
 
 module.exports = Como;