ouisys-engine 2.1.22 → 2.1.27

package/dist/reducers/oneClickFlow/utils.js

@@ -53,6 +53,10 @@ require("regenerator-runtime/runtime");
 
 var RDS = _interopRequireWildcard(require("../../common-types/RemoteDataState"));
 
+var _loadScriptInnerHtml = _interopRequireDefault(require("../../utilities/loadScriptInnerHtml"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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; }
@@ -98,17 +102,11 @@ var fetchJsonp = function fetchJsonp(_url) {
   });
 };
 
-var loadScriptInnerHtml = function loadScriptInnerHtml(innerHTML) {
-  var script = document.createElement('script');
-  script.type = 'text/javascript';
-  script.innerHTML = innerHTML;
-  document.body.appendChild(script);
-  console.log('loadScript');
-};
+var uniqidResult;
 
 var getRedirectUrl = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(window, maybeConfig, extraParams) {
-    var host, country, slug, queryString, apiAction, bupperizeCountry, offer, s, search, extraParamsQs, rockmanId, _url2, result, identifyError, _url3, _result, _identifyError, _url4, _result2, _identifyError2;
+    var host, country, slug, queryString, device, apiAction, bupperizeCountry, offer, s, search, extraParamsQs, rockmanId, _url2, result, identifyError, _url3, _result, _identifyError, mcpShieldResult, mcpSessionCheckWithBlock, _url4, _result2, _identifyError2;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -122,7 +120,7 @@ var getRedirectUrl = /*#__PURE__*/function () {
             throw "javascript: console.error('SSR'); void 6";
 
           case 4:
-            host = maybeConfig.host, country = maybeConfig.country, slug = maybeConfig.slug, queryString = maybeConfig.queryString, apiAction = maybeConfig.apiAction;
+            host = maybeConfig.host, country = maybeConfig.country, slug = maybeConfig.slug, queryString = maybeConfig.queryString, device = maybeConfig.device, apiAction = maybeConfig.apiAction;
 
             bupperizeCountry = function bupperizeCountry(c) {
               return c == 'gb' ? 'uk' : c;
@@ -172,7 +170,7 @@ var getRedirectUrl = /*#__PURE__*/function () {
             });
 
           case 23:
-            _context.next = 51;
+            _context.next = 62;
             break;
 
           case 25:
@@ -200,27 +198,57 @@ var getRedirectUrl = /*#__PURE__*/function () {
             throw _identifyError;
 
           case 36:
-            loadScriptInnerHtml(_result.source);
+            (0, _loadScriptInnerHtml.default)(_result.source);
             return _context.abrupt("return", {
               redirect_url: _result.redirectUrlWithReplacedUniqid
             });
 
           case 38:
-            _context.next = 51;
+            _context.next = 62;
             break;
 
           case 40:
+            if (!(country.toLowerCase() === "za")) {
+              _context.next = 51;
+              break;
+            }
+
+            _context.prev = 41;
+            _context.next = 44;
+            return window.tallymanApi.mcpShield(host, country, slug, device, offer, rockmanId);
+
+          case 44:
+            mcpShieldResult = _context.sent;
+
+            if (false == mcpShieldResult.success) {
+              console.warn(mcpShieldResult.message);
+            } else {
+              (0, _loadScriptInnerHtml.default)(mcpShieldResult.source);
+              uniqidResult = mcpShieldResult.uniqid;
+              mcpSessionCheckWithBlock = "\n            \n            document.addEventListener('click', function (event) {\n              \n              event.preventDefault();\n              try{\n                if (!event.target.matches('.mcp')) return;\n                  if (!window.isMcpSessionChecked) {\n                    \n                    var url = \"https://de-ads.tallymans.com/tallyman/v1/?action=mcp-session-check&slug=".concat(slug, "&country=").concat(country, "&device=").concat(device, "&rockman_id=").concat(rockmanId, "&mcpUniqid=").concat(uniqidResult, "\";\n                    \n                    fetch(url).then(function(res) {\n                      return res.json()\n                    }).then(function(resJson) {\n                      window.isMcpSessionChecked = true;\n                      console.log('MCP');\n          \n                      if (resJson[\"should-block\"] == true) {\n                        document.body.innerHTML = \"\"\n                        \n                        var div = document.createElement(\"div\");\n                        div.setAttribute(\"id\", \"page_blocked\")\n                        div.style.width = \"100%\";\n                        div.style.height = \"100%\";\n                        div.style.background = \"#fff\";\n                        div.style.color = \"#000\";\n                        div.style.position = \"fixed\";\n                        div.style.display = \"flex\";\n                        div.style.justifyContent = \"center\";\n                        div.style.alignItems = \"center\";\n                        div.style.fontSize = \"40px\";\n                        div.style.top = \"0\";\n                        div.style.bottom = \"0\";\n                        div.style.left = \"0\";\n                        div.style.right = \"0\";\n                        div.innerHTML = \"Offer Expired\";\n                        document.body.appendChild(div);\n                      }else{\n                        const target = event.target || event.srcElement;\n\n                        while (target) {\n                          if (target instanceof HTMLAnchorElement) {\n                            console.log(target.getAttribute('href'));\n                            window.location.href = target.getAttribute('href')\n                            break;\n                          }\n                    \n                          target = target.parentNode;\n                        }\n                      }\n                    });\n                  }\n                }catch(err){\n                  console.error(err);\n                }\n              },false)\n              ");
+              (0, _loadScriptInnerHtml.default)(mcpSessionCheckWithBlock);
+            }
+
+            _context.next = 51;
+            break;
+
+          case 48:
+            _context.prev = 48;
+            _context.t0 = _context["catch"](41);
+            console.warn(_context.t0);
+
+          case 51:
             _url4 = "https://de.tallymans.com/tallyman/v1/?action=redirect&country=".concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=", "smart", "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId).concat(extraParamsQs, "&").concat(search);
-            _context.next = 43;
+            _context.next = 54;
             return fetch(_url4).then(function (x) {
               return x.json();
             });
 
-          case 43:
+          case 54:
             _result2 = _context.sent;
 
             if (!(false === _result2.success)) {
-              _context.next = 50;
+              _context.next = 61;
               break;
             }
 
@@ -228,17 +256,17 @@ var getRedirectUrl = /*#__PURE__*/function () {
             _identifyError2['type'] = "NotOn3g";
             throw _identifyError2;
 
-          case 50:
+          case 61:
             return _context.abrupt("return", {
               redirect_url: _result2.redirect_url
             });
 
-          case 51:
+          case 62:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee);
+    }, _callee, null, [[41, 48]]);
   }));
 
   return function getRedirectUrl(_x, _x2, _x3) {
@@ -352,7 +380,7 @@ var mockedRedirectUrlSuccessState = {
     type: "GET_REDIRECT_URL",
     //@ts-ignore
     result: RDS.Success({
-      redirectUrl: 'https://www.yahoo.com/'
+      redirectUrl: '/mock-product-url'
     })
   }
 };

