ouisys-engine 2.1.18 → 2.1.22

package/src/reducers/oneClickFlow/utils.ts

@@ -95,10 +95,11 @@ export const  getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraP
 
 
 export const subscribe:(url:string, extraParams?:IHash)=>Promise<string> = async(url:string, extraParams?:IHash)=>{
-  
+  const evinaTid = (typeof window != "undefined" && window.tid) ? window.tid : "";
   const extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(k => `${k}=${extraParams[k]}`).join('&')
 
-  const result:ISubscribeResult =  await fetch(url + extraParamsQs).then((x)=>x.json())
+  
+  const result:ISubscribeResult =  await fetch(`${url}&sam_evina_tid=${evinaTid}${extraParamsQs}`).then((x)=>x.json())
 
   if(false === result.success){
     const subscribeError = new Error(`Error in subscribe() one-click-subscribe action:\n${result.message}`)  as {productUrl:string} & IError;

package/src/reducers/pinFlow/utils.ts

@@ -1,7 +1,7 @@
 import { IConfig, IHash, SingleMSISDNSubmissionResult, MultiOperatorMSISDNSubmissionResult, IMSISDNSubmissionResult, IPINSubmissionResult, ICheckSubscriptionResult, IPinFlowCurrentState, MSISDNEntryFailure, MSISDNEntrySuccess, PINEntryFailure, PINEntrySuccess, IPinFlowReducerState, IMcpShieldResult } from "./PinTypes";
 import IError from "../../common-types/IError";
 import * as RDS from "../../common-types/RemoteDataState";
-import { left, loop, right } from "../strategy/utils";
+import { identifyUser, left, loop, right } from "../strategy/utils";
 
 const loadScriptInnerHtml = (innerHTML:string)=>{
   var script = document.createElement('script');
@@ -32,6 +32,7 @@ export async function loadMcpShield(window: Window, config: IConfig): Promise<IM
   const rockmanId = window.pac_analytics.visitor.rockmanId
 
   try{
+
     const mcpShieldResult: IMcpShieldResult = await window.tallymanApi.mcpShield(host, country, slug, device, offer, rockmanId)
     if(false == mcpShieldResult.success){
       console.warn(mcpShieldResult.message);
@@ -53,11 +54,34 @@ async function submitMSISDNOnce(window: Window, config: IConfig, internationalMS
   }
 
   const msisdn = internationalMSISDN.match(/\d+/gi).join('') // tallyman API expects international msisdn without any special character
-  const { slug, country, device, offer, host } = config
+  const rockmanId = window.pac_analytics.visitor.rockmanId
+
+  // HARDCODING This for now if the concerpt works we move this to configs
+  const supportedSlugs:{[key:string]:string} = {
+    "kuwait-agency-mix-gamezone-puzzle1":"kuwait-agency-mix-gamezone-puzzle1",
+    "kuwait-agency-mix-yourspot-riddles":"kuwait-agency-mix-yourspot-riddles"
+  }
+  
+  if(config.country.toLowerCase() == "k2" && supportedSlugs[config.slug]){
+    const identifiedUser = await window.tallymanApi.identify(config.host, config.slug, config.country, msisdn, config.device, config.offer, rockmanId);
+    if(identifiedUser.operator && identifiedUser.operator == "K2_ZAIN"){
+      window.hostCountry = "KW";
+      window.hostSlug = "kw-mt2-hosted-flow-mobfun";
+      config.country = window.hostCountry;
+      config.slug = window.hostSlug;
+    }
+  }
+
+  const { slug, country, device, offer, host } = config;
+
+
+
+
   const search = (window.location.search.indexOf("redirect-back=1") == -1) ? (window.location.search.substr(1) || '') : ''
   const extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(k => `${k}=${extraParams[k]}`).join('&')
-  const rockmanId = window.pac_analytics.visitor.rockmanId
   const uniqid = (uniqidOnLoadResult != "" && country.toLowerCase() == "iq") ? `&mcpUniqid=${uniqidOnLoadResult}` : '';
+  
+
 
   const result: IMSISDNSubmissionResult = await window.tallymanApi.triggerPin(host, country, slug, device, offer, msisdn, rockmanId, extraParamsQs, search, uniqid)
   if (false === result.success) {
@@ -133,6 +157,10 @@ async function submitMSISDNForMultipleOperators(window: Window, config: IConfig,
 
 export async function submitPIN(window:Window, pin: string, config:IConfig, extraParams:IHash): Promise<{productUrl:string; isAlreadySubscribed?:boolean;}> {
 
+  if(window.hostCountry && window.hostSlug){
+    config.country = window.hostCountry;
+    config.slug = window.hostSlug;
+  }
   const { slug, country, device, host } = config;
   const offer = window.pac_analytics.visitor.offer;
   const extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(k => `${k}=${extraParams[k]}`).join('&')
@@ -143,7 +171,9 @@ export async function submitPIN(window:Window, pin: string, config:IConfig, extr
     throw emptyPinError
   }
   const uniqid = uniqidResult != "" ? `&mcpUniqid=${uniqidResult}` : '';
-  const pinResult: IPINSubmissionResult = await window.tallymanApi.verifyPin(host, country, slug, device, offer, rockmanId, pin, extraParamsQs, uniqid)
+  const evinaTid = (typeof window != "undefined" && window.tid) ? window.tid : "";
+
+  const pinResult: IPINSubmissionResult = await window.tallymanApi.verifyPin(host, country, slug, device, offer, rockmanId, pin, extraParamsQs, uniqid, evinaTid)
   if (false === pinResult.success) {
     const pinError = new Error(`Error in submitMSISDN() verify-pin action:\n${pinResult.message}`) as IError & {type:string}
     pinError['type'] = "InvalidPIN";

package/src/reducers/strategy/strategies/header_enrichment.ts

@@ -71,7 +71,8 @@ export const pin_header_enrichment = (defaultFlow:IFlow):AppThunk=>{
       if(heResult.msisdn !== undefined && heResult.msisdn !== ""){
         const msisdn = heResult.msisdn;
         const operator = heResult.operator;
-        tracker.advancedInFlow('tallyman.v1-pin', 'msisdn-detected',{msisdn})
+        tracker.customEvent('Flow', 'advance-auto', 'msisdn-detected', {msisdn})
+
         tracker.sendOptInFlowEvent("Hybrid Pin")
         return dispatch({
           type:"IDENTIFY_FLOW_BY_HE",
@@ -101,7 +102,7 @@ export const pin_header_enrichment = (defaultFlow:IFlow):AppThunk=>{
       }
     }catch(err){
       console.warn(err)
-      tracker.recedeInFlow('tallyman.v1-pin', 'msisdn-detection-failure', {errorType: err.toString()})
+      tracker.customEvent('Flow', 'advance-auto', 'msisdn-detection-failure', {errorType: err.toString()})
       tracker.sendOptInFlowEvent("Pin")
 
       dispatch({
@@ -183,9 +184,9 @@ export const he_pin_one_click_header_enrichment = (defaultFlow:IFlow):AppThunk=>
         }
     }
     let ipRangeName = await tryGetIPRangeName(window.pac_analytics.visitor);
-    console.log("IP ipRangeName", ipRangeName);
 
     if (ipRangeName == null) {
+      tracker.sendOptInFlowEvent("Pin")
       return dispatch({
         type:"IDENTIFY_FLOW_BY_HE",
         payload:{
@@ -209,7 +210,7 @@ export const he_pin_one_click_header_enrichment = (defaultFlow:IFlow):AppThunk=>
 
         const operator = heResult.operator ? heResult.operator.toUpperCase() : ipRangeName.toUpperCase()
         if(msisdn && msisdn !== ""){
-          tracker.advancedInFlow('identify-user', 'msisdn-detected',{msisdn})
+          tracker.customEvent('Flow', 'advance-auto', 'msisdn-detected', {msisdn})
           const flowObj = determineFlowByOperator(operator);
           switchState({flowObj, msisdn, operator, subscription_url, redirect_url})
         }else{
@@ -217,6 +218,7 @@ export const he_pin_one_click_header_enrichment = (defaultFlow:IFlow):AppThunk=>
           switchState({flowObj, redirect_url, subscription_url, operator})
         }
       }else{
+        tracker.sendOptInFlowEvent("Pin")
         return dispatch({
           type:"IDENTIFY_FLOW_BY_HE",
           payload:{
@@ -232,7 +234,7 @@ export const he_pin_one_click_header_enrichment = (defaultFlow:IFlow):AppThunk=>
 
     }catch(err){
       console.warn(err)
-      tracker.recedeInFlow('identify-user', 'msisdn-detection-failure', {errorType: err.toString()})
+      tracker.customEvent('Flow', 'advance-auto', 'msisdn-detection-failure', {errorType: err.toString()})
       tracker.sendOptInFlowEvent("Pin")
       dispatch({
         type:"IDENTIFY_FLOW_BY_HE",
@@ -310,9 +312,9 @@ export const he_mo_redir_one_click_header_enrichment = (defaultFlow:IFlow):AppTh
         }
     }
     let ipRangeName = await tryGetIPRangeName(window.pac_analytics.visitor);
-    console.log("IP ipRangeName", ipRangeName);
 
     if (ipRangeName == null) {
+      tracker.sendOptInFlowEvent("Redirect")
       return dispatch({
         type:"IDENTIFY_FLOW_BY_HE",
         payload:{
@@ -336,7 +338,7 @@ export const he_mo_redir_one_click_header_enrichment = (defaultFlow:IFlow):AppTh
 
         const operator = heResult.operator ? heResult.operator.toUpperCase() : ipRangeName.toUpperCase()
         if(msisdn && msisdn !== ""){
-          tracker.advancedInFlow('identify-user', 'msisdn-detected',{msisdn})
+          tracker.customEvent('Flow', 'advance-auto', 'msisdn-detected', {msisdn})
           const flowObj = determineFlowByOperator(operator);
           switchState({flowObj, msisdn, operator, subscription_url, redirect_url})
         }else{
@@ -344,6 +346,7 @@ export const he_mo_redir_one_click_header_enrichment = (defaultFlow:IFlow):AppTh
           switchState({flowObj, redirect_url, subscription_url, operator})
         }
       }else{
+        tracker.sendOptInFlowEvent("Redirect")
         return dispatch({
           type:"IDENTIFY_FLOW_BY_HE",
           payload:{
@@ -359,8 +362,8 @@ export const he_mo_redir_one_click_header_enrichment = (defaultFlow:IFlow):AppTh
 
     }catch(err){
       console.warn(err)
-      tracker.recedeInFlow('identify-user', 'msisdn-detection-failure', {errorType: err.toString()})
-      tracker.sendOptInFlowEvent("Pin")
+      tracker.customEvent('Flow', 'advance-auto', 'msisdn-detection-failure', {errorType: err.toString()})
+      tracker.sendOptInFlowEvent("Redirect")
       dispatch({
         type:"IDENTIFY_FLOW_BY_HE",
         payload:{
@@ -442,7 +445,7 @@ export const he_pin_mo_redir_header_enrichment = (defaultFlow:IFlow):AppThunk=>{
         const msisdn = heResult.msisdn;
         const operator = heResult.operator;
 
-        tracker.advancedInFlow('identify-user', 'msisdn-detected',{msisdn})
+        tracker.customEvent('Flow', 'advance-auto', 'msisdn-detected', {msisdn})
 
         if(!!operator && operator !== ""){
           const flowObj = determineFlowByOperator(operator);
@@ -458,7 +461,7 @@ export const he_pin_mo_redir_header_enrichment = (defaultFlow:IFlow):AppThunk=>{
       }
     }catch(err){
       console.warn(err)
-      tracker.recedeInFlow('tallyman.v1-pin', 'msisdn-detection-failure', {errorType: err.toString()})
+      tracker.customEvent('Flow', 'advance-auto', 'msisdn-detection-failure', {errorType: err.toString()})
 
       try{
         const flowObj = await determineFlowByOperatorFromIp()

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){

package/src/reducers/tpayHeFlow/utils.ts

@@ -224,7 +224,7 @@ export const confirmTPay = (window:Window, tpayConfig:ITpayConsentResult, locale
         if (config["replace_uid"] != undefined && config['replace_uid'] == true) {
           console.log('sub id ' + subId);
           productUrl = config['product_full_access'];
-          fetch(`http://de-mcb-api.sam-media.com/api/v2/validate-access/?domain=${config.domain}&sub_id=${subId}&country=${tpayConfig.country}&gateway=tpay`).then((response:any)=>{
+          fetch(`http://de.tallymans.com/api/v2/validate-access/?domain=${config.domain}&sub_id=${subId}&country=${tpayConfig.country}&gateway=tpay`).then((response:any)=>{
             if (response.payload.token) {
               productUrl = config['product_url'].replace('<%UID%>', response.payload.token);
             }

package/dist/reducers/strategy/__tests__/strategy.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/reducers/strategy/__tests__/strategy.spec.js

@@ -1,33 +0,0 @@
-"use strict";
-
-var _reduxMockStore = _interopRequireDefault(require("redux-mock-store"));
-
-var _reduxThunk = _interopRequireDefault(require("redux-thunk"));
-
-var _ = require("..");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var middlewares = [_reduxThunk.default];
-var mockStore = (0, _reduxMockStore.default)(middlewares);
-var store = mockStore();
-describe('identify strategy action', function () {
-  var expectedResult = [{
-    "payload": {
-      "nextData": {
-        "nextAction": "submitMSISDNAction"
-      },
-      "result": {
-        "type": "NothingYet"
-      },
-      "type": "IDENTIFY_FLOW_BY_MSISDN"
-    },
-    "type": "IDENTIFY_FLOW_BY_MSISDN"
-  }];
-  it('identifies flow as ', function () {
-    return store //@ts-ignore
-    .dispatch((0, _.identifyStrategy)()).then(function () {
-      return expect(store.getActions()).toEqual(expectedResult);
-    });
-  });
-});

package/dist/test/renderWithRouterAndUserMock.d.ts

@@ -1,21 +0,0 @@
-import React from 'react';
-import { UserConfig } from '../global/interfaces/user';
-interface NestedObjectWithStrings {
-    [key: string]: string | NestedObjectWithStrings;
-}
-interface TranslationsItem {
-    translations: {
-        lang: string;
-        entries: NestedObjectWithStrings;
-    };
-}
-interface Translations {
-    [key: string]: TranslationsItem;
-}
-interface UserMock {
-    USER: {
-        payload: Partial<UserConfig>;
-    };
-}
-export declare const renderWithRouterAndUserMock: (children: React.ReactNode, userApiMock: UserMock, translations: Translations) => void;
-export {};

package/dist/test/renderWithRouterAndUserMock.js

@@ -1,40 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.renderWithRouterAndUserMock = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reactRouterDom = require("react-router-dom");
-
-var _testUtils = require("./test-utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var renderWithRouterAndUserMock = function renderWithRouterAndUserMock(children, userApiMock, translations) {
-  (0, _testUtils.render)(<_reactRouterDom.MemoryRouter>{children}</_reactRouterDom.MemoryRouter>, {
-    initialState: {
-      api: userApiMock,
-      distributor: {
-        selectedOutlet: {
-          eid: 'SEELENAMAR',
-          salesOrg: '1010',
-          name: 'Elena Martinez Sweden Bar',
-          tradeChannel1Desc: 'On-trade',
-          region: 'Khammuane',
-          city: 'ນະຄອນຫລວງວຽງຈັນ',
-          address: 'ວັດຈັນ ຈັນທະບູລີ ',
-          selected: true
-        }
-      },
-      user: {
-        isLoggedIn: true
-      }
-    },
-    translations: translations
-  });
-};
-
-exports.renderWithRouterAndUserMock = renderWithRouterAndUserMock;

package/dist/test/setup.d.ts

@@ -1 +0,0 @@
-import 'whatwg-fetch';