ouisys-engine 2.1.20 → 2.1.25

package/dist/reducers/pinFlow/utils.js

@@ -398,7 +398,7 @@ function submitPIN(_x16, _x17, _x18, _x19) {
 
 function _submitPIN() {
   _submitPIN = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(window, pin, config, extraParams) {
-    var slug, country, device, host, offer, extraParamsQs, rockmanId, emptyPinError, uniqid, pinResult, pinError, check, checkResult, isAlreadySubscribed, _pinError, _isAlreadySubscribed;
+    var slug, country, device, host, offer, extraParamsQs, rockmanId, emptyPinError, uniqid, evinaTid, pinResult, pinError, check, checkResult, isAlreadySubscribed, _pinError, _isAlreadySubscribed;
 
     return regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) {
@@ -427,14 +427,15 @@ function _submitPIN() {
 
           case 9:
             uniqid = uniqidResult != "" ? "&mcpUniqid=".concat(uniqidResult) : '';
-            _context6.next = 12;
-            return window.tallymanApi.verifyPin(host, country, slug, device, offer, rockmanId, pin, extraParamsQs, uniqid);
+            evinaTid = typeof window != "undefined" && window.tid ? window.tid : "";
+            _context6.next = 13;
+            return window.tallymanApi.verifyPin(host, country, slug, device, offer, rockmanId, pin, extraParamsQs, uniqid, evinaTid);
 
-          case 12:
+          case 13:
             pinResult = _context6.sent;
 
             if (!(false === pinResult.success)) {
-              _context6.next = 19;
+              _context6.next = 20;
               break;
             }
 
@@ -442,9 +443,9 @@ function _submitPIN() {
             pinError['type'] = "InvalidPIN";
             throw pinError;
 
-          case 19:
+          case 20:
             if (!(true === pinResult.async)) {
-              _context6.next = 34;
+              _context6.next = 35;
               break;
             }
 
@@ -452,16 +453,16 @@ function _submitPIN() {
               return window.tallymanApi.checkSubscription(host, country, slug, device, offer, rockmanId, pin, extraParamsQs);
             };
 
-            _context6.next = 23;
+            _context6.next = 24;
             return (0, _utils.loop)(check, 30, function (r) {
               return r.success;
             }, 0);
 
-          case 23:
+          case 24:
             checkResult = _context6.sent;
 
             if (!(true === checkResult.success)) {
-              _context6.next = 29;
+              _context6.next = 30;
               break;
             }
 
@@ -471,23 +472,23 @@ function _submitPIN() {
               isAlreadySubscribed: isAlreadySubscribed
             });
 
-          case 29:
+          case 30:
             _pinError = new Error("Error in submitMSISDN() verify-pin action:\n".concat(checkResult.message));
             _pinError['type'] = "InvalidPIN";
             throw _pinError;
 
-          case 32:
-            _context6.next = 36;
+          case 33:
+            _context6.next = 37;
             break;
 
-          case 34:
+          case 35:
             _isAlreadySubscribed = pinResult.message == "ALREADY SUBSCRIBED" ? true : false;
             return _context6.abrupt("return", {
               productUrl: pinResult.product_url || null,
               isAlreadySubscribed: _isAlreadySubscribed
             });
 
-          case 36:
+          case 37:
           case "end":
             return _context6.stop();
         }
@@ -515,7 +516,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

@@ -431,7 +431,7 @@ var identifyUser = /*#__PURE__*/function () {
             searchObj = searchToObject();
 
             if (!(!!searchObj["redirect-back"] && searchObj["redirect-back"] == "1" && !!searchObj.success)) {
-              _context2.next = 57;
+              _context2.next = 56;
               break;
             }
 
@@ -503,11 +503,10 @@ var identifyUser = /*#__PURE__*/function () {
             });
 
           case 46:
-            _context2.next = 55;
+            _context2.next = 54;
             break;
 
           case 48:
-            console.log("newUrl", window.location.href);
             _newUrl2 = new URL(window.location.href);
             _queryString3 = _newUrl2.search;
             _urlParams2 = new URLSearchParams(_queryString3);
@@ -518,20 +517,20 @@ var identifyUser = /*#__PURE__*/function () {
               operator: _operator2
             });
 
-          case 55:
-            _context2.next = 68;
+          case 54:
+            _context2.next = 67;
             break;
 
-          case 57:
-            _url2 = "https://".concat(newHost, "/tallyman/v1/?action=identify-user&country=").concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=").concat(device, "&offerId=").concat(offer, "&page=").concat(window.location.href, "&pixel_url=").concat(encodeURIComponent("http://c1.ouisys.com/pixels?xcid=".concat(window.location.pathname.replace("/", ""), "&xaid=").concat(window.pac_analytics.visitor.xaid, "&country=").concat(bupperizeCountry(country))), "&rockman_id=").concat(rockmanId).concat(extraParamsQs, "&").concat(search);
-            _context2.next = 60;
+          case 56:
+            _url2 = "https://".concat(newHost, "/tallyman/v1/?action=identify-user&country=").concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=").concat(device, "&offerId=").concat(offer, "&page=").concat(window.location.href, "&pixel_url=").concat(encodeURIComponent("http://".concat(window.location.host, "/pixels?xcid=").concat(window.location.pathname.replace("/", ""), "&xaid=").concat(window.pac_analytics.visitor.xaid, "&country=").concat(bupperizeCountry(country))), "&rockman_id=").concat(rockmanId).concat(extraParamsQs, "&").concat(search);
+            _context2.next = 59;
             return fetchJsonp(_url2);
 
-          case 60:
+          case 59:
             result = _context2.sent;
 
             if (!(false === result.success)) {
-              _context2.next = 67;
+              _context2.next = 66;
               break;
             }
 
@@ -540,7 +539,7 @@ var identifyUser = /*#__PURE__*/function () {
 
             throw _identifyError;
 
-          case 67:
+          case 66:
             return _context2.abrupt("return", {
               subscription_url: result.subscription_url || result.redirect_url,
               action: function action() {
@@ -550,7 +549,7 @@ var identifyUser = /*#__PURE__*/function () {
               operator: result.operator
             });
 
-          case 68:
+          case 67:
           case "end":
             return _context2.stop();
         }
@@ -571,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/reducers/tpayHeFlow/utils.js

@@ -441,7 +441,7 @@ var confirmTPay = function confirmTPay(window, tpayConfig, locale, redirectUrl)
       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=".concat(config.domain, "&sub_id=").concat(subId, "&country=").concat(tpayConfig.country, "&gateway=tpay")).then(function (response) {
+        fetch("http://de.tallymans.com/api/v2/validate-access/?domain=".concat(config.domain, "&sub_id=").concat(subId, "&country=").concat(tpayConfig.country, "&gateway=tpay")).then(function (response) {
           if (response.payload.token) {
             productUrl = config['product_url'].replace('<%UID%>', response.payload.token);
           }

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/test/setup.js

@@ -0,0 +1,24 @@
+"use strict";
+
+require("core-js/modules/es.array.includes");
+
+require("core-js/modules/es.string.includes");
+
+require("whatwg-fetch");
+
+// Jenkins seems to have installed a custom certificate which causes the logs to be poluted
+// This little hack fixes that
+var logErr = console.error; // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+console.error = function (message) {
+  if (message && message.includes('ERR_TLS_CERT_ALTNAME_INVALID')) return;
+
+  for (var _len = arguments.length, optionalParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    optionalParams[_key - 1] = arguments[_key];
+  }
+
+  logErr(message, optionalParams);
+};
+
+jest.mock('../auth/authHandler');
+global.scrollTo = jest.fn();

package/dist/test/test-utils.js

@@ -0,0 +1,51 @@
+"use strict";
+
+require("core-js/modules/es.object.keys");
+
+require("core-js/modules/web.dom-collections.for-each");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  server: true
+};
+Object.defineProperty(exports, "server", {
+  enumerable: true,
+  get: function get() {
+    return _server.server;
+  }
+});
+
+require("whatwg-fetch");
+
+var _server = require("../mockServer/server");
+
+var _msw = require("msw");
+
+Object.keys(_msw).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _msw[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _msw[key];
+    }
+  });
+});
+
+/**
+ * Generic functions for the tests.
+ */
+beforeAll(function () {
+  _server.server.listen();
+});
+afterEach(function () {
+  _server.server.resetHandlers();
+
+  _server.server.restoreHandlers();
+});
+afterAll(function () {
+  _server.server.close();
+}); // re-export everything

