ouisys-engine 2.1.26 → 2.1.30

package/dist/reducers/oneClickFlow/index.d.ts

@@ -1,7 +1,11 @@
 import { IOneClickFlowReducerState, IOneClickActions, IOneClickFlowActionMaps, ILinkExtraParams, IMockOneClickFlowStates } from "./OneClickTypes";
 import { AppThunk } from "../../common-types/AppThunk";
 import { IHash } from "../strategy/StrategyTypes";
-export declare function getRedirectUrlAction(extraParams?: ILinkExtraParams, autoRedirect?: boolean, isGetRedirectBupperWay?: boolean): AppThunk;
+export declare function getRedirectUrlAction({ extraParams, autoRedirect, isGetRedirectBupperWay }: {
+    extraParams?: ILinkExtraParams;
+    autoRedirect?: boolean;
+    isGetRedirectBupperWay?: boolean;
+}): AppThunk;
 export declare function subscribeUrlAction(autoRedirect?: boolean, extraParams?: IHash): AppThunk;
 export declare function mockOneClickFlow(mockState: IMockOneClickFlowStates): AppThunk;
 export declare const OneClickFlowActionMaps: IOneClickFlowActionMaps;

package/dist/reducers/oneClickFlow/index.js

@@ -64,9 +64,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 //ACTION CREATORS
-function getRedirectUrlAction(extraParams, autoRedirect, isGetRedirectBupperWay) {
+function getRedirectUrlAction(_ref) {
+  var extraParams = _ref.extraParams,
+      _ref$autoRedirect = _ref.autoRedirect,
+      autoRedirect = _ref$autoRedirect === void 0 ? false : _ref$autoRedirect,
+      _ref$isGetRedirectBup = _ref.isGetRedirectBupperWay,
+      isGetRedirectBupperWay = _ref$isGetRedirectBup === void 0 ? false : _ref$isGetRedirectBup;
   return /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(dispatch, store) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(dispatch, store) {
       var currentState, _currentState$result, config, subscription_url, redirect_url, redirectUrl, _yield$getRedirectUrl, _redirect_url;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -241,14 +246,14 @@ function getRedirectUrlAction(extraParams, autoRedirect, isGetRedirectBupperWay)
     }));
 
     return function (_x, _x2) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 }
 
 function subscribeUrlAction(autoRedirect, extraParams) {
   return /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(dispatch, store) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(dispatch, store) {
       var currentState, subscription_url, product_url, errorType;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -356,7 +361,7 @@ function subscribeUrlAction(autoRedirect, extraParams) {
     }));
 
     return function (_x3, _x4) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 }

package/dist/reducers/pinFlow/utils.js

@@ -393,7 +393,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, evinaTid, pinResult, pinError, check, checkResult, isAlreadySubscribed, _pinError, _isAlreadySubscribed;
+    var slug, country, device, host, offer, extraParamsQs, rockmanId, emptyPinError, uniqid, evinaTid, pinResult, pinErrorTypeMap, errorMessage, pinError, check, checkResult, isAlreadySubscribed, _pinError, _isAlreadySubscribed;
 
     return regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) {
@@ -430,17 +430,22 @@ function _submitPIN() {
             pinResult = _context6.sent;
 
             if (!(false === pinResult.success)) {
-              _context6.next = 20;
+              _context6.next = 22;
               break;
             }
 
-            pinError = new Error("Error in submitMSISDN() verify-pin action:\n".concat(pinResult.message));
-            pinError['type'] = "InvalidPIN";
+            pinErrorTypeMap = {
+              "pin does not match": "InvalidPIN",
+              "mcp blocked": "SessionBlocked"
+            };
+            errorMessage = pinErrorTypeMap[pinResult.message];
+            pinError = new Error("Error in submitMSISDN() verify-pin action:\n".concat(errorMessage));
+            pinError['type'] = errorMessage ? errorMessage : "InvalidPIN";
             throw pinError;
 
-          case 20:
+          case 22:
             if (!(true === pinResult.async)) {
-              _context6.next = 35;
+              _context6.next = 37;
               break;
             }
 
@@ -448,16 +453,16 @@ function _submitPIN() {
               return window.tallymanApi.checkSubscription(host, country, slug, device, offer, rockmanId, pin, extraParamsQs);
             };
 
-            _context6.next = 24;
+            _context6.next = 26;
             return (0, _utils.loop)(check, 30, function (r) {
               return r.success;
             }, 0);
 
-          case 24:
+          case 26:
             checkResult = _context6.sent;
 
             if (!(true === checkResult.success)) {
-              _context6.next = 30;
+              _context6.next = 32;
               break;
             }
 
@@ -467,23 +472,23 @@ function _submitPIN() {
               isAlreadySubscribed: isAlreadySubscribed
             });
 
-          case 30:
+          case 32:
             _pinError = new Error("Error in submitMSISDN() verify-pin action:\n".concat(checkResult.message));
             _pinError['type'] = "InvalidPIN";
             throw _pinError;
 
-          case 33:
-            _context6.next = 37;
+          case 35:
+            _context6.next = 39;
             break;
 
-          case 35:
+          case 37:
             _isAlreadySubscribed = pinResult.message == "ALREADY SUBSCRIBED" ? true : false;
             return _context6.abrupt("return", {
               productUrl: pinResult.product_url || null,
               isAlreadySubscribed: _isAlreadySubscribed
             });
 
-          case 37:
+          case 39:
           case "end":
             return _context6.stop();
         }

package/package.json

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

package/src/reducers/oneClickFlow/index.ts

@@ -11,7 +11,7 @@ import { IHash } from "../strategy/StrategyTypes";
 
 
 //ACTION CREATORS
-export function getRedirectUrlAction(extraParams?:ILinkExtraParams, autoRedirect?:boolean, isGetRedirectBupperWay?:boolean):AppThunk{
+export function getRedirectUrlAction({extraParams, autoRedirect = false, isGetRedirectBupperWay = false}:{extraParams?:ILinkExtraParams, autoRedirect?:boolean, isGetRedirectBupperWay?:boolean}):AppThunk{
 
   return async (dispatch, store)=>{
     const {currentState} = store().strategy

package/src/reducers/pinFlow/utils.ts

@@ -168,8 +168,13 @@ export async function submitPIN(window:Window, pin: string, config:IConfig, extr
 
   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";
+    const pinErrorTypeMap:{[key:string]:string} = {
+      "pin does not match": "InvalidPIN",
+      "mcp blocked": "SessionBlocked"
+    }
+    const errorMessage = pinErrorTypeMap[pinResult.message as string]
+    const pinError = new Error(`Error in submitMSISDN() verify-pin action:\n${errorMessage}`) as IError & {type:string}
+    pinError['type'] = errorMessage ? errorMessage : "InvalidPIN";
     throw pinError
   } else {
     if(true === pinResult.async) {