ouisys-engine 2.1.20 → 2.1.21

package/dist/api/index.d.ts

@@ -7,7 +7,7 @@ import { ITpayConsentResult } from "../reducers/TpayHeFlow/TpayHeTypes";
 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>;

package/dist/api/index.js

@@ -61,7 +61,7 @@ var MockTallyman = {
     return identify;
   }(),
   triggerPin: function () {
-    var _triggerPin = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(host, country, slug, device, offer, msisdn, rockmanId, extraParamsQs, search, uniqid) {
+    var _triggerPin = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(host, country, slug, device, offer, msisdn, rockmanId, extraParamsQs, search, uniqid, evinaTid) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -84,7 +84,7 @@ var MockTallyman = {
       }, _callee2);
     }));
 
-    function triggerPin(_x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17) {
+    function triggerPin(_x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18) {
       return _triggerPin.apply(this, arguments);
     }
 
@@ -113,7 +113,7 @@ var MockTallyman = {
       }, _callee3);
     }));
 
-    function verifyPin(_x18, _x19, _x20, _x21, _x22, _x23, _x24, _x25, _x26) {
+    function verifyPin(_x19, _x20, _x21, _x22, _x23, _x24, _x25, _x26, _x27) {
       return _verifyPin.apply(this, arguments);
     }
 
@@ -142,7 +142,7 @@ var MockTallyman = {
       }, _callee4);
     }));
 
-    function checkSubscription(_x27, _x28, _x29, _x30, _x31, _x32, _x33, _x34) {
+    function checkSubscription(_x28, _x29, _x30, _x31, _x32, _x33, _x34, _x35) {
       return _checkSubscription.apply(this, arguments);
     }
 
@@ -171,7 +171,7 @@ var MockTallyman = {
       }, _callee5);
     }));
 
-    function checkSubscriptionByRockmanIdOnly(_x35, _x36) {
+    function checkSubscriptionByRockmanIdOnly(_x36, _x37) {
       return _checkSubscriptionByRockmanIdOnly.apply(this, arguments);
     }
 
@@ -199,7 +199,7 @@ var MockTallyman = {
       }, _callee6);
     }));
 
-    function redirect(_x37, _x38, _x39, _x40, _x41, _x42, _x43, _x44, _x45, _x46) {
+    function redirect(_x38, _x39, _x40, _x41, _x42, _x43, _x44, _x45, _x46, _x47) {
       return _redirect.apply(this, arguments);
     }
 
@@ -228,7 +228,7 @@ var MockTallyman = {
       }, _callee7);
     }));
 
-    function triggerMessage(_x47, _x48, _x49, _x50, _x51, _x52, _x53, _x54, _x55) {
+    function triggerMessage(_x48, _x49, _x50, _x51, _x52, _x53, _x54, _x55, _x56) {
       return _triggerMessage.apply(this, arguments);
     }
 
@@ -257,7 +257,7 @@ var MockTallyman = {
       }, _callee8);
     }));
 
-    function ussd(_x56, _x57, _x58, _x59, _x60, _x61, _x62, _x63, _x64) {
+    function ussd(_x57, _x58, _x59, _x60, _x61, _x62, _x63, _x64, _x65) {
       return _ussd.apply(this, arguments);
     }
 
@@ -287,7 +287,7 @@ var MockTallyman = {
       }, _callee9);
     }));
 
-    function oc2sms(_x65, _x66, _x67, _x68, _x69, _x70, _x71, _x72) {
+    function oc2sms(_x66, _x67, _x68, _x69, _x70, _x71, _x72, _x73) {
       return _oc2sms.apply(this, arguments);
     }
 
@@ -331,7 +331,7 @@ var MockTallyman = {
       }, _callee10);
     }));
 
-    function tpayConsentConfig(_x73, _x74, _x75, _x76, _x77, _x78, _x79) {
+    function tpayConsentConfig(_x74, _x75, _x76, _x77, _x78, _x79, _x80) {
       return _tpayConsentConfig.apply(this, arguments);
     }
 
@@ -360,7 +360,7 @@ var MockTallyman = {
       }, _callee11);
     }));
 
-    function mcpShield(_x80, _x81, _x82, _x83, _x84, _x85, _x86) {
+    function mcpShield(_x81, _x82, _x83, _x84, _x85, _x86, _x87) {
       return _mcpShield.apply(this, arguments);
     }
 
@@ -395,7 +395,7 @@ var RealTallyman = {
       }, _callee12);
     }));
 
-    function identify(_x87, _x88, _x89, _x90, _x91, _x92, _x93) {
+    function identify(_x88, _x89, _x90, _x91, _x92, _x93, _x94) {
       return _identify2.apply(this, arguments);
     }
 
@@ -427,14 +427,14 @@ var RealTallyman = {
       }, _callee13);
     }));
 