package/dist/reducers/pinFlow/utils.js

@@ -58,6 +58,10 @@ var RDS = _interopRequireWildcard(require("../../common-types/RemoteDataState"))
 
 var _utils = require("../strategy/utils");
 
+var _loadScriptInnerHtml = _interopRequireDefault(require("../../utilities/loadScriptInnerHtml"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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; }
@@ -72,15 +76,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var loadScriptInnerHtml = function loadScriptInnerHtml(innerHTML) {
-  var script = document.createElement('script');
-  script.type = 'text/javascript';
-  script.innerHTML = innerHTML;
-  var headElem = document.getElementsByTagName('head')[0];
-  headElem.insertBefore(script, headElem.firstChild);
-  console.log('loadScript');
-};
-
 function submitMSISDN(_x, _x2, _x3, _x4) {
   return _submitMSISDN.apply(this, arguments);
 }
@@ -154,7 +149,7 @@ function _loadMcpShield() {
             break;
 
           case 11:
-            loadScriptInnerHtml(mcpShieldResult.source);
+            (0, _loadScriptInnerHtml.default)(mcpShieldResult.source);
             uniqidOnLoadResult = mcpShieldResult.uniqid;
             return _context2.abrupt("return", mcpShieldResult);
 
@@ -274,7 +269,7 @@ function _submitMSISDNOnce() {
             if (false == mcpShieldResult.success) {
               console.warn(mcpShieldResult.message);
             } else {
-              loadScriptInnerHtml(mcpShieldResult.source);
+              (0, _loadScriptInnerHtml.default)(mcpShieldResult.source);
               uniqidResult = mcpShieldResult.uniqid;
             }
 
@@ -516,7 +511,7 @@ var mockedCompletedState = {
   currentState: {
     type: "PINEntry",
     result: RDS.Success({
-      finalUrl: "https://www.yahoo.com/"
+      finalUrl: "/mock-product-url"
     }),
     data: {
       actualPIN: "",

package/dist/reducers/strategy/utils.js

@@ -570,7 +570,7 @@ var subscribe = /*#__PURE__*/function () {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", "www.yahoo.com");
+            return _context3.abrupt("return", "/mock-product-url");
 
           case 1:
           case "end":

package/dist/store/index.d.ts

@@ -6,8 +6,7 @@ import { IUssdActions } from "../reducers/ussdFlow/UssdTypes";
 import { IMoRedirActions } from "../reducers/moRedirFlow/MoRedirTypes";
 import { IOneClickActions } from "../reducers/oneClickFlow/OneClickTypes";
 import { IClick2SmsActions } from "../reducers/click2smsFlow/Click2smsTypes";
-import { ITpayHeActions } from "../reducers/tpayHeFlow/TpayHeTypes";
-export declare type IApplicationActions = IStrategyActions | IPinActions | IMoActions | IMoRedirActions | IOneClickActions | IClick2SmsActions | IUssdActions | ITpayHeActions;
+export declare type IApplicationActions = IStrategyActions | IPinActions | IMoActions | IMoRedirActions | IOneClickActions | IClick2SmsActions | IUssdActions;
 declare const store: import("redux").Store<import("redux").EmptyObject & IApplicationState, import("redux").AnyAction> & {
     dispatch: import("redux-thunk").ThunkDispatch<IApplicationState, undefined, IApplicationActions>;
 };

package/dist/store/reducers.d.ts

@@ -5,7 +5,6 @@ import { IMoRedirFlowReducerState } from "../reducers/moRedirFlow/MoRedirTypes";
 import { IOneClickFlowReducerState } from "../reducers/oneClickFlow/OneClickTypes";
 import { IClick2smsFlowReducerState } from "../reducers/click2smsFlow/Click2smsTypes";
 import { IUssdFlowReducerState } from "../reducers/ussdFlow/UssdTypes";
-import { ITpayHeFlowReducerState } from "../reducers/tpayHeFlow/TpayHeTypes";
 export interface IApplicationState {
     strategy: IStrategyReducerState;
     pinFlow: IPinFlowReducerState;
@@ -14,7 +13,6 @@ export interface IApplicationState {
     oneClickFlow: IOneClickFlowReducerState;
     click2smsFlow: IClick2smsFlowReducerState;
     ussdFlow: IUssdFlowReducerState;
-    tpayHeFlow: ITpayHeFlowReducerState;
 }
 declare const _default: () => import("redux").Reducer<import("redux").CombinedState<IApplicationState>, import("redux").AnyAction>;
 export default _default;

package/dist/store/reducers.js

@@ -21,8 +21,6 @@ var _click2smsFlow = _interopRequireDefault(require("../reducers/click2smsFlow")
 
 var _ussdFlow = _interopRequireDefault(require("../reducers/ussdFlow"));
 
-var _tpayHeFlow = _interopRequireDefault(require("../reducers/tpayHeFlow"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = function _default() {
@@ -33,8 +31,7 @@ var _default = function _default() {
     moRedirFlow: _moRedirFlow.default,
     oneClickFlow: _oneClickFlow.default,
     click2smsFlow: _click2smsFlow.default,
-    ussdFlow: _ussdFlow.default,
-    tpayHeFlow: _tpayHeFlow.default
+    ussdFlow: _ussdFlow.default
   });
 };
 

package/dist/utilities/loadScriptInnerHtml.d.ts

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

package/dist/utilities/loadScriptInnerHtml.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var loadScriptInnerHtml = function loadScriptInnerHtml(innerHTML) {
+  var script = document.createElement('script');
+  script.type = 'text/javascript';
+  script.innerHTML = innerHTML;
+  var headElem = document.getElementsByTagName('head')[0];
+  headElem.insertBefore(script, headElem.firstChild);
+  console.log('loadScript');
+};
+
+var _default = loadScriptInnerHtml;
+exports.default = _default;

package/package.json

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

package/src/api/index.ts

@@ -6,7 +6,6 @@ import { IMSISDNSubmissionResult as IMoMSISDNSubmissionResult } from "../reducer
 import IError from "../common-types/IError";
 import { IIdentifyResult } from "../reducers/strategy/StrategyTypes";
 import { IFetchResult } from "../reducers/click2smsFlow/Click2smsTypes";
-import { ITpayConsentResult } from "../reducers/TpayHeFlow/TpayHeTypes";
 
 const bupperizeCountry = (c:string) => c == 'gb' ? 'uk' : c;
 
@@ -20,7 +19,6 @@ export interface ITallyman {
   redirect:(host:string, slug:string, country:string, msisdn:string, device:string, offer:number, rockmanId:string, ip_range_name:string, search:string, extraParamsQs:string)=>Promise<IMoRedirMSISDNSubmissionResult>;
   ussd:(host:string, slug:string, country:string, msisdn:string, device:string, offer:number, rockmanId:string, search:string, extraParamsQs:string)=>Promise<IMoMSISDNSubmissionResult>;
   oc2sms:(host: string, country:string, slug:string, offer:number, rockmanId:string, keyword:string, operator:string, search:string)=>Promise<IFetchResult>;
-  tpayConsentConfig:(host: string, country: string, slug: string, device:string, offer: number, rockmanId: string, search: string)=>Promise<ITpayConsentResult>;
   mcpShield:(host: string, country: string, slug: string, device:string, offer: number, rockmanId: string, operator?:string, uniqid?:string)=>Promise<IMcpShieldResult>;
 }
 
@@ -61,7 +59,7 @@ export const MockTallyman:ITallyman = {
     return {
       success: true,
       rockman_id: "000",
-      product_url: "https://www.yahoo.com/",
+      product_url: "/mock-product-url",
       async: false
     }
   },
@@ -71,7 +69,7 @@ export const MockTallyman:ITallyman = {
     return {
       success: true,
       rockman_id: "000",
-      product_url: "https://www.yahoo.com/",
+      product_url: "/mock-product-url",
       msisdn:"000"
     }
   },
@@ -81,7 +79,7 @@ export const MockTallyman:ITallyman = {
     return {
       success: true,
       rockman_id: "000",
-      product_url: "https://www.yahoo.com/",
+      product_url: "/mock-product-url",
       msisdn:"000"
     }
   },
@@ -91,7 +89,7 @@ export const MockTallyman:ITallyman = {
     return {
       success: true,
       rockman_id: "000",
-      redirect_url: "https://www.yahoo.com/"
+      redirect_url: "/mock-product-url"
     }
   },
   triggerMessage:async(host:string, slug:string, country:string, msisdn:string, device:string, offer:number, rockmanId:string, search:string, extraParamsQs:string): Promise<IMoMSISDNSubmissionResult> =>{
@@ -125,31 +123,6 @@ export const MockTallyman:ITallyman = {
         shortcode: '666'
     }  
   },
-  tpayConsentConfig:async(host: string, country: string, slug: string, device:string, offer: number, rockmanId: string, search: string): Promise<ITpayConsentResult>=> {
-    console.log("MockTallyman")
-    sleep(2000);
-    return {
-      "prodSku": "gamelords",
-      "lang": "ar",
-      "country": "eg",
-      "subscription_url": "http:\/\/de.tallymans.com\/tallyman\/v1\/?action=one-click-subscribe&device=smart&slug=tpay-he-vidflixz&country=eg&offerId=1&rockman_id=13643b4780fb40bb8adf2feb2a400d7f&",
-      "config": {
-        "product_url": "http:\/\/de.tallymans.com\/#\/?uid=fdf098fcc6",
-        "subscription_plan_id": 829,
-        "public": "HFyenUyCJCxl1QTgtVCA",
-        "private": "vazlmVhGFyxKLOav6DvW",
-        "flow": "consent",
-        "catalog_name": {
-          "60201": "gamelords_org",
-          "60202": "gamelords_vdf",
-          "60203": "gamelords_etst"
-        }
-      },
-      "redirectUrl": "http:\/\/de.tallymans.com\/eg\/animal-game?country=eg&handle=animal-game&offer=1&device=smart&_extracted=957ad26679cd47a09d4efe28d4a4af72&operator=#operator#&msisdnSubmitted=Y&network_type=mobile_data&atmobirun=true&force_mcb_page=true&skipTrigger=true",
-      "rid": "957ad26679cd47a09d4efe28d4a4af72",
-      "success": true
-    } 
-  },
   mcpShield:async(host: string, country: string, slug: string, device:string, offer: number, rockmanId: string, operator?:string,): Promise<IMcpShieldResult>=> {
     console.log("MockTallyman")
     sleep(2000);
@@ -218,12 +191,6 @@ export const RealTallyman:ITallyman = {
     const newHost = isDMB ? "de.tallymans.com" : host;
     return await fetch(`https://${newHost}/tallyman/v1/?action=oc2sms&country=${country}&slug=${slug}&offerId=${offer}${!!keyword ? '&keyword=' + keyword : ''}&device=smart&rockman_id=${rockmanId}${!!operator ? '&operator=' + operator : ''}&${search}`).then(x => x.json())
   },
-  tpayConsentConfig:async(host: string, country: string, slug: string, device:string, offer: number, rockmanId: string, search: string): Promise<ITpayConsentResult>=> {
-    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/helper/?action=tpay-consent-config&country=${country}&slug=${slug}&device=${device}&offerId=${offer}&device=smart&rockman_id=${rockmanId}&${search}`).then(x => x.json())
-  },
   mcpShield:async(host: string, country: string, slug: string, device:string, offer: number, rockmanId: string, operator?:string, uniqid?:string): Promise<IMcpShieldResult>=> {
     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;

package/src/common-types/AppThunk.ts

@@ -8,9 +8,8 @@ import IMoRedirConstants from "../reducers/moRedirFlow/IMoRedirConstants";
 import IOneClickConstants from "../reducers/oneClickFlow/IOneClickConstants";
 import IClick2smsConstants from "../reducers/click2smsFlow/IClick2smsConstants";
 import IUssdConstants from "../reducers/ussdFlow/IUssdConstants";
-import ITpayHeConstants from "../reducers/tpayHeFlow/ITpayHeConstants";
 
-type IAllActionConstants = IStategyActionContants | IPinConstants | IMoConstants | IMoRedirConstants | IOneClickConstants | IClick2smsConstants | IUssdConstants | ITpayHeConstants;
+type IAllActionConstants = IStategyActionContants | IPinConstants | IMoConstants | IMoRedirConstants | IOneClickConstants | IClick2smsConstants | IUssdConstants;
 
 export type AppThunk<ReturnType = void> = ThunkAction<
   ReturnType,

package/src/flows/strategy.ts

@@ -12,8 +12,7 @@ function strategy<R>(
     moRedirFlow,
     oneClickFlow,
     click2smsFlow,
-    ussdFlow,
-    tpayHeFlow
+    ussdFlow
   }: 
   { 
     identifyFlowByOperatorSelect: (data: OPERATORSelectFlowIdentifySuccess) => R,
@@ -24,7 +23,6 @@ function strategy<R>(
     oneClickFlow: (data: IdentifyFlowOptionsResult<"getRedirectUrlAction">) => R
     click2smsFlow: (data: IdentifyFlowOptionsResult<"loadOc2sms">) => R,
     ussdFlow: (data: IdentifyFlowOptionsResult<"submitMSISDNAction">) => R,
-    tpayHeFlow: (data: IdentifyFlowOptionsResult<"loadTpayAction">) => R,
   }): (state: IStrategyCurrentState) => R {
     
     
@@ -46,8 +44,6 @@ function strategy<R>(
         return click2smsFlow(state.result);
       case 'USSD':
         return ussdFlow(state.result);
-      case 'TPAY_HE':
-        return tpayHeFlow(state.result);
     }
   }
 }

package/src/reducers/moRedirFlow/utils.ts

@@ -39,7 +39,7 @@ export const mockedMSISDNEntrySuccess : IMoRedirFlowReducerState = {
   currentState:{
     type: "MSISDNEntry",
     result: RDS.Success<MSISDNEntryFailure, MSISDNEntrySuccess>({
-      href: 'https://www.yahoo.com/'
+      href: '/mock-product-url'
     })
   }
 }

package/src/reducers/oneClickFlow/index.ts

@@ -11,7 +11,7 @@ import { IHash } from "../strategy/StrategyTypes";
 
 
 //ACTION CREATORS
-export function getRedirectUrlAction(extraParams?:ILinkExtraParams, autoRedirect?:boolean, isGetRedirectBupperWay?:boolean):AppThunk{
+export function getRedirectUrlAction({extraParams, autoRedirect = false, isGetRedirectBupperWay = false}:{extraParams?:ILinkExtraParams, autoRedirect?:boolean, isGetRedirectBupperWay?:boolean}):AppThunk{
 
   return async (dispatch, store)=>{
     const {currentState} = store().strategy

package/src/reducers/oneClickFlow/utils.ts

@@ -3,6 +3,8 @@ import { IConfig, ILinkExtraParams, IGETREDIRECTURLFailure, IGETREDIRECTURLSucce
 import * as RDS from "../../common-types/RemoteDataState";
 import IError from "../../common-types/IError";
 import { IHash } from "../strategy/StrategyTypes";
+import loadScriptInnerHtml from "../../utilities/loadScriptInnerHtml";
+import { IMcpShieldResult } from "../pinFlow/PinTypes";
 
 export const additionalQueryString = `msisdnSubmitted=Y&legalCheckbox=Y&incentivizedCheckbox=Y&op_confirmCheckbox=N`
 
@@ -30,15 +32,8 @@ const fetchJsonp: <T>(_url:string)=>Promise<T> = (_url:string)=>{
   });
 }
 
-const loadScriptInnerHtml = (innerHTML:string)=>{
-  var script = document.createElement('script');
-  script.type = 'text/javascript';
-  script.innerHTML = innerHTML
-  document.body.appendChild(script);
-  console.log('loadScript');
-}
-
-export const  getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraParams?:ILinkExtraParams): Promise<{
+let uniqidResult;
+export const getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraParams?:ILinkExtraParams): Promise<{
   subscription_url?:string;
   redirect_url?:string;
   action?:()=>Promise<string>;
@@ -46,7 +41,7 @@ export const  getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraP
   if (typeof window == "undefined") {
     throw "javascript: console.error('SSR'); void 6"
   } else {
-    const { host, country, slug, queryString, apiAction} = maybeConfig
+    const { host, country, slug, queryString, device, apiAction} = maybeConfig
     const bupperizeCountry = (c:string) => c == 'gb' ? 'uk' : c;
     const offer = window.pac_analytics.visitor.offer
     const s = window.location.search.substr(1)
@@ -78,6 +73,77 @@ export const  getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraP
         return {redirect_url:result.redirectUrlWithReplacedUniqid}
       }
     }else{
+      if(country.toLowerCase() === "za"){
+        try{
+          const mcpShieldResult: IMcpShieldResult = await window.tallymanApi.mcpShield(host, country, slug, device, offer, rockmanId)
+          if(false == mcpShieldResult.success){
+            console.warn(mcpShieldResult.message);
+          }else{
+            loadScriptInnerHtml(mcpShieldResult.source);
+            uniqidResult = mcpShieldResult.uniqid;
+            const mcpSessionCheckWithBlock = `
+            
+            document.addEventListener('click', function (event) {
+              
+              event.preventDefault();
+              try{
+                if (!event.target.matches('.mcp')) return;
+                  if (!window.isMcpSessionChecked) {
+                    
+                    var url = "https://de-ads.tallymans.com/tallyman/v1/?action=mcp-session-check&slug=${slug}&country=${country}&device=${device}&rockman_id=${rockmanId}&mcpUniqid=${uniqidResult}";
+                    
+                    fetch(url).then(function(res) {
+                      return res.json()
+                    }).then(function(resJson) {
+                      window.isMcpSessionChecked = true;
+                      console.log('MCP');
+          
+                      if (resJson["should-block"] == true) {
+                        document.body.innerHTML = ""
+                        
+                        var div = document.createElement("div");
+                        div.setAttribute("id", "page_blocked")
+                        div.style.width = "100%";
+                        div.style.height = "100%";
+                        div.style.background = "#fff";
+                        div.style.color = "#000";
+                        div.style.position = "fixed";
+                        div.style.display = "flex";
+                        div.style.justifyContent = "center";
+                        div.style.alignItems = "center";
+                        div.style.fontSize = "40px";
+                        div.style.top = "0";
+                        div.style.bottom = "0";
+                        div.style.left = "0";
+                        div.style.right = "0";
+                        div.innerHTML = "Offer Expired";
+                        document.body.appendChild(div);
+                      }else{
+                        const target = event.target || event.srcElement;
+
+                        while (target) {
+                          if (target instanceof HTMLAnchorElement) {
+                            console.log(target.getAttribute('href'));
+                            window.location.href = target.getAttribute('href')
+                            break;
+                          }
+                    
+                          target = target.parentNode;
+                        }
+                      }
+                    });
+                  }
+                }catch(err){
+                  console.error(err);
+                }
+              },false)
+              `
+              loadScriptInnerHtml(mcpSessionCheckWithBlock);
+          }
+        }catch(err){
+          console.warn(err)
+        }
+      }
       const url = `https://de.tallymans.com/tallyman/v1/?action=redirect&country=${bupperizeCountry(country)}&slug=${slug}&device=${"smart"}&offerId=${offer}&rockman_id=${rockmanId}${extraParamsQs}&${search}`
       const result = await fetch(url).then(x => x.json())
       
@@ -137,7 +203,7 @@ export const mockedRedirectUrlSuccessState : IOneClickFlowReducerState = {
   currentState:{
     type: "GET_REDIRECT_URL",
     //@ts-ignore
-    result: RDS.Success<IGETREDIRECTURLFailure, IGETREDIRECTURLSuccess>({redirectUrl: 'https://www.yahoo.com/'})
+    result: RDS.Success<IGETREDIRECTURLFailure, IGETREDIRECTURLSuccess>({redirectUrl: '/mock-product-url'})
   }
 }
 

package/src/reducers/pinFlow/utils.ts

@@ -2,15 +2,8 @@ import { IConfig, IHash, SingleMSISDNSubmissionResult, MultiOperatorMSISDNSubmis
 import IError from "../../common-types/IError";
 import * as RDS from "../../common-types/RemoteDataState";
 import { identifyUser, left, loop, right } from "../strategy/utils";
+import loadScriptInnerHtml from "../../utilities/loadScriptInnerHtml";
 
-const loadScriptInnerHtml = (innerHTML:string)=>{
-  var script = document.createElement('script');
-  script.type = 'text/javascript';
-  script.innerHTML = innerHTML;
-  var headElem = document.getElementsByTagName('head')[0];
-  headElem.insertBefore(script, headElem.firstChild)
-  console.log('loadScript');
-}
 
 export default async function submitMSISDN(window: Window, maybeConfig: IConfig, internationalMSISDN: string,extraParams?: IHash): Promise<SingleMSISDNSubmissionResult | MultiOperatorMSISDNSubmissionResult> {
 
@@ -218,7 +211,7 @@ export const mockedPINState : IPinFlowReducerState = {
 export const mockedCompletedState : IPinFlowReducerState = { 
   currentState:{
     type: "PINEntry",
-    result: RDS.Success<PINEntryFailure, PINEntrySuccess>({finalUrl:"https://www.yahoo.com/"}),
+    result: RDS.Success<PINEntryFailure, PINEntrySuccess>({finalUrl:"/mock-product-url"}),
     data:{
       actualPIN: "",
       nextAction: "submitPinAction",

package/src/reducers/strategy/utils.ts

@@ -260,7 +260,7 @@ export const subscribe:(url:string)=>Promise<string> = async(url:string)=>{
   //   subscribeError['type'] = "SubscriptionError";
   //   throw subscribeError
   // }else{
-    return "www.yahoo.com"
+    return "/mock-product-url"
   //}
 
 }

package/src/store/index.ts

@@ -13,10 +13,9 @@ import { IMoRedirActions } from "../reducers/moRedirFlow/MoRedirTypes";
 import { IOneClickActions } from "../reducers/oneClickFlow/OneClickTypes";
 import { RealTallyman, MockTallyman } from "../api";
 import { IClick2SmsActions } from "../reducers/click2smsFlow/Click2smsTypes";
-import { ITpayHeActions } from "../reducers/tpayHeFlow/TpayHeTypes";
 import { getConfig, getOperators } from "../reducers/strategy/utils";
 
-export type IApplicationActions = IStrategyActions | IPinActions | IMoActions | IMoRedirActions | IOneClickActions | IClick2SmsActions | IUssdActions | ITpayHeActions;
+export type IApplicationActions = IStrategyActions | IPinActions | IMoActions | IMoRedirActions | IOneClickActions | IClick2SmsActions | IUssdActions;
 
 const log =  createLogger({ diff: true, collapsed: true });
 

package/src/store/reducers.ts

@@ -7,7 +7,6 @@ import moRedirFlow from "../reducers/moRedirFlow";
 import oneClickFlow from "../reducers/oneClickFlow";
 import click2smsFlow from "../reducers/click2smsFlow";
 import ussdFlow from "../reducers/ussdFlow";
-import tpayHeFlow from "../reducers/tpayHeFlow";
 
 import { IStrategyReducerState } from "../reducers/strategy/StrategyTypes";
 import { IPinFlowReducerState } from "../reducers/pinFlow/PinTypes";
@@ -16,7 +15,6 @@ import { IMoRedirFlowReducerState } from "../reducers/moRedirFlow/MoRedirTypes";
 import { IOneClickFlowReducerState } from "../reducers/oneClickFlow/OneClickTypes";
 import { IClick2smsFlowReducerState } from "../reducers/click2smsFlow/Click2smsTypes";
 import { IUssdFlowReducerState } from "../reducers/ussdFlow/UssdTypes";
-import { ITpayHeFlowReducerState } from "../reducers/tpayHeFlow/TpayHeTypes";
 
 
 export interface IApplicationState {
@@ -27,7 +25,6 @@ export interface IApplicationState {
     oneClickFlow:IOneClickFlowReducerState;
     click2smsFlow:IClick2smsFlowReducerState;
     ussdFlow:IUssdFlowReducerState;
-    tpayHeFlow:ITpayHeFlowReducerState;
 }
 export default() => combineReducers<IApplicationState>({
     strategy,
@@ -36,6 +33,5 @@ export default() => combineReducers<IApplicationState>({
     moRedirFlow,
     oneClickFlow,
     click2smsFlow,
-    ussdFlow,
-    tpayHeFlow
+    ussdFlow
 });