ouisys-engine 2.1.54 → 2.1.57

package/dist/reducers/moFlow/utils.js

@@ -177,7 +177,8 @@ var getGoogleReCaptchaConfig = /*#__PURE__*/function () {
               srcUrl = "https://www.google.com/recaptcha/api.js?render=".concat(result.site_key);
               (0, _loadScriptSrc.default)({
                 url: srcUrl,
-                key: result.site_key
+                key: result.site_key,
+                isRecaptcha: true
               });
             }
 

package/dist/reducers/moRedirFlow/utils.d.ts

@@ -5,5 +5,6 @@ export default function submitMSISDN(window: Window, maybeConfig: IConfig, inter
 export declare function submitMSISDNWithConfig(window: Window, config: IConfig, internationalMSISDN: string, extraParams?: {
     [key: string]: string;
 }): Promise<string>;
+export declare const startEvinaAgency: (config: IConfig) => void;
 export declare const mockedMSISDNEntrySuccess: IMoRedirFlowReducerState;
 export declare const mockedMSISDNEntryFailure: IMoRedirFlowReducerState;

package/dist/reducers/moRedirFlow/utils.js

@@ -47,7 +47,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = submitMSISDN;
 exports.submitMSISDNWithConfig = submitMSISDNWithConfig;
-exports.mockedMSISDNEntryFailure = exports.mockedMSISDNEntrySuccess = void 0;
+exports.mockedMSISDNEntryFailure = exports.mockedMSISDNEntrySuccess = exports.startEvinaAgency = void 0;
 
 require("regenerator-runtime/runtime");
 
@@ -55,6 +55,10 @@ var _tryGetIPRangeName = _interopRequireDefault(require("../../ips/tryGetIPRange
 
 var RDS = _interopRequireWildcard(require("../../common-types/RemoteDataState"));
 
+var _loadScriptSrc = _interopRequireDefault(require("../../utilities/loadScriptSrc"));
+
+var _utilities = require("../../utilities");
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -103,46 +107,51 @@ function submitMSISDNWithConfig(_x5, _x6, _x7, _x8) {
 
 function _submitMSISDNWithConfig() {
   _submitMSISDNWithConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(window, config, internationalMSISDN, extraParams) {
-    var slug, country, device, offer, host, search, extraParamsQs, msisdn, visitor, rockmanId, ip_range_name, result, type, error;
+    var slug, country, device, offer, host, visitor, rockmanId, search, extraParamsQs, msisdn, ip_range_name, result, type, error;
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             slug = config.slug, country = config.country, device = config.device, offer = config.offer, host = config.host;
+            visitor = window.pac_analytics.visitor;
+            rockmanId = visitor.rockmanId;
             search = window.location.search.substr(1) || '';
+
+            if (country.toLowerCase() === "a2") {
+              extraParams.evinaTi = rockmanId;
+            }
+
             extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(function (k) {
               return "".concat(k, "=").concat(extraParams[k]);
             }).join('&');
             msisdn = internationalMSISDN.match(/\d+/gi).join('');
-            visitor = window.pac_analytics.visitor;
-            rockmanId = visitor.rockmanId;
 
             if (!(country == "ci")) {
-              _context2.next = 12;
+              _context2.next = 13;
               break;
             }
 
-            _context2.next = 9;
+            _context2.next = 10;
             return (0, _tryGetIPRangeName.default)(visitor);
 
-          case 9:
+          case 10:
             _context2.t0 = _context2.sent;
-            _context2.next = 13;
+            _context2.next = 14;
             break;
 
-          case 12:
+          case 13:
             _context2.t0 = null;
 
-          case 13:
+          case 14:
             ip_range_name = _context2.t0;
-            _context2.next = 16;
+            _context2.next = 17;
             return window.tallymanApi.redirect(host, slug, country, msisdn, device, offer, rockmanId, ip_range_name, search, extraParamsQs);
 
-          case 16:
+          case 17:
             result = _context2.sent;
 
             if (!(false === result.success)) {
-              _context2.next = 25;
+              _context2.next = 26;
               break;
             }
 
@@ -152,10 +161,10 @@ function _submitMSISDNWithConfig() {
             console.error(error);
             throw error;
 
-          case 25:
+          case 26:
             return _context2.abrupt("return", result.redirect_url);
 
-          case 26:
+          case 27:
           case "end":
             return _context2.stop();
         }
@@ -165,6 +174,19 @@ function _submitMSISDNWithConfig() {
   return _submitMSISDNWithConfig.apply(this, arguments);
 }
 
+var startEvinaAgency = function startEvinaAgency(config) {
+  var host = config.host;
+  var newHost = (0, _utilities.getHost)({
+    host: host
+  });
+  var rockmanId = window.pac_analytics.visitor.rockmanId;
+  var url = "https://".concat(newHost, "/tallyman/helper/?action=mi-agency&process=a2-du-evina-start&rockman_id=").concat(rockmanId);
+  (0, _loadScriptSrc.default)({
+    url: url
+  });
+};
+
+exports.startEvinaAgency = startEvinaAgency;
 var mockedMSISDNEntrySuccess = {
   currentState: {
     type: "MSISDNEntry",

package/dist/reducers/oneClickFlow/index.js

@@ -127,7 +127,7 @@ function getRedirectUrlAction(_ref) {
                         window.location.href = redirectUrl;
                       }, 0);
                     }
-                  }, 500);
+                  }, 100);
                 } else {
                   _strategy.tracker.advancedInFlow('tallyman.v1-one-click', 'click-redirect-url', {
                     redirect_url: redirectUrl
@@ -135,7 +135,7 @@ function getRedirectUrlAction(_ref) {
 
                   setTimeout(function () {
                     window.location.href = redirectUrl;
-                  }, 1000);
+                  }, 0);
                 }
               } else {
                 dispatch({
@@ -207,7 +207,7 @@ function getRedirectUrlAction(_ref) {
 
                 setTimeout(function () {
                   window.location.href = _redirect_url;
-                }, 3000);
+                }, 0);
               } else {
                 dispatch({
                   type: "GET_REDIRECT_URL",

package/dist/utilities/index.d.ts

@@ -0,0 +1,6 @@
+import { IConfig } from "../reducers/strategy/StrategyTypes";
+export declare const isDMBCheck: () => boolean;
+export declare const getHost: ({ host }: {
+    host: string;
+}) => string;
+export declare const setOnLoadUtilities: (config: IConfig) => void;

package/dist/utilities/index.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setOnLoadUtilities = exports.getHost = exports.isDMBCheck = void 0;
+
+var _utils = require("../reducers/moFlow/utils");
+
+var _utils2 = require("../reducers/moRedirFlow/utils");
+
+var isDMBCheck = function isDMBCheck() {
+  return window.pac_analytics.visitor.xaid != null && (window.pac_analytics.visitor.xaid.toLowerCase().indexOf("dmb") != -1 || window.pac_analytics.visitor.xaid.toLowerCase().indexOf("amb")) != -1 ? true : false;
+};
+
+exports.isDMBCheck = isDMBCheck;
+
+var getHost = function getHost(_ref) {
+  var host = _ref.host;
+  var newHost = isDMBCheck() ? "de.tallymans.com" : host;
+  return newHost;
+};
+
+exports.getHost = getHost;
+
+var setOnLoadUtilities = function setOnLoadUtilities(config) {
+  if (process.env.country.toLowerCase() === "cz") {
+    (0, _utils.getGoogleReCaptchaConfig)(config);
+  }
+
+  if (process.env.country.toLowerCase() === "a2" && process.env.NODE_ENV === "production") {
+    (0, _utils2.startEvinaAgency)(config);
+  }
+};
+
+exports.setOnLoadUtilities = setOnLoadUtilities;

package/dist/utilities/loadScriptSrc.d.ts

@@ -1,5 +1,6 @@
-declare const loadScriptSrc: ({ url, key }: {
+declare const loadScriptSrc: ({ url, key, isRecaptcha }: {
     url: string;
-    key: string;
+    key?: string;
+    isRecaptcha?: boolean;
 }) => void;
 export default loadScriptSrc;

package/dist/utilities/loadScriptSrc.js

@@ -11,17 +11,21 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var loadScriptSrc = function loadScriptSrc(_ref) {
   var url = _ref.url,
-      key = _ref.key;
+      key = _ref.key,
+      _ref$isRecaptcha = _ref.isRecaptcha,
+      isRecaptcha = _ref$isRecaptcha === void 0 ? false : _ref$isRecaptcha;
   var script = document.createElement('script');
   script.type = 'text/javascript';
   script.src = url;
   var headElem = document.getElementsByTagName('head')[0];
   headElem.insertBefore(script, headElem.firstChild);
 
-  script.onload = function () {
-    var scriptInner = "\n      grecaptcha.ready(function() {\n          grecaptcha.execute(\"".concat(key, "\", {action: 'submit'}).then(function(token) {\n            // To be used by tallyman\n            window.reCaptchaToken = token;\n            console.log(\"-------\" + token);\n          });\n      });\n    ");
-    (0, _loadScriptInnerHtml.default)(scriptInner, true);
-  };
+  if (isRecaptcha) {
+    script.onload = function () {
+      var scriptInner = "\n        grecaptcha.ready(function() {\n            grecaptcha.execute(\"".concat(key, "\", {action: 'submit'}).then(function(token) {\n              // To be used by tallyman\n              window.reCaptchaToken = token;\n              console.log(\"-------\" + token);\n            });\n        });\n      ");
+      (0, _loadScriptInnerHtml.default)(scriptInner, true);
+    };
+  }
 };
 
 var _default = loadScriptSrc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ouisys-engine",
-  "version": "2.1.54",
+  "version": "2.1.57",
   "description": "",
   "main": "dist/index.js",
   "directories": "dist dev-tools",

package/src/reducers/moFlow/utils.ts

@@ -48,7 +48,7 @@ export const getGoogleReCaptchaConfig = async ({ slug, country, device, host }:I
   const result: IGoogleReCaptcha = await window.tallymanApi.getGoogleCaptcha(host, country, slug, device, domain);
   if(result.success === true){
     const srcUrl = `https://www.google.com/recaptcha/api.js?render=${result.site_key}`;
-    loadScriptSrc({url:srcUrl, key: result.site_key});
+    loadScriptSrc({url:srcUrl, key: result.site_key, isRecaptcha: true});
   }
   return result;
 }

package/src/reducers/moRedirFlow/utils.ts

@@ -2,6 +2,8 @@ import { IConfig, IMSISDNSubmissionResult, MSISDNEntryFailure, MSISDNEntrySucces
 import IError from "../../common-types/IError";
 import tryGetIPRangeName from "../../ips/tryGetIPRangeName";
 import * as RDS from "../../common-types/RemoteDataState";
+import loadScriptSrc from "../../utilities/loadScriptSrc";
+import { getHost, isDMBCheck } from "../../utilities";
 
 
 export default async function submitMSISDN(window: Window, maybeConfig: IConfig, internationalMSISDN: string, extraParams?: {[key: string]: string}): Promise<string> {
@@ -10,13 +12,18 @@ export default async function submitMSISDN(window: Window, maybeConfig: IConfig,
 }
 
 export async function submitMSISDNWithConfig(window: Window, config: IConfig, internationalMSISDN: string, extraParams?: { [key: string]: string }): Promise<string> {
-  const { slug, country, device, offer, host } = config
-  const search = window.location.search.substr(1) || ''
-  const extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(k => `${k}=${extraParams[k]}`).join('&')
-  const msisdn = internationalMSISDN.match(/\d+/gi).join('')
+  const { slug, country, device, offer, host } = config;
   const visitor = window.pac_analytics.visitor;
   const rockmanId = visitor.rockmanId;
 
+  const search = window.location.search.substr(1) || '';
+  if(country.toLowerCase() === "a2"){
+    extraParams.evinaTi = rockmanId;
+  }
+  const extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(k => `${k}=${extraParams[k]}`).join('&')
+  const msisdn = internationalMSISDN.match(/\d+/gi).join('')
+  
+
   const ip_range_name = country == "ci" ? await tryGetIPRangeName(visitor) : null;
 
   const result: IMSISDNSubmissionResult = await window.tallymanApi.redirect(host, slug, country, msisdn, device, offer, rockmanId, ip_range_name, search, extraParamsQs)
@@ -33,7 +40,13 @@ export async function submitMSISDNWithConfig(window: Window, config: IConfig, in
   }
 }
 
-
+export const startEvinaAgency = (config: IConfig)=>{
+  const { host } = config
+  const newHost = getHost({host});
+  const rockmanId = window.pac_analytics.visitor.rockmanId
+  const url = `https://${newHost}/tallyman/helper/?action=mi-agency&process=a2-du-evina-start&rockman_id=${rockmanId}`;
+  loadScriptSrc({url});
+}
 
 export const mockedMSISDNEntrySuccess : IMoRedirFlowReducerState = { 
   currentState:{

package/src/reducers/oneClickFlow/index.ts

@@ -47,12 +47,12 @@ export function getRedirectUrlAction({extraParams, autoRedirect = false, isGetRe
                     window.location.href = redirectUrl;
                   }, 0);
                 }
-              }, 500);
+              }, 100);
             }else{
               tracker.advancedInFlow('tallyman.v1-one-click', 'click-redirect-url', {redirect_url:redirectUrl});
               setTimeout(() => {
                 window.location.href = redirectUrl;
-              }, 1000);
+              }, 0);
             }
 
 
@@ -104,7 +104,7 @@ export function getRedirectUrlAction({extraParams, autoRedirect = false, isGetRe
 
               setTimeout(() => { 
                 window.location.href = redirect_url;
-              }, 3000);
+              }, 0);
             }else{
               dispatch({
                 type: "GET_REDIRECT_URL",

package/src/utilities/index.ts

@@ -0,0 +1,21 @@
+import { getGoogleReCaptchaConfig } from "../reducers/moFlow/utils";
+import { startEvinaAgency } from "../reducers/moRedirFlow/utils";
+import { IConfig } from "../reducers/strategy/StrategyTypes";
+
+export const isDMBCheck = ()=>{
+  return (window.pac_analytics.visitor.xaid != null && (window.pac_analytics.visitor.xaid.toLowerCase().indexOf("dmb") != -1 || window.pac_analytics.visitor.xaid.toLowerCase().indexOf("amb")) != -1) ? true : false;
+}
+
+export const getHost = ({host}:{host: string}): string=>{
+  const newHost = isDMBCheck() ? "de.tallymans.com" : host;
+  return newHost
+}
+
+export const setOnLoadUtilities = (config:IConfig)=>{
+  if(process.env.country.toLowerCase() === "cz"){
+    getGoogleReCaptchaConfig(config)
+  }
+  if(process.env.country.toLowerCase() === "a2" && process.env.NODE_ENV === "production"){
+    startEvinaAgency(config)
+  }
+}

package/src/utilities/loadScriptSrc.ts

@@ -1,23 +1,26 @@
 import loadScriptInnerHtml from "./loadScriptInnerHtml";
 
-const loadScriptSrc = ({url, key}:{url:string, key:string})=>{
+const loadScriptSrc = ({url, key, isRecaptcha = false}:{url:string, key?:string, isRecaptcha?: boolean})=>{
   var script = document.createElement('script');
   script.type = 'text/javascript';
   script.src = url;
   var headElem = document.getElementsByTagName('head')[0];
-  headElem.insertBefore(script, headElem.firstChild)
-  script.onload = () => {
-    const scriptInner = `
-      grecaptcha.ready(function() {
-          grecaptcha.execute("${key}", {action: 'submit'}).then(function(token) {
-            // To be used by tallyman
-            window.reCaptchaToken = token;
-            console.log("-------" + token);
-          });
-      });
-    `;
-    loadScriptInnerHtml(scriptInner, true);
-  }  
+  headElem.insertBefore(script, headElem.firstChild);
+
+  if(isRecaptcha){
+    script.onload = () => {
+      const scriptInner = `
+        grecaptcha.ready(function() {
+            grecaptcha.execute("${key}", {action: 'submit'}).then(function(token) {
+              // To be used by tallyman
+              window.reCaptchaToken = token;
+              console.log("-------" + token);
+            });
+        });
+      `;
+      loadScriptInnerHtml(scriptInner, true);
+    } 
+  }
 }
 
 export default loadScriptSrc;