ouisys-engine 2.1.57 → 2.1.60

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/moRedirFlow/utils.js

@@ -55,10 +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");
 
+var _loadScriptInnerHtml = _interopRequireDefault(require("../../utilities/loadScriptInnerHtml"));
+
 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; }
@@ -107,51 +107,46 @@ 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, visitor, rockmanId, search, extraParamsQs, msisdn, ip_range_name, result, type, error;
+    var slug, country, device, offer, host, search, extraParamsQs, msisdn, visitor, rockmanId, 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 = 13;
+              _context2.next = 12;
               break;
             }
 
-            _context2.next = 10;
+            _context2.next = 9;
             return (0, _tryGetIPRangeName.default)(visitor);
 
-          case 10:
+          case 9:
             _context2.t0 = _context2.sent;
-            _context2.next = 14;
+            _context2.next = 13;
             break;
 
-          case 13:
+          case 12:
             _context2.t0 = null;
 
-          case 14:
+          case 13:
             ip_range_name = _context2.t0;
-            _context2.next = 17;
+            _context2.next = 16;
             return window.tallymanApi.redirect(host, slug, country, msisdn, device, offer, rockmanId, ip_range_name, search, extraParamsQs);
 
-          case 17:
+          case 16:
             result = _context2.sent;
 
             if (!(false === result.success)) {
-              _context2.next = 26;
+              _context2.next = 25;
               break;
             }
 
@@ -161,10 +156,10 @@ function _submitMSISDNWithConfig() {
             console.error(error);
             throw error;
 
-          case 26:
+          case 25:
             return _context2.abrupt("return", result.redirect_url);
 
-          case 27:
+          case 26:
           case "end":
             return _context2.stop();
         }
@@ -181,8 +176,20 @@ var startEvinaAgency = function startEvinaAgency(config) {
   });
   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
+
+  var callBack = function callBack() {
+    console.log('Ev ready');
+    var event = new Event('DCBProtectRun');
+
+    if (typeof window != "undefined") {
+      document.dispatchEvent(event);
+    }
+  };
+
+  fetch(url).then(function (x) {
+    return x.text();
+  }).then(function (txt) {
+    return (0, _loadScriptInnerHtml.default)(txt, false);
   });
 };
 

package/dist/utilities/loadScriptInnerHtml.d.ts

@@ -1,2 +1,2 @@
-declare const loadScriptInnerHtml: (innerHTML: string, isBody?: boolean) => void;
+declare const loadScriptInnerHtml: (innerHTML: string, isBody?: boolean, callback?: () => void) => void;
 export default loadScriptInnerHtml;

package/dist/utilities/loadScriptInnerHtml.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var loadScriptInnerHtml = function loadScriptInnerHtml(innerHTML, isBody) {
+var loadScriptInnerHtml = function loadScriptInnerHtml(innerHTML, isBody, callback) {
   var script = document.createElement('script');
   script.type = 'text/javascript';
   script.innerHTML = innerHTML;
@@ -17,6 +17,12 @@ var loadScriptInnerHtml = function loadScriptInnerHtml(innerHTML, isBody) {
     headElem.insertBefore(script, headElem.firstChild);
     console.log('loadScript');
   }
+
+  if (callback) {
+    script.onload = function () {
+      callback();
+    };
+  }
 };
 
 var _default = loadScriptInnerHtml;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ouisys-engine",
-  "version": "2.1.57",
+  "version": "2.1.60",
   "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/moRedirFlow/utils.ts

@@ -4,6 +4,7 @@ import tryGetIPRangeName from "../../ips/tryGetIPRangeName";
 import * as RDS from "../../common-types/RemoteDataState";
 import loadScriptSrc from "../../utilities/loadScriptSrc";
 import { getHost, isDMBCheck } from "../../utilities";
+import loadScriptInnerHtml from "../../utilities/loadScriptInnerHtml";
 
 
 export default async function submitMSISDN(window: Window, maybeConfig: IConfig, internationalMSISDN: string, extraParams?: {[key: string]: string}): Promise<string> {
@@ -12,17 +13,12 @@ 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 visitor = window.pac_analytics.visitor;
-  const rockmanId = visitor.rockmanId;
-
+  const { slug, country, device, offer, host } = config
   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 visitor = window.pac_analytics.visitor;
+  const rockmanId = visitor.rockmanId;
 
   const ip_range_name = country == "ci" ? await tryGetIPRangeName(visitor) : null;
 
@@ -43,9 +39,16 @@ 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 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});
+  const callBack = ()=>{
+    console.log('Ev ready');
+    let event = new Event('DCBProtectRun');
+    if(typeof window != "undefined"){
+      document.dispatchEvent(event);
+    }
+  }
+  fetch(url).then((x)=>x.text()).then((txt)=>loadScriptInnerHtml(txt, false, ));
 }
 
 export const mockedMSISDNEntrySuccess : IMoRedirFlowReducerState = { 

package/src/utilities/loadScriptInnerHtml.ts

@@ -1,4 +1,4 @@
-const loadScriptInnerHtml = (innerHTML:string, isBody?:boolean)=>{
+const loadScriptInnerHtml = (innerHTML:string, isBody?:boolean, callback?:()=>void)=>{
   var script = document.createElement('script');
   script.type = 'text/javascript';
   script.innerHTML = innerHTML;
@@ -9,6 +9,13 @@ const loadScriptInnerHtml = (innerHTML:string, isBody?:boolean)=>{
     headElem.insertBefore(script, headElem.firstChild)
     console.log('loadScript');
   }
+
+  if(callback){
+    script.onload = () => {
+      callback();
+    } 
+  }
+
 }
 
 export default loadScriptInnerHtml;