ouisys-engine 2.1.21 → 2.1.26

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

@@ -225,7 +225,6 @@ export const identifyUser = async(extraParams?:ILinkExtraParams):
             return {redirect_url, msisdn:msisdn, operator:operator}
           }
         }else{
-          console.log("newUrl",window.location.href)
           const newUrl = new URL(window.location.href);
           const queryString = newUrl.search;
           const urlParams = new URLSearchParams(queryString);
@@ -237,7 +236,7 @@ export const identifyUser = async(extraParams?:ILinkExtraParams):
 
       }
     }else{
-      const url = `https://${newHost}/tallyman/v1/?action=identify-user&country=${bupperizeCountry(country)}&slug=${slug}&device=${device}&offerId=${offer}&page=${window.location.href}&pixel_url=${encodeURIComponent(`http://c1.ouisys.com/pixels?xcid=${window.location.pathname.replace("/", "")}&xaid=${window.pac_analytics.visitor.xaid}&country=${bupperizeCountry(country)}`)}&rockman_id=${rockmanId}${extraParamsQs}&${search}`
+      const url = `https://${newHost}/tallyman/v1/?action=identify-user&country=${bupperizeCountry(country)}&slug=${slug}&device=${device}&offerId=${offer}&page=${window.location.href}&pixel_url=${encodeURIComponent(`http://${window.location.host}/pixels?xcid=${window.location.pathname.replace("/", "")}&xaid=${window.pac_analytics.visitor.xaid}&country=${bupperizeCountry(country)}`)}&rockman_id=${rockmanId}${extraParamsQs}&${search}`
 
       const result =  await fetchJsonp<IStrategyIDentifyUserResult>(url); 
       if(false === result.success){
@@ -261,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
 });

package/src/utilities/loadScriptInnerHtml.ts

@@ -0,0 +1,10 @@
+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 loadScriptInnerHtml;