package/package.json

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

package/src/@types/window.d.ts

@@ -56,6 +56,7 @@ export type ITpay = {
     tPayhash:string;
     hostCountry?:string;
     hostSlug?:string;
+    tid:string;
   }
   
   namespace NodeJS {

package/src/api/index.ts

@@ -6,21 +6,19 @@ 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;
 
 export interface ITallyman {
   identify:(host: string, slug: string, country: string, msisdn: string, device: string, offer: number, rockmanId: string)=>Promise<IIdentifyResult>
   triggerPin:(host: string, country: string, slug: string, device: string, offer: number, msisdn: string, rockmanId: string, extraParamsQs: string, search: string,uniqid?:string)=>Promise<IMSISDNSubmissionResult>;
-  verifyPin:(host:string, country:string, slug:string, device:string, offer:number, rockmanId:string, pin:string, extraParamsQs:string, uniqid:string)=>Promise<IPINSubmissionResult>;
+  verifyPin:(host:string, country:string, slug:string, device:string, offer:number, rockmanId:string, pin:string, extraParamsQs:string, uniqid:string, evinaTid:string)=>Promise<IPINSubmissionResult>;
   checkSubscriptionByRockmanIdOnly:(host:string, rockmanId:string)=>Promise<ICheckSubscriptionResult>;
   checkSubscription:(host:string, country:string, slug:string, device:string, offer:number, rockmanId:string, pin:string, extraParamsQs:string)=>Promise<ICheckSubscriptionResult>;
   triggerMessage:(host:string, slug:string, country:string, msisdn:string, device:string, offer:number, rockmanId:string, search:string, extraParamsQs:string)=>Promise<IMoMSISDNSubmissionResult>;
   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>;
 }
 
@@ -44,7 +42,7 @@ export const MockTallyman:ITallyman = {
       rockman_id: ""
     }
   },