-    function triggerPin(_x94, _x95, _x96, _x97, _x98, _x99, _x100, _x101, _x102, _x103) {
+    function triggerPin(_x95, _x96, _x97, _x98, _x99, _x100, _x101, _x102, _x103, _x104) {
       return _triggerPin2.apply(this, arguments);
     }
 
     return triggerPin;
   }(),
   verifyPin: function () {
-    var _verifyPin2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14(host, country, slug, device, offer, rockmanId, pin, extraParamsQs, uniqid) {
+    var _verifyPin2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14(host, country, slug, device, offer, rockmanId, pin, extraParamsQs, uniqid, evinaTid) {
       var isDMB, newHost;
       return regeneratorRuntime.wrap(function _callee14$(_context14) {
         while (1) {
@@ -444,7 +444,7 @@ var RealTallyman = {
               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;
               newHost = isDMB ? "de.tallymans.com" : host;
               _context14.next = 5;
-              return fetch("https://".concat(newHost, "/tallyman/v1/?action=verify-pin&country=").concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=").concat(device, "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId, "&pin=").concat(pin).concat(uniqid).concat(extraParamsQs)).then(function (x) {
+              return fetch("https://".concat(newHost, "/tallyman/v1/?action=verify-pin&country=").concat(bupperizeCountry(country), "&slug=").concat(slug, "&device=").concat(device, "&offerId=").concat(offer, "&rockman_id=").concat(rockmanId, "&pin=").concat(pin).concat(uniqid, "&sam_evina_tid=").concat(evinaTid).concat(extraParamsQs)).then(function (x) {
                 return x.json();
               });
 
@@ -459,7 +459,7 @@ var RealTallyman = {
       }, _callee14);
     }));
 
-    function verifyPin(_x104, _x105, _x106, _x107, _x108, _x109, _x110, _x111, _x112) {
+    function verifyPin(_x105, _x106, _x107, _x108, _x109, _x110, _x111, _x112, _x113, _x114) {
       return _verifyPin2.apply(this, arguments);
     }
 
@@ -491,7 +491,7 @@ var RealTallyman = {
       }, _callee15);
     }));
 
-    function checkSubscription(_x113, _x114, _x115, _x116, _x117, _x118, _x119, _x120) {
+    function checkSubscription(_x115, _x116, _x117, _x118, _x119, _x120, _x121, _x122) {
       return _checkSubscription2.apply(this, arguments);
     }
 
@@ -523,7 +523,7 @@ var RealTallyman = {
       }, _callee16);
     }));
 
-    function checkSubscriptionByRockmanIdOnly(_x121, _x122) {
+    function checkSubscriptionByRockmanIdOnly(_x123, _x124) {
       return _checkSubscriptionByRockmanIdOnly2.apply(this, arguments);
     }
 
@@ -555,7 +555,7 @@ var RealTallyman = {
       }, _callee17);
     }));
 
-    function redirect(_x123, _x124, _x125, _x126, _x127, _x128, _x129, _x130, _x131, _x132) {
+    function redirect(_x125, _x126, _x127, _x128, _x129, _x130, _x131, _x132, _x133, _x134) {
       return _redirect2.apply(this, arguments);
     }
 
@@ -587,7 +587,7 @@ var RealTallyman = {
       }, _callee18);
     }));
 
-    function triggerMessage(_x133, _x134, _x135, _x136, _x137, _x138, _x139, _x140, _x141) {
+    function triggerMessage(_x135, _x136, _x137, _x138, _x139, _x140, _x141, _x142, _x143) {
       return _triggerMessage2.apply(this, arguments);
     }
 
@@ -619,7 +619,7 @@ var RealTallyman = {
       }, _callee19);
     }));
 
-    function ussd(_x142, _x143, _x144, _x145, _x146, _x147, _x148, _x149, _x150) {
+    function ussd(_x144, _x145, _x146, _x147, _x148, _x149, _x150, _x151, _x152) {
       return _ussd2.apply(this, arguments);
     }
 
@@ -651,7 +651,7 @@ var RealTallyman = {
       }, _callee20);
     }));
 
-    function oc2sms(_x151, _x152, _x153, _x154, _x155, _x156, _x157, _x158) {
+    function oc2sms(_x153, _x154, _x155, _x156, _x157, _x158, _x159, _x160) {
       return _oc2sms2.apply(this, arguments);
     }
 
@@ -683,7 +683,7 @@ var RealTallyman = {
       }, _callee21);
     }));
 
-    function tpayConsentConfig(_x159, _x160, _x161, _x162, _x163, _x164, _x165) {
+    function tpayConsentConfig(_x161, _x162, _x163, _x164, _x165, _x166, _x167) {
       return _tpayConsentConfig2.apply(this, arguments);
     }
 
@@ -718,7 +718,7 @@ var RealTallyman = {
       }, _callee22);
     }));
 
-    function mcpShield(_x166, _x167, _x168, _x169, _x170, _x171, _x172, _x173) {
+    function mcpShield(_x168, _x169, _x170, _x171, _x172, _x173, _x174, _x175) {
       return _mcpShield2.apply(this, arguments);
     }
 

package/dist/reducers/oneClickFlow/utils.js

@@ -250,24 +250,25 @@ exports.getRedirectUrl = getRedirectUrl;
 
 var subscribe = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, extraParams) {
-    var extraParamsQs, result, subscribeError;
+    var evinaTid, extraParamsQs, result, subscribeError;
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
+            evinaTid = typeof window != "undefined" && window.tid ? window.tid : "";
             extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(function (k) {
               return "".concat(k, "=").concat(extraParams[k]);
             }).join('&');
-            _context2.next = 3;
-            return fetch(url + extraParamsQs).then(function (x) {
+            _context2.next = 4;
+            return fetch("".concat(url, "&sam_evina_tid=").concat(evinaTid).concat(extraParamsQs)).then(function (x) {
               return x.json();
             });
 
-          case 3:
+          case 4:
             result = _context2.sent;
 
             if (!(false === result.success)) {
-              _context2.next = 11;
+              _context2.next = 12;
               break;
             }
 
@@ -276,10 +277,10 @@ var subscribe = /*#__PURE__*/function () {
             subscribeError['productUrl'] = result.product_url ? result.product_url : "";
             throw subscribeError;
 
-          case 11:
+          case 12:
             return _context2.abrupt("return", result.product_url || result.redirect_url);
 
-          case 12:
+          case 13:
           case "end":
             return _context2.stop();
         }

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();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ouisys-engine",
-  "version": "2.1.20",
+  "version": "2.1.21",
   "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

@@ -13,7 +13,7 @@ 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>;
@@ -44,7 +44,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 {
@@ -176,11 +176,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")

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

@@ -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";