ouisys-engine 3.0.21 → 3.0.22

package/dist/pacman/index.js

@@ -33,8 +33,6 @@ require("core-js/modules/es.string.replace.js");
 
 var _pacmanClient = _interopRequireDefault(require("pacman-client"));
 
-var _uuid = require("uuid");
-
 var _queryString2 = _interopRequireDefault(require("./queryString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -45,6 +43,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var uuid = require('uuid').v1;
+
 var _default = function _default(window, country, page) {
   if (!window) {
     return {
@@ -69,7 +70,7 @@ var _default = function _default(window, country, page) {
   var url = window.pac_analytics ? window.pac_analytics.url : (0, _queryString2.default)(window.location.search, 'pacman-server') || '/analytics';
 
   if (!window.pac_analytics) {
-    var rockmanId = (0, _uuid.v1)().replace(/-/g, '');
+    var rockmanId = uuid().replace(/-/g, '');
     var campaignId = parseInt((0, _queryString2.default)(window.location.search, 'cid'), 10) || 2; // eslint-disable-next-line no-param-reassign
 
     window.pac_analytics = {

package/dist/reducers/pinFlow/utils.js

@@ -190,7 +190,7 @@ function submitMSISDNOnce(_x7, _x8, _x9, _x10) {
 
 function _submitMSISDNOnce() {
   _submitMSISDNOnce = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(window, config, internationalMSISDN, extraParams) {
-    var submissionError, msisdn, rockmanId, supportedSlugs, identifiedUser, slug, country, device, offer, host, search, extraParamsQs, uniqid, result, error, kwCodesWithMcpShied, mcpShieldResult;
+    var submissionError, newExtraParams, isSkipValidation, searchObj, msisdn, rockmanId, supportedSlugs, identifiedUser, slug, country, device, offer, host, search, extraParamsQs, uniqid, result, error, kwCodesWithMcpShied, mcpShieldResult;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -205,8 +205,17 @@ function _submitMSISDNOnce() {
             throw submissionError;
 
           case 4:
-            msisdn = !!extraParams && extraParams['skip-validation'] === '1' // Special case Digital Virgo sents encrypted msisdn we dont need to validate is
-            ? internationalMSISDN : internationalMSISDN.match(/\d+/gi).join(''); // tallyman API expects international msisdn without any special character
+            newExtraParams = extraParams || {};
+            isSkipValidation = false;
+            searchObj = (0, _utils.searchToObject)();
+
+            if ((searchObj === null || searchObj === void 0 ? void 0 : searchObj.success) === 'true' && searchObj['msisdn-alias'] === '1') {
+              // Search param is set to 1 for header enrichment when the msisdn is masked
+              newExtraParams['skip-validation'] = '1';
+              isSkipValidation = true;
+            }
+
+            msisdn = isSkipValidation ? internationalMSISDN : internationalMSISDN.match(/\d+/gi).join(''); // tallyman API expects international msisdn without any special character
 
             rockmanId = window.pac_analytics.visitor.rockmanId; // HARDCODING This for now if the concerpt works we move this to configs
 
@@ -216,14 +225,14 @@ function _submitMSISDNOnce() {
             };
 
             if (!(config.country.toLowerCase() === 'k2' && supportedSlugs[config.slug])) {
-              _context3.next = 12;
+              _context3.next = 16;
               break;
             }
 
-            _context3.next = 10;
+            _context3.next = 14;
             return window.tallymanApi.identify(config.host, config.slug, config.country, msisdn, config.device, config.offer, rockmanId);
 
-          case 10:
+          case 14:
             identifiedUser = _context3.sent;
 
             if (identifiedUser.operator && identifiedUser.operator === 'K2_ZAIN') {
@@ -233,21 +242,21 @@ function _submitMSISDNOnce() {
               config.slug = window.hostSlug;
             }
 
-          case 12:
+          case 16:
             slug = config.slug, country = config.country, device = config.device, offer = config.offer, host = config.host;
             search = window.location.search.indexOf('redirect-back=1') === -1 ? window.location.search.substr(1) || '' : '';
-            extraParamsQs = !extraParams ? '' : "&".concat(Object.keys(extraParams).map(function (k) {
-              return "".concat(k, "=").concat(extraParams[k]);
+            extraParamsQs = "&".concat(Object.keys(newExtraParams).map(function (k) {
+              return "".concat(k, "=").concat(newExtraParams[k]);
             }).join('&'));
             uniqid = !!uniqidResult && uniqidResult !== '' ? "&mcpUniqid=".concat(uniqidResult) : '';
-            _context3.next = 18;
+            _context3.next = 22;
             return window.tallymanApi.triggerPin(host, country, slug, device, offer, msisdn, rockmanId, extraParamsQs, search, uniqid);
 
-          case 18:
+          case 22:
             result = _context3.sent;
 
             if (!(result.success === false)) {
-              _context3.next = 27;
+              _context3.next = 31;
               break;
             }
 
@@ -257,7 +266,7 @@ function _submitMSISDNOnce() {
             console.error(error);
             throw error;
 
-          case 27:
+          case 31:
             kwCodesWithMcpShied = {
               kw: {
                 kw_viva: 'kw_viva'
@@ -268,15 +277,15 @@ function _submitMSISDNOnce() {
             };
 
             if (!(country && result.operator && (kwCodesWithMcpShied[country.toLowerCase()] && kwCodesWithMcpShied[country.toLowerCase()][result.operator.toLowerCase()] || country.toLowerCase() === 'iq'))) {
-              _context3.next = 39;
+              _context3.next = 43;
               break;
             }
 
-            _context3.prev = 29;
-            _context3.next = 32;
+            _context3.prev = 33;
+            _context3.next = 36;
             return window.tallymanApi.mcpShield(host, country, slug, device, offer, rockmanId, result.operator, uniqid);
 
-          case 32:
+          case 36:
             mcpShieldResult = _context3.sent;
 
             if (mcpShieldResult.success === false) {
@@ -286,15 +295,15 @@ function _submitMSISDNOnce() {
               uniqidResult = mcpShieldResult.uniqid;
             }
 
-            _context3.next = 39;
+            _context3.next = 43;
             break;
 
-          case 36:
-            _context3.prev = 36;
-            _context3.t0 = _context3["catch"](29);
+          case 40:
+            _context3.prev = 40;
+            _context3.t0 = _context3["catch"](33);
             console.warn(_context3.t0);
 
-          case 39:
+          case 43:
             return _context3.abrupt("return", {
               type: 'SingleMSISDNSubmissionResult',
               pin: result.pin,
@@ -302,12 +311,12 @@ function _submitMSISDNOnce() {
               operator: result.operator
             });
 
-          case 40:
+          case 44:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[29, 36]]);
+    }, _callee3, null, [[33, 40]]);
   }));
   return _submitMSISDNOnce.apply(this, arguments);
 }

package/dist/reducers/strategy/StrategyTypes.d.ts

@@ -212,15 +212,16 @@ export declare type IStrategyActionMaps = {
     loadOc2sms: () => AppThunk;
 };
 export declare type IStrategyIDentifyUserResult = {
-    success: true;
+    success: 'true';
     rockman_id: string;
     msisdn: string;
     operator?: string;
     subscription_url?: string;
     redirect_url?: string;
     'redirect-back'?: string;
+    'msisdn-alias'?: string;
 } | {
-    success: false;
+    success: 'false';
     rockman_id: string;
     message: string;
     'redirect-back'?: string;

package/dist/reducers/strategy/utils.js

@@ -457,7 +457,7 @@ var identifyUser = /*#__PURE__*/function () {
             newHost = isDMB ? 'de.tallymans.com' : host;
             searchObj = searchToObject();
 
-            if (!(!!searchObj['redirect-back'] && searchObj['redirect-back'] === '1' && !!searchObj.success)) {
+            if (!(!!searchObj['redirect-back'] && searchObj['redirect-back'] === '1' && (searchObj === null || searchObj === void 0 ? void 0 : searchObj.success) === 'true')) {
               _context2.next = 50;
               break;
             }
@@ -498,14 +498,14 @@ var identifyUser = /*#__PURE__*/function () {
             });
 
           case 31:
-            if (!searchObj.redirect_url) {
+            if (!(searchObj !== null && searchObj !== void 0 && searchObj.redirect_url)) {
               _context2.next = 42;
               break;
             }
 
             url2 = "https://de.tallymans.com/tallyman/v1/?action=redirect&country=".concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=", 'smart', "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId, "&auto-redirect=1&").concat(extraParamsQs); // const result2 = await fetch(url2).then(x => x.json())
 
-            redirect_url = window.atob(searchObj.redirect_url);
+            redirect_url = window.atob(searchObj === null || searchObj === void 0 ? void 0 : searchObj.redirect_url);
             _newUrl2 = new URL(redirect_url);
             _newQueryString2 = _newUrl2.search;
             _urlParams2 = new URLSearchParams(_newQueryString2);
@@ -553,7 +553,7 @@ var identifyUser = /*#__PURE__*/function () {
           case 53:
             result = _context2.sent;
 
-            if (!(result.success === false)) {
+            if (!(result.success === 'false')) {
               _context2.next = 60;
               break;
             }

package/dist/utilities/handleSubmitNumber.js

@@ -47,16 +47,15 @@ var handleFormSubmit = function handleFormSubmit(_ref2) {
   var pn = new _awesomePhonenumber.default("+".concat(internationalNumber), process.env.country.toUpperCase());
   var countryCode = pn.getCountryCode();
   var networkType = isHeaderEnrichmentSuccess ? 'mobile_data' : 'wifi';
+  var searchObj = (0, _utils.searchToObject)();
 
-  if (isHeaderEnrichmentSuccess === true && process.env.country === 'kw' && internationalNumber != '' && !pn.isValid()) {
+  if (isHeaderEnrichmentSuccess === true && process.env.country === 'kw' && internationalNumber !== '' && !pn.isValid()) {
     setInternationalNumber(countryCode + internationalNumber);
     var newNumber = countryCode + internationalNumber;
     onEnd(newNumber.match(/\d+/gi).join(''));
-  } else if (isHeaderEnrichmentSuccess === true && process.env.country === 'ci') {
+  } else if (isHeaderEnrichmentSuccess === true && (searchObj === null || searchObj === void 0 ? void 0 : searchObj.success) === 'true' && searchObj['msisdn-alias'] === '1') {
     // Special case Digital Virgo sents encrypted msisdn we dont need to validate is
-    var searchObj = (0, _utils.searchToObject)();
-
-    if (searchObj.success && searchObj.msisdn) {
+    if (searchObj !== null && searchObj !== void 0 && searchObj.msisdn) {
       var encryptedMsisdn = searchObj.msisdn;
       onEnd(encryptedMsisdn, {
         network_type: networkType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ouisys-engine",
-  "version": "3.0.21",
+  "version": "3.0.22",
   "description": "",
   "main": "dist/index.js",
   "directories": "dist dev-tools",
@@ -18,78 +18,78 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "awesome-phonenumber": "^3.2.0",
-    "immutability-helper": "^3.1.1",
-    "pacman-client": "^1.5.6",
-    "react-addons-update": "^15.6.3",
-    "react-redux": "^8.0.2",
-    "redux": "^4.2.0",
-    "redux-logger": "^3.0.6",
-    "redux-thunk": "^2.4.1",
-    "rxjs": "^7.5.5",
-    "rxjs-compat": "^6.6.7",
+    "awesome-phonenumber": "3.2.0",
+    "immutability-helper": "3.1.1",
+    "pacman-client": "1.5.6",
+    "react-addons-update": "15.6.3",
+    "react-redux": "8.0.2",
+    "redux": "4.2.0",
+    "redux-logger": "3.0.6",
+    "redux-thunk": "2.4.1",
+    "rxjs": "7.5.5",
+    "rxjs-compat": "6.6.7",
     "typescript": "4.7.4",
-    "uuid": "^9.0.0"
+    "uuid": "9.0.0"
   },
   "devDependencies": {
     "@babel/cli": "7.18.6",
     "@babel/core": "7.18.6",
     "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+    "@babel/plugin-transform-member-expression-literals": "7.18.6",
     "@babel/preset-env": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
     "@babel/runtime": "7.18.6",
     "@reduxjs/toolkit": "1.8.3",
-    "@types/chai": "^4.3.1",
-    "@types/crypto-js": "^4.1.1",
-    "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.2.1",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.0.3",
-    "@types/node-fetch": "^2.6.2",
+    "@types/chai": "4.3.1",
+    "@types/crypto-js": "4.1.1",
+    "@types/fs-extra": "9.0.13",
+    "@types/inquirer": "8.2.1",
+    "@types/mocha": "9.1.1",
+    "@types/node": "18.0.3",
+    "@types/node-fetch": "2.6.2",
     "@types/ramda": "0.28.15",
-    "@types/react": "^18.0.15",
-    "@types/react-dom": "^18.0.6",
-    "@types/react-redux": "^7.1.24",
-    "@types/react-test-renderer": "^18.0.0",
-    "@types/redux-logger": "^3.0.9",
-    "@types/redux-mock-store": "^1.0.3",
-    "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^4.19.0",
-    "@typescript-eslint/parser": "^4.19.0",
-    "chai": "^4.3.6",
+    "@types/react": "18.0.15",
+    "@types/react-dom": "18.0.6",
+    "@types/react-redux": "7.1.24",
+    "@types/react-test-renderer": "18.0.0",
+    "@types/redux-logger": "3.0.9",
+    "@types/redux-mock-store": "1.0.3",
+    "@types/uuid": "8.3.4",
+    "@typescript-eslint/eslint-plugin": "4.19.0",
+    "@typescript-eslint/parser": "4.19.0",
+    "chai": "4.3.6",
     "core-js": "3.23.4",
-    "eslint": "^7.16.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-ouisys": "^0.0.9",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-react": "^7.21.5",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-testing-library": "^3.10.1",
-    "eslint-webpack-plugin": "^3.2.0",
-    "husky": "^8.0.1",
-    "jest": "^28.1.3",
-    "jsdom": "^20.0.0",
-    "jsdom-global": "^3.0.2",
-    "lint-staged": "^13.0.3",
-    "msw": "^0.43.1",
-    "prettier": "^2.2.1",
-    "prettier-config-ouisys": "^0.0.1",
-    "prettier-plugin-organize-imports": "^1.1.1",
-    "react-test-renderer": "^18.2.0",
-    "redux-cli-logger": "^2.1.0",
-    "redux-mock-store": "^1.5.4",
-    "ts-node": "^10.8.2"
+    "eslint": "7.16.0",
+    "eslint-config-airbnb": "18.2.1",
+    "eslint-config-ouisys": "0.0.9",
+    "eslint-config-prettier": "7.1.0",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-jest": "24.1.3",
+    "eslint-plugin-jsx-a11y": "6.4.1",
+    "eslint-plugin-prettier": "3.3.0",
+    "eslint-plugin-react": "7.21.5",
+    "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-testing-library": "3.10.1",
+    "eslint-webpack-plugin": "3.2.0",
+    "husky": "8.0.1",
+    "jest": "28.1.3",
+    "jsdom": "20.0.0",
+    "jsdom-global": "3.0.2",
+    "lint-staged": "13.0.3",
+    "msw": "0.43.1",
+    "prettier": "2.2.1",
+    "prettier-config-ouisys": "0.0.1",
+    "prettier-plugin-organize-imports": "1.1.1",
+    "react-test-renderer": "18.2.0",
+    "redux-cli-logger": "2.1.0",
+    "redux-mock-store": "1.5.4",
+    "ts-node": "10.8.2"
   },
   "resolutions": {
-    "@types/react": "^18.0.14",
-    "@types/react-dom": "^18.0.5",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "@types/react": "18.0.14",
+    "@types/react-dom": "18.0.5",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "proxy": "http://localhost:3030/",
   "husky": {