ouisys-engine 2.1.55 → 2.1.58

package/dist/api/index.js

@@ -516,7 +516,7 @@ var RealTallyman = {
   }(),
   redirect: function () {
     var _redirect2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17(host, slug, country, msisdn, device, offer, rockmanId, ip_range_name, search, extraParamsQs) {
-      var isDMB, newHost;
+      var isDMB, newHost, evinaTi;
       return regeneratorRuntime.wrap(function _callee17$(_context17) {
         while (1) {
           switch (_context17.prev = _context17.next) {
@@ -524,15 +524,16 @@ var RealTallyman = {
               console.log("RealTallyman");
               isDMB = 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;
               newHost = isDMB ? "de.tallymans.com" : host;
-              _context17.next = 5;
-              return fetch("https://".concat(newHost, "/tallyman/v1/?action=redirect&slug=").concat(slug, "&country=").concat(country, "&msisdn=").concat(msisdn, "&device=").concat(device, "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId, "&network_type=").concat(!ip_range_name ? "wifi" : "", "&").concat(search).concat(extraParamsQs)).then(function (x) {
+              evinaTi = country.toLowerCase() === "a2" ? "&evinaTi=".concat(rockmanId) : '';
+              _context17.next = 6;
+              return fetch("https://".concat(newHost, "/tallyman/v1/?action=redirect&slug=").concat(slug, "&country=").concat(country, "&msisdn=").concat(msisdn, "&device=").concat(device, "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId, "&network_type=").concat(!ip_range_name ? "wifi" : "", "&").concat(search).concat(evinaTi).concat(extraParamsQs)).then(function (x) {
                 return x.json();
               });
 
-            case 5:
+            case 6:
               return _context17.abrupt("return", _context17.sent);
 
-            case 6:
+            case 7:
             case "end":
               return _context17.stop();
           }

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; }
@@ -165,6 +169,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.55",
+  "version": "2.1.58",
   "description": "",
   "main": "dist/index.js",
   "directories": "dist dev-tools",

package/src/api/index.ts

@@ -183,7 +183,9 @@ export const RealTallyman:ITallyman = {
     console.log("RealTallyman")
     const isDMB = (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;
     const newHost = isDMB ? "de.tallymans.com" : host;
-    return await fetch(`https://${newHost}/tallyman/v1/?action=redirect&slug=${slug}&country=${country}&msisdn=${msisdn}&device=${device}&offerId=${offer}&rockman_id=${rockmanId}&network_type=${!ip_range_name ? "wifi":""}&${search}${extraParamsQs}`).then(x => x.json())
+    const evinaTi = (country.toLowerCase() === "a2") ? `&evinaTi=${rockmanId}` : '';
+
+    return await fetch(`https://${newHost}/tallyman/v1/?action=redirect&slug=${slug}&country=${country}&msisdn=${msisdn}&device=${device}&offerId=${offer}&rockman_id=${rockmanId}&network_type=${!ip_range_name ? "wifi":""}&${search}${evinaTi}${extraParamsQs}`).then(x => x.json())
   },
   triggerMessage:async(host: string, slug: string, country: string, msisdn: string, device: string, offer: number, rockmanId: string, search: string, extraParamsQs: string): Promise<IMoMSISDNSubmissionResult> =>{
     console.log("RealTallyman")

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> {
@@ -11,7 +13,7 @@ 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 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 visitor = window.pac_analytics.visitor;
@@ -33,7 +35,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/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;