-  triggerPin:async(host: string, country: string, slug: string, device: string, offer: number, msisdn: string, rockmanId: string, extraParamsQs: string, search: string,uniqid?:string): Promise<IMSISDNSubmissionResult> =>{
+  triggerPin:async(host: string, country: string, slug: string, device: string, offer: number, msisdn: string, rockmanId: string, extraParamsQs: string, search: string,uniqid?:string, evinaTid?:string): Promise<IMSISDNSubmissionResult> =>{
     console.log("MockTallyman")
     sleep(2000);
     return {
@@ -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:\/\/n.vidflixz.com\/tallyman\/v1\/?action=one-click-subscribe&device=smart&slug=tpay-he-vidflixz&country=eg&offerId=1&rockman_id=13643b4780fb40bb8adf2feb2a400d7f&",
-      "config": {
-        "product_url": "http:\/\/eg.game-lords.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:\/\/n.game-lords.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);
@@ -176,11 +149,11 @@ export const RealTallyman:ITallyman = {
     const newHost = isDMB ? "de.tallymans.com" : host;
     return await fetch(`https://${newHost}/tallyman/v1/?action=trigger-pin&country=${bupperizeCountry(country)}&slug=${slug}&device=${device}&offerId=${offer}&msisdn=${msisdn}&rockman_id=${rockmanId}${uniqid}${extraParamsQs}&${search}`).then(x => x.json());
   },
-  verifyPin:async(host:string, country:string, slug:string, device:string, offer:number, rockmanId:string, pin:string, extraParamsQs:string, uniqid:string): Promise<IPINSubmissionResult> =>{
+  verifyPin:async(host:string, country:string, slug:string, device:string, offer:number, rockmanId:string, pin:string, extraParamsQs:string, uniqid:string, evinaTid:string): Promise<IPINSubmissionResult> =>{
     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=verify-pin&country=${bupperizeCountry(country)}&slug=${slug}&device=${device}&offerId=${offer}&rockman_id=${rockmanId}&pin=${pin}${uniqid}${extraParamsQs}`).then(x => x.json())
+    return await fetch(`https://${newHost}/tallyman/v1/?action=verify-pin&country=${bupperizeCountry(country)}&slug=${slug}&device=${device}&offerId=${offer}&rockman_id=${rockmanId}&pin=${pin}${uniqid}&sam_evina_tid=${evinaTid}${extraParamsQs}`).then(x => x.json())
   },
   checkSubscription:async(host:string, country:string, slug:string, device:string, offer:number, rockmanId:string, pin:string, extraParamsQs:string): Promise<ICheckSubscriptionResult> =>{
     console.log("RealTallyman")
@@ -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/ips/tryGetIPRangeName.ts

@@ -5,9 +5,10 @@ export default async function tryGetIPRangeName(visitor: IVisitor): Promise<stri
   
   const mockip =  queryString(window.location.href, "mock-ip") || process.env.mock_ip;
   console.log("mockip", mockip)
-  if (!visitor.ip) {
+  if (!visitor.ip && typeof window != "undefined") {
     try {
-      const res = await fetch('https://c1.ouisys.com/api/v1/ip' + (!!mockip ? `?mock-ip=${mockip}` : "")).then(x => x.json())
+      const host = window.location.host
+      const res = await fetch(`https://${host}/api/v1/ip` + (!!mockip ? `?mock-ip=${mockip}` : "")).then(x => x.json())
       // return isIPInRange('37.200.146.28')
       visitor.ip = res.ip
       visitor.ip_range_name = res.ip_range_name

package/src/pacman/index.ts

@@ -56,7 +56,7 @@ export default (window: Window, country?: string, page?: string): ITrackerFlowEv
 
     const pacmanClient = mkPacmanClient({
       rockmanId: window.pac_analytics.visitor.rockmanId,
-      serverUrl:  process.env.pacman_server, // check webpack.config.common.js //"https://de-pacman.sam-media.com/api/v2/mstore",
+      serverUrl:  process.env.pacman_server,
       impressionNumber: 1,
       signalInterval: 1000 // in milliseconds
     });

package/src/reducers/click2smsFlow/utils.ts

@@ -124,6 +124,3 @@ export async function checkSubscription(window: Window, maybeConfig: IConfig): P
     throw error
   }
 }
-
-// {"success":true,"uid":"*5QADM","shortcode":"1901","keyword":"TIPS"}%  
-// curl "http://w1.mozzi.com/spa-api/?country=gh&device=smart&slug=18plus-oc2sms&action=oc2sms"

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/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;
@@ -136,7 +137,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

@@ -171,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";
@@ -216,7 +218,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 });