ouisys-engine 3.0.2 → 3.0.3

package/dist/reducers/oneClickFlow/utils.js

@@ -120,7 +120,7 @@ var uniqidResult;
 
 var getRedirectUrl = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(window, maybeConfig, extraParams) {
-    var host, country, slug, queryString, device, apiAction, bupperizeCountry, offer, s, search, extraParamsQs, rockmanId, _url2, result, identifyError, _url3, _result, _identifyError, mcpShieldResult, mcpSessionCheckWithBlock, _url4, _result2, _identifyError2;
+    var host, country, slug, queryString, device, apiAction, customDomain, 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) {
@@ -135,6 +135,7 @@ var getRedirectUrl = /*#__PURE__*/function () {
 
           case 4:
             host = maybeConfig.host, country = maybeConfig.country, slug = maybeConfig.slug, queryString = maybeConfig.queryString, device = maybeConfig.device, apiAction = maybeConfig.apiAction;
+            customDomain = slug === "evina-test-handle" ? "dev.ng.eu.ngrok.io" : "de-ads.tallymans.com";
 
             bupperizeCountry = function bupperizeCountry(c) {
               return c == 'gb' ? 'uk' : c;
@@ -155,19 +156,19 @@ var getRedirectUrl = /*#__PURE__*/function () {
             rockmanId = window.pac_analytics.visitor.rockmanId;
 
             if (!(apiAction == "identify-user")) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
 
             _url2 = "https://de.tallymans.com/tallyman/v1/?action=identify-user&country=".concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=", "smart", "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId).concat(extraParamsQs, "&").concat(search);
-            _context.next = 15;
+            _context.next = 16;
             return fetchJsonp(_url2);
 
-          case 15:
+          case 16:
             result = _context.sent;
 
             if (!(false === result.success)) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
 
@@ -175,7 +176,7 @@ var getRedirectUrl = /*#__PURE__*/function () {
             identifyError['type'] = "NotOn3g";
             throw identifyError;
 
-          case 22:
+          case 23:
             return _context.abrupt("return", {
               subscription_url: result.subscription_url || result.redirect_url,
               action: function action() {
@@ -183,27 +184,27 @@ var getRedirectUrl = /*#__PURE__*/function () {
               }
             });
 
-          case 23:
-            _context.next = 62;
+          case 24:
+            _context.next = 63;
             break;
 
-          case 25:
+          case 26:
             if (!(apiAction == "he")) {
-              _context.next = 40;
+              _context.next = 41;
               break;
             }
 
             _url3 = "https://de.tallymans.com/tallyman/v1/?action=he&country=".concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=", "smart", "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId).concat(extraParamsQs, "&").concat(search);
-            _context.next = 29;
+            _context.next = 30;
             return fetch(_url3).then(function (x) {
               return x.json();
             });
 
-          case 29:
+          case 30:
             _result = _context.sent;
 
             if (!(false === _result.success)) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
 
@@ -211,27 +212,27 @@ var getRedirectUrl = /*#__PURE__*/function () {
             _identifyError['type'] = "NotOn3g";
             throw _identifyError;
 
-          case 36:
+          case 37:
             (0, _loadScriptInnerHtml.default)(_result.source);
             return _context.abrupt("return", {
               redirect_url: _result.redirectUrlWithReplacedUniqid
             });
 
-          case 38:
-            _context.next = 62;
+          case 39:
+            _context.next = 63;
             break;
 
-          case 40:
-            if (!(country.toLowerCase() === "za")) {
-              _context.next = 51;
+          case 41:
+            if (!(country.toLowerCase() === "za" && slug !== 'evina-test-handle')) {
+              _context.next = 52;
               break;
             }
 
-            _context.prev = 41;
-            _context.next = 44;
+            _context.prev = 42;
+            _context.next = 45;
             return window.tallymanApi.mcpShield(host, country, slug, device, offer, rockmanId);
 
-          case 44:
+          case 45:
             mcpShieldResult = _context.sent;
 
             if (false == mcpShieldResult.success) {
@@ -243,26 +244,26 @@ var getRedirectUrl = /*#__PURE__*/function () {
               (0, _loadScriptInnerHtml.default)(mcpSessionCheckWithBlock);
             }
 
-            _context.next = 51;
+            _context.next = 52;
             break;
 
-          case 48:
-            _context.prev = 48;
-            _context.t0 = _context["catch"](41);
+          case 49:
+            _context.prev = 49;
+            _context.t0 = _context["catch"](42);
             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 = 54;
+          case 52:
+            _url4 = "https://".concat(customDomain, "/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 = 55;
             return fetch(_url4).then(function (x) {
               return x.json();
             });
 
-          case 54:
+          case 55:
             _result2 = _context.sent;
 
             if (!(false === _result2.success)) {
-              _context.next = 61;
+              _context.next = 62;
               break;
             }
 
@@ -270,17 +271,17 @@ var getRedirectUrl = /*#__PURE__*/function () {
             _identifyError2['type'] = "NotOn3g";
             throw _identifyError2;
 
-          case 61:
+          case 62:
             return _context.abrupt("return", {
               redirect_url: _result2.redirect_url
             });
 
-          case 62:
+          case 63:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[41, 48]]);
+    }, _callee, null, [[42, 49]]);
   }));
 
   return function getRedirectUrl(_x, _x2, _x3) {

package/dist/reducers/strategy/StrategyTypes.d.ts

@@ -47,7 +47,7 @@ export declare type IStrategy = {
     country: string;
     strategyConfigs: StrategyConfig;
 };
-export declare type IStrategyNames = "pin" | "mo" | "mo-redir" | "click2sms" | "one-click" | "ussd" | "tpay-he" | "tallyman-one-click" | "pin-mo-ask-operator" | "pin-mo-ask-mobile-number" | "pin-one-click-ask-operator" | "pin-one-click-detect-operator-by-ip" | "one-click-mo-pin-detect-operator-by-ip-or-msisdn" | "pin-click2sms-ask-operator" | "mo-redir-one-click-detect-operator-by-ip" | "pin-mo-redir-ask-mobile-number" | "pin-click2sms-ask-mobile-number" | "mo-one-click-detect-operator-by-ip" | "click2sms-one-click-detect-operator-by-ip" | "pin-header-enrichment" | "pin-msisdn-fowarding-pin-header-enrichment" | "he-pin-mo-redir-header-enrichment" | "he-pin-one-click-header-enrichment" | "he-pin-one-click-ask-operator" | "click2sms-one-click-ask-operator" | "pin-mo-detect-operator-by-ip" | "he-mo-redir-one-click-header-enrichment";
+export declare type IStrategyNames = "pin" | "mo" | "mo-redir" | "click2sms" | "one-click" | "ussd" | "tpay-he" | "tallyman-one-click" | "pin-mo-ask-operator" | "pin-mo-ask-mobile-number" | "pin-one-click-ask-operator" | "pin-one-click-detect-operator-by-ip" | "one-click-mo-pin-detect-operator-by-ip-or-msisdn" | "pin-click2sms-ask-operator" | "mo-redir-one-click-detect-operator-by-ip" | "pin-mo-redir-ask-mobile-number" | "pin-click2sms-ask-mobile-number" | "mo-one-click-detect-operator-by-ip" | "click2sms-one-click-detect-operator-by-ip" | "pin-header-enrichment" | "pin-msisdn-fowarding-pin-header-enrichment" | "he-pin-mo-redir-header-enrichment" | "he-pin-one-click-header-enrichment" | "he-pin-one-click-ask-operator" | "click2sms-one-click-ask-operator" | "pin-mo-detect-operator-by-ip" | "he-mo-redir-one-click-header-enrichment" | "pin-combo-ask-mobile-number";
 export interface IHash {
     [key: string]: string;
 }

package/dist/reducers/strategy/index.js

@@ -182,7 +182,7 @@ function identifyStrategy() {
 
             case 7:
               _context.t0 = strategy;
-              _context.next = _context.t0 === "pin-mo-ask-operator" ? 10 : _context.t0 === "pin-mo-redir-ask-mobile-number" ? 11 : _context.t0 === "pin-mo-ask-mobile-number" ? 11 : _context.t0 === "pin-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "one-click-mo-pin-detect-operator-by-ip-or-msisdn" ? 12 : _context.t0 === "mo-redir-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "mo-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "click2sms-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "pin-mo-detect-operator-by-ip" ? 12 : _context.t0 === "pin-click2sms-ask-operator" ? 13 : _context.t0 === "he-pin-one-click-ask-operator" ? 13 : _context.t0 === "click2sms-one-click-ask-operator" ? 13 : _context.t0 === "pin-one-click-ask-operator" ? 13 : _context.t0 === "pin-header-enrichment" ? 14 : _context.t0 === "he-pin-mo-redir-header-enrichment" ? 14 : _context.t0 === "he-pin-one-click-header-enrichment" ? 14 : _context.t0 === "he-mo-redir-one-click-header-enrichment" ? 14 : _context.t0 === "pin" ? 15 : _context.t0 === "mo" ? 17 : _context.t0 === "mo-redir" ? 19 : _context.t0 === "one-click" ? 21 : _context.t0 === "tallyman-one-click" ? 23 : _context.t0 === "click2sms" ? 25 : _context.t0 === "ussd" ? 27 : _context.t0 === "tpay-he" ? 29 : 31;
+              _context.next = _context.t0 === "pin-mo-ask-operator" ? 10 : _context.t0 === "pin-mo-redir-ask-mobile-number" ? 11 : _context.t0 === "pin-mo-ask-mobile-number" ? 11 : _context.t0 === "pin-combo-ask-mobile-number" ? 11 : _context.t0 === "pin-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "one-click-mo-pin-detect-operator-by-ip-or-msisdn" ? 12 : _context.t0 === "mo-redir-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "mo-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "click2sms-one-click-detect-operator-by-ip" ? 12 : _context.t0 === "pin-mo-detect-operator-by-ip" ? 12 : _context.t0 === "pin-click2sms-ask-operator" ? 13 : _context.t0 === "he-pin-one-click-ask-operator" ? 13 : _context.t0 === "click2sms-one-click-ask-operator" ? 13 : _context.t0 === "pin-one-click-ask-operator" ? 13 : _context.t0 === "pin-header-enrichment" ? 14 : _context.t0 === "he-pin-mo-redir-header-enrichment" ? 14 : _context.t0 === "he-pin-one-click-header-enrichment" ? 14 : _context.t0 === "he-mo-redir-one-click-header-enrichment" ? 14 : _context.t0 === "pin" ? 15 : _context.t0 === "mo" ? 17 : _context.t0 === "mo-redir" ? 19 : _context.t0 === "one-click" ? 21 : _context.t0 === "tallyman-one-click" ? 23 : _context.t0 === "click2sms" ? 25 : _context.t0 === "ussd" ? 27 : _context.t0 === "tpay-he" ? 29 : 31;
               break;
 
             case 10:

package/dist/reducers/strategy/strategies/ask_mobile_number.d.ts

@@ -3,5 +3,6 @@ import { IFlow } from "../StrategyTypes";
 export default function ask_mobile_number(): AppThunk;
 export declare function submitMSISDNAction(internationalMSISDN: string): AppThunk;
 export declare const pin_mo_ask_mobile_number: (flowObj: IFlow, msisdn: string) => AppThunk;
+export declare const pin_combo_ask_mobile_number: (flowObj: IFlow, msisdn: string) => AppThunk;
 export declare const pin_mo_redir_ask_mobile_number: (flowObj: IFlow, msisdn: string) => AppThunk;
 export declare const one_click_mo_pin_detect_operator_by_ip_or_msisdn: (flowObj: IFlow, msisdn: string) => AppThunk;

package/dist/reducers/strategy/strategies/ask_mobile_number.js

@@ -46,7 +46,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ask_mobile_number;
-exports.pin_mo_redir_ask_mobile_number = exports.pin_mo_ask_mobile_number = exports.one_click_mo_pin_detect_operator_by_ip_or_msisdn = void 0;
+exports.pin_mo_redir_ask_mobile_number = exports.pin_mo_ask_mobile_number = exports.pin_combo_ask_mobile_number = exports.one_click_mo_pin_detect_operator_by_ip_or_msisdn = void 0;
 exports.submitMSISDNAction = submitMSISDNAction;
 
 require("core-js/modules/es.object.to-string.js");
@@ -126,6 +126,7 @@ function submitMSISDNAction(internationalMSISDN) {
 
             case 5:
               flowObj = _context.sent;
+              console.log("flowObj", flowObj);
               dispatch({
                 type: "IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
                 payload: {
@@ -139,21 +140,24 @@ function submitMSISDNAction(internationalMSISDN) {
                 }
               });
               _context.t0 = strategy;
-              _context.next = _context.t0 === "pin-mo-redir-ask-mobile-number" ? 10 : _context.t0 === "pin-mo-ask-mobile-number" ? 11 : 12;
+              _context.next = _context.t0 === "pin-mo-redir-ask-mobile-number" ? 11 : _context.t0 === "pin-mo-ask-mobile-number" ? 12 : _context.t0 === "pin-combo-ask-mobile-number" ? 13 : 14;
               break;
 
-            case 10:
+            case 11:
               return _context.abrupt("return", dispatch(pin_mo_redir_ask_mobile_number(flowObj, internationalMSISDN)));
 
-            case 11:
+            case 12:
               return _context.abrupt("return", dispatch(pin_mo_ask_mobile_number(flowObj, internationalMSISDN)));
 
-            case 12:
-              _context.next = 19;
-              break;
+            case 13:
+              return _context.abrupt("return", dispatch(pin_combo_ask_mobile_number(flowObj, internationalMSISDN)));
 
             case 14:
-              _context.prev = 14;
+              _context.next = 21;
+              break;
+
+            case 16:
+              _context.prev = 16;
               _context.t1 = _context["catch"](0);
               console.warn(_context.t1);
               errorType = "SEAlreadySubscribed" === _context.t1.type ? "AlreadySubscribed" : "SEInvalidMSISDN" == _context.t1.type ? "InvalidMSISDN" : "UnknownError";
@@ -168,12 +172,12 @@ function submitMSISDNAction(internationalMSISDN) {
                 }
               });
 
-            case 19:
+            case 21:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 14]]);
+      }, _callee, null, [[0, 16]]);
     }));
 
     return function (_x) {
@@ -254,6 +258,60 @@ var pin_mo_ask_mobile_number = function pin_mo_ask_mobile_number(flowObj, msisdn
 
 exports.pin_mo_ask_mobile_number = pin_mo_ask_mobile_number;
 
+var pin_combo_ask_mobile_number = function pin_combo_ask_mobile_number(flowObj, msisdn) {
+  return function (dispatch) {
+    switch (flowObj.flow) {
+      case "pin":
+        _.tracker.sendOptInFlowEvent("Pin");
+
+        dispatch({
+          type: "IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
+          payload: {
+            type: "IDENTIFY_FLOW_BY_MSISDN",
+            result: RDS.Loading(),
+            nextData: _objectSpread({
+              nextAction: "submitMSISDNAction"
+            }, flowObj.operator && {
+              operator: flowObj.operator
+            })
+          }
+        });
+        return dispatch({
+          type: "IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
+          payload: {
+            type: "PIN",
+            result: _objectSpread({
+              nextAction: "submitMSISDNAction",
+              config: flowObj.flowConfig,
+              msisdn: msisdn
+            }, flowObj.operator && {
+              operator: flowObj.operator
+            })
+          }
+        });
+
+      default:
+        _.tracker.sendOptInFlowEvent("Pin");
+
+        return dispatch({
+          type: "IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
+          payload: {
+            type: "PIN",
+            result: _objectSpread({
+              nextAction: "submitMSISDNAction",
+              config: flowObj.flowConfig,
+              rockman_id: flowObj.rockman_id
+            }, flowObj.operator && {
+              operator: flowObj.operator
+            })
+          }
+        });
+    }
+  };
+};
+
+exports.pin_combo_ask_mobile_number = pin_combo_ask_mobile_number;
+
 var pin_mo_redir_ask_mobile_number = function pin_mo_redir_ask_mobile_number(flowObj, msisdn) {
   return function (dispatch) {
     switch (flowObj.flow) {

package/package.json

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

package/src/reducers/oneClickFlow/utils.ts

@@ -42,6 +42,8 @@ export const getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraPa
     throw "javascript: console.error('SSR'); void 6"
   } else {
     const { host, country, slug, queryString, device, apiAction} = maybeConfig
+    const customDomain = slug === "evina-test-handle" ? "dev.ng.eu.ngrok.io" : "de-ads.tallymans.com";
+
     const bupperizeCountry = (c:string) => c == 'gb' ? 'uk' : c;
     const offer = window.pac_analytics.visitor.offer
     const s = window.location.search.substr(1)
@@ -73,7 +75,7 @@ export const getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraPa
         return {redirect_url:result.redirectUrlWithReplacedUniqid}
       }
     }else{
-      if(country.toLowerCase() === "za"){
+      if(country.toLowerCase() === "za" && slug !== 'evina-test-handle'){
         try{
           const mcpShieldResult: IMcpShieldResult = await window.tallymanApi.mcpShield(host, country, slug, device, offer, rockmanId)
           if(false == mcpShieldResult.success){
@@ -144,7 +146,7 @@ export const getRedirectUrl = async(window:Window, maybeConfig: IConfig, extraPa
           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 url = `https://${customDomain}/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())
       
       if(false === result.success){

package/src/reducers/strategy/StrategyTypes.ts

@@ -85,7 +85,8 @@ export type IStrategyNames =
   | "he-pin-one-click-ask-operator"
   | "click2sms-one-click-ask-operator"
   | "pin-mo-detect-operator-by-ip"
-  | "he-mo-redir-one-click-header-enrichment";
+  | "he-mo-redir-one-click-header-enrichment"
+  | "pin-combo-ask-mobile-number";
 
 export interface IHash {
   [key: string]: string

package/src/reducers/strategy/index.ts

@@ -111,6 +111,7 @@ export function  identifyStrategy():AppThunk {
           return dispatch(ask_operator());
         case "pin-mo-redir-ask-mobile-number":
         case "pin-mo-ask-mobile-number":
+        case "pin-combo-ask-mobile-number":
           return dispatch(ask_mobile_number());
         case "pin-one-click-detect-operator-by-ip":
         case "one-click-mo-pin-detect-operator-by-ip-or-msisdn":

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

@@ -50,6 +50,8 @@ export function submitMSISDNAction(internationalMSISDN:string):AppThunk{
         })
         const { strategy } = getConfig();
         const flowObj  =  await determineFlowByMsidn(internationalMSISDN);
+
+        console.log("flowObj", flowObj)
         dispatch({
           type:"IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
           payload:{
@@ -66,6 +68,8 @@ export function submitMSISDNAction(internationalMSISDN:string):AppThunk{
             return dispatch(pin_mo_redir_ask_mobile_number(flowObj, internationalMSISDN))
           case "pin-mo-ask-mobile-number":
             return dispatch(pin_mo_ask_mobile_number(flowObj, internationalMSISDN))
+          case "pin-combo-ask-mobile-number":
+            return dispatch(pin_combo_ask_mobile_number(flowObj, internationalMSISDN))
         }
       } catch (ex) {
         console.warn(ex)
@@ -153,6 +157,52 @@ export const pin_mo_ask_mobile_number = (flowObj:IFlow, msisdn:string):AppThunk=
   }
 }
 
+export const pin_combo_ask_mobile_number = (flowObj:IFlow, msisdn:string):AppThunk=>{
+  return(dispatch)=>{
+    switch (flowObj.flow) {
+      case "pin":
+        tracker.sendOptInFlowEvent("Pin")
+        dispatch({
+          type:"IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
+          payload:{
+            type: "IDENTIFY_FLOW_BY_MSISDN",
+            result: RDS.Loading(),
+            nextData:{
+              nextAction:"submitMSISDNAction",
+              ...(flowObj.operator && {operator:flowObj.operator})
+            }
+          }
+        })
+        return dispatch({
+          type:"IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
+          payload:{
+            type:"PIN",
+            result: {
+              nextAction:"submitMSISDNAction",
+              config:flowObj.flowConfig,
+              msisdn,
+              ...(flowObj.operator && {operator:flowObj.operator})
+            }
+          }
+        });
+      default:
+        tracker.sendOptInFlowEvent("Pin")
+        return dispatch({
+          type:"IDENTIFY_FLOW_BY_MSISDN_SUBMIT",
+          payload:{
+            type:"PIN",
+            result: {
+              nextAction:"submitMSISDNAction",
+              config:flowObj.flowConfig,
+              rockman_id:flowObj.rockman_id,
+              ...(flowObj.operator && {operator:flowObj.operator})
+            }
+          }
+        });
+    }
+  }
+}
+
 
 export const pin_mo_redir_ask_mobile_number = (flowObj:IFlow, msisdn:string):AppThunk=>{
   return(dispatch)=>{