ouisys-engine 2.1.70 → 2.1.73

package/dist/reducers/pinFlow/utils.js

@@ -116,7 +116,6 @@ var bupperizeCountry = function bupperizeCountry(c) {
 };
 
 var uniqidResult = "";
-var uniqidOnLoadResult = "";
 
 function loadMcpShield(_x5, _x6) {
   return _loadMcpShield.apply(this, arguments);
@@ -150,7 +149,7 @@ function _loadMcpShield() {
 
           case 11:
             (0, _loadScriptInnerHtml.default)(mcpShieldResult.source);
-            uniqidOnLoadResult = mcpShieldResult.uniqid;
+            uniqidResult = mcpShieldResult.uniqid;
             return _context2.abrupt("return", mcpShieldResult);
 
           case 14:
@@ -178,7 +177,7 @@ function submitMSISDNOnce(_x7, _x8, _x9, _x10) {
 
 function _submitMSISDNOnce() {
   _submitMSISDNOnce = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(window, config, internationalMSISDN, extraParams) {
-    var submissionError, msisdn, rockmanId, supportedSlugs, identifiedUser, slug, country, device, offer, host, search, extraParamsQs, uniqid, result, error, codesWithMcpShied, mcpShieldResult;
+    var submissionError, msisdn, rockmanId, supportedSlugs, identifiedUser, slug, country, device, offer, host, search, extraParamsQs, uniqid, result, error, kwCodesWithMcpShied, mcpShieldResult;
     return regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -227,7 +226,7 @@ function _submitMSISDNOnce() {
             extraParamsQs = !extraParams ? '' : '&' + Object.keys(extraParams).map(function (k) {
               return "".concat(k, "=").concat(extraParams[k]);
             }).join('&');
-            uniqid = uniqidOnLoadResult != "" && country.toLowerCase() == "iq" ? "&mcpUniqid=".concat(uniqidOnLoadResult) : '';
+            uniqid = !!uniqidResult && uniqidResult != "" ? "&mcpUniqid=".concat(uniqidResult) : '';
             _context3.next = 18;
             return window.tallymanApi.triggerPin(host, country, slug, device, offer, msisdn, rockmanId, extraParamsQs, search, uniqid);
 
@@ -246,22 +245,16 @@ function _submitMSISDNOnce() {
             throw error;
 
           case 27:
-            codesWithMcpShied = {
+            kwCodesWithMcpShied = {
               kw: {
                 kw_viva: "kw_viva"
               },
               k2: {
                 k2_viva: "k2_viva"
-              },
-              sa: {
-                sa_zain: "sa_zain",
-                sa_mobily: "sa_mobily",
-                sa_virgin: "sa_virgin",
-                sa_stc: "sa_stc"
               }
             };
 
-            if (!(country && result.operator && (codesWithMcpShied[country.toLowerCase()] && codesWithMcpShied[country.toLowerCase()][result.operator.toLowerCase()] || country.toLowerCase() == "iq"))) {
+            if (!(country && result.operator && (kwCodesWithMcpShied[country.toLowerCase()] && kwCodesWithMcpShied[country.toLowerCase()][result.operator.toLowerCase()] || country.toLowerCase() == "iq"))) {
               _context3.next = 39;
               break;
             }
@@ -475,7 +468,7 @@ function _submitPIN() {
 
             isAlreadySubscribed = pinResult.message == "ALREADY SUBSCRIBED" ? true : false;
             return _context6.abrupt("return", {
-              productUrl: pinResult.product_url || null,
+              productUrl: checkResult.product_url || null,
               isAlreadySubscribed: isAlreadySubscribed
             });
 

package/dist/utilities/index.js

@@ -9,6 +9,8 @@ var _utils = require("../reducers/moFlow/utils");
 
 var _utils2 = require("../reducers/moRedirFlow/utils");
 
+var _utils3 = require("../reducers/pinFlow/utils");
+
 var isDMBCheck = function isDMBCheck() {
   return 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;
 };
@@ -24,12 +26,18 @@ var getHost = function getHost(_ref) {
 exports.getHost = getHost;
 
 var setOnLoadUtilities = function setOnLoadUtilities(config) {
-  if (process.env.country.toLowerCase() === "cz") {
-    (0, _utils.getGoogleReCaptchaConfig)(config);
-  }
-
-  if (process.env.country.toLowerCase() === "a2" && process.env.NODE_ENV === "production") {
-    (0, _utils2.startEvinaAgency)(config);
+  if (typeof window != "undefined") {
+    if (process.env.country.toLowerCase() === "cz") {
+      (0, _utils.getGoogleReCaptchaConfig)(config);
+    }
+
+    if (process.env.country.toLowerCase() === "a2" && process.env.NODE_ENV === "production") {
+      (0, _utils2.startEvinaAgency)(config);
+    }
+
+    if (process.env.country.toLowerCase() === "sa" || process.env.country.toLowerCase() === "iq") {
+      (0, _utils3.loadMcpShield)(window, config);
+    }
   }
 };
 

package/package.json

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

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

@@ -61,6 +61,7 @@ export type ITpay = {
     isEvinaSessionChecked: boolean;
     shouldBlock: boolean;
     reCaptchaToken: string;
+    uniqidOnLoadResult: string;
   }
   
   namespace NodeJS {

package/src/reducers/pinFlow/utils.ts

@@ -17,7 +17,6 @@ export default async function submitMSISDN(window: Window, maybeConfig: IConfig,
 const bupperizeCountry = (c:string) => c == 'gb' ? 'uk' : c;
 
 let uniqidResult = "";
-let uniqidOnLoadResult = "";
 export async function loadMcpShield(window: Window, config: IConfig): Promise<IMcpShieldResult> {
   const { slug, country, device, host } = config;
 
@@ -31,7 +30,7 @@ export async function loadMcpShield(window: Window, config: IConfig): Promise<IM
       console.warn(mcpShieldResult.message);
     }else{
       loadScriptInnerHtml(mcpShieldResult.source);
-      uniqidOnLoadResult = mcpShieldResult.uniqid;
+      uniqidResult = mcpShieldResult.uniqid;
       return mcpShieldResult
     }
   }catch(err){
@@ -73,7 +72,7 @@ async function submitMSISDNOnce(window: Window, config: IConfig, internationalMS
 
   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 uniqid = (uniqidOnLoadResult != "" && country.toLowerCase() == "iq") ? `&mcpUniqid=${uniqidOnLoadResult}` : '';
+  const uniqid = (!!uniqidResult && uniqidResult != "") ? `&mcpUniqid=${uniqidResult}` : '';
   
 
 
@@ -87,22 +86,16 @@ async function submitMSISDNOnce(window: Window, config: IConfig, internationalMS
     throw error
   } else {
 
-    const codesWithMcpShied:{[key:string]:{[key:string]:string}} = {
+    const kwCodesWithMcpShied:{[key:string]:{[key:string]:string}} = {
       kw:{
         kw_viva:"kw_viva"
       },
       k2:{
         k2_viva:"k2_viva"
-      },
-      sa:{
-        sa_zain:"sa_zain",
-        sa_mobily: "sa_mobily",
-        sa_virgin: "sa_virgin",
-        sa_stc: "sa_stc"
       }
     }
     if(country && result.operator && (
-      (codesWithMcpShied[country.toLowerCase()] && codesWithMcpShied[country.toLowerCase()][result.operator.toLowerCase()]) || 
+      (kwCodesWithMcpShied[country.toLowerCase()] && kwCodesWithMcpShied[country.toLowerCase()][result.operator.toLowerCase()]) || 
         country.toLowerCase() == "iq"
       ) 
     ){
@@ -196,7 +189,7 @@ export async function submitPIN(window:Window, pin: string, config:IConfig, extr
       )
       if(true === checkResult.success) {
         const isAlreadySubscribed = (pinResult.message == "ALREADY SUBSCRIBED") ? true : false;
-        return {productUrl:pinResult.product_url || null, isAlreadySubscribed}
+        return {productUrl:checkResult.product_url || null, isAlreadySubscribed}
       } else {
         const pinError = new Error(`Error in submitMSISDN() verify-pin action:\n${checkResult.message}`)  as IError & {type:string}
         pinError['type'] = "InvalidPIN";

package/src/utilities/index.ts

@@ -1,5 +1,6 @@
 import { getGoogleReCaptchaConfig } from "../reducers/moFlow/utils";
 import { startEvinaAgency } from "../reducers/moRedirFlow/utils";
+import { loadMcpShield } from "../reducers/pinFlow/utils";
 import { IConfig } from "../reducers/strategy/StrategyTypes";
 
 export const isDMBCheck = ()=>{
@@ -12,10 +13,15 @@ export const getHost = ({host}:{host: string}): string=>{
 }
 
 export const setOnLoadUtilities = (config:IConfig)=>{
-  if(process.env.country.toLowerCase() === "cz"){
-    getGoogleReCaptchaConfig(config)
-  }
-  if(process.env.country.toLowerCase() === "a2" && process.env.NODE_ENV === "production"){
-    startEvinaAgency(config)
+  if(typeof window != "undefined"){
+    if(process.env.country.toLowerCase() === "cz"){
+      getGoogleReCaptchaConfig(config)
+    }
+    if(process.env.country.toLowerCase() === "a2" && process.env.NODE_ENV === "production"){
+      startEvinaAgency(config)
+    }
+    if(process.env.country.toLowerCase() === "sa" || process.env.country.toLowerCase() === "iq"){
+      loadMcpShield(window, config);
+    }
   }
 }