ouisys-engine 2.1.22 → 2.1.24

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

package/src/store/reducers.ts

@@ -7,7 +7,6 @@ import moRedirFlow from "../reducers/moRedirFlow";
 import oneClickFlow from "../reducers/oneClickFlow";
 import click2smsFlow from "../reducers/click2smsFlow";
 import ussdFlow from "../reducers/ussdFlow";
-import tpayHeFlow from "../reducers/tpayHeFlow";
 
 import { IStrategyReducerState } from "../reducers/strategy/StrategyTypes";
 import { IPinFlowReducerState } from "../reducers/pinFlow/PinTypes";
@@ -16,7 +15,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 {
@@ -27,7 +25,6 @@ export interface IApplicationState {
     oneClickFlow:IOneClickFlowReducerState;
     click2smsFlow:IClick2smsFlowReducerState;
     ussdFlow:IUssdFlowReducerState;
-    tpayHeFlow:ITpayHeFlowReducerState;
 }
 export default() => combineReducers<IApplicationState>({
     strategy,
@@ -36,6 +33,5 @@ export default() => combineReducers<IApplicationState>({
     moRedirFlow,
     oneClickFlow,
     click2smsFlow,
-    ussdFlow,
-    tpayHeFlow
+    ussdFlow
 });

package/src/flows/tpayHeFlow.ts

@@ -1,20 +0,0 @@
-import * as RDS from "../common-types/RemoteDataState";
-
-import { CONFIRMTpayFailure, CONFIRMTpaySuccess, ILOADTPAYFailure, ILOADTPAYSuccess, ITpayHeCurrentState } from "../reducers/tpayHeFlow/TpayHeTypes";
-
-function tpayHeFlowMatch <R>(
-  { loadTpay, confirmTpay }: 
-  {   loadTpay: (rds: RDS.RemoteDataState<ILOADTPAYFailure, ILOADTPAYSuccess>) => R,
-      confirmTpay: (rds: RDS.RemoteDataState<CONFIRMTpayFailure, CONFIRMTpaySuccess>) => R
-  }): (state: ITpayHeCurrentState) => R {
-  return state => {
-    switch (state.type) {
-      case 'LOAD_TPAY_HE':
-        return loadTpay(state.result)
-      case 'CONFIRM_TPAY':
-        return confirmTpay(state.result)
-    }
-  }
-}
-
-export default tpayHeFlowMatch;

package/src/reducers/tpayHeFlow/ITpayHeConstants.ts

@@ -1,7 +0,0 @@
-type ITpayHeConstants =  "LOAD_TPAY_HE" |
-"CONFIRM_TPAY"
-| "CONFIRM_TPAY_CLICK"
-| "LOAD_TPAY_HE_SUCCESS"
-| "MOCK_TPAY_FLOW_STATE"
-
-export default ITpayHeConstants

package/src/reducers/tpayHeFlow/TpayHeTypes.ts

@@ -1,135 +0,0 @@
-import * as RDS from "../../common-types/RemoteDataState";
-import { AppThunk } from "../../common-types/AppThunk";
-
-export type ILOADTPAYFailure = {
-  errorType:LOADTPAYErrorTypes;
-  productUrl?:string;
-}
-export type ILOADTPAYSuccess = {
-  redirectUrl:string;
-  nextAction:"getRedirectUrlAction";
-}
-
-export type LOADTPAYErrorTypes = "UnknownError" | "NotSupported" | "UnexpectedState" | "InvalidConfig" | "AlreadySubscribed" | "SubscriptionFailed";
-
-export type ITpayHeCurrentState = {
-  type: "LOAD_TPAY_HE",
-  result:RDS.RemoteDataState<ILOADTPAYFailure, ILOADTPAYSuccess>
-}
-|
-{
-  type: "CONFIRM_TPAY";
-  result:RDS.RemoteDataState<CONFIRMTpayFailure, CONFIRMTpaySuccess>
-}
-export type ITpayHeFlowReducerState = 
-{
-  currentState:ITpayHeCurrentState;
-  tpayConfig:ITpayConsentResult;
-};
-
-export type ILoadTpayPayload = {
-  type:"LOAD_TPAY_HE",
-  result:RDS.RemoteDataState<ILOADTPAYFailure, ILOADTPAYSuccess>
-}
-
-export type ITpayHeFlowActionMaps = {
-  loadTpayAction:(theme:string, locale:string)=>AppThunk
-}
-
-
-export type IConfirmTpayPayload = {
-  type: "CONFIRM_TPAY";
-  result: RDS.RemoteDataState<CONFIRMTpayFailure, CONFIRMTpaySuccess>;
-}
-
-export type CONFIRMTpayFailure = {
-  errorType: CONFIRMTpayErrorTypes;
-  error?: Error;
-  productUrl?:string;
-};
-export type CONFIRMTpaySuccess = { finalUrl: string};
-export type CONFIRMTpayErrorTypes = "UnknownError" | "TooEarly" | "UnexpectedState" | "AlreadySubscribed" | "ConfirmError";
-
-export type ITpayHeActions = {
-  type:"LOAD_TPAY_HE";
-  payload:ILoadTpayPayload;
-}
-|
-{
-  type: "CONFIRM_TPAY_CLICK";
-  payload:IConfirmTpayPayload
-}
-|
-{
-  type: "LOAD_TPAY_HE_SUCCESS";
-  payload:ILoadTpayPayload
-}
-|
-{
-  type:"MOCK_TPAY_FLOW_STATE";
-  payload:ILoadTpayPayload;
-}
-
-
-
-export type IConfig = {
-  host?: string, country?: string, slug?: string, queryString?: Array<[string, string]>, device?:string
-}
-
-export type ITpayConsentResult = {
-  prodSku:     string;
-  lang:        string;
-  country:     string;
-  config:      ITPayConfig;
-  redirectUrl: string;
-  subscription_url:string;
-  rid:         string;
-  success:     true;
-} | {
-  success: false
-  rockman_id: string
-  message: string
-};
-
-export interface ITPayConfig {
-  product_url:          string;
-  subscription_plan_id: number;
-  public:               string;
-  private:              string;
-  flow:                 string;
-  catalog_name:         { [key: string]: string };
-  replace_uid?:boolean;
-  product_full_access?:string;
-  domain?:string;
-}
-
-
-export type IRedirectResult = {
-  Status:string;
-  OperatorCode:number;
-  SessionId:number;
-  OrderId:number;
-  Details:string;
-  SubId:string;
-  Signature:string;
-  SessionToken:string;
-  rockman_id:string;
-  ReferenceCode:string;
-  Msisdn:string;
-  subscription_url:string;
-  language_code:string;
-}
-
-export type IMockTpayFlowStates = "confirm-state"
-
-
-export type ITpaySubscribeResult = {
-  success:true;
-  rockman_id: string;
-  product_url:string;
-} |
-{
-  success: false;
-  rockman_id: string;
-  message: string;
-}

package/src/reducers/tpayHeFlow/index.ts

@@ -1,207 +0,0 @@
-// LIBRARIES
-import * as RDS from "../../common-types/RemoteDataState";
-
-import { ITpayHeFlowReducerState, ITpayHeActions, ITpayHeFlowActionMaps, ILOADTPAYFailure, ILOADTPAYSuccess, ILoadTpayPayload, CONFIRMTpayErrorTypes, CONFIRMTpayFailure, CONFIRMTpaySuccess, ITPayConfig, ITpayConsentResult, LOADTPAYErrorTypes, IMockTpayFlowStates } from "./TpayHeTypes";
-import { AppThunk } from "../../common-types/AppThunk";
-import { confirmTPay, confirmTPayCheck, getTpayConfig, mockedConfirmState } from "./utils";
-import { genericHandler, tracker } from "../strategy";
-
-
-
-
-//ACTION CREATORS
-export function loadTpayAction(theme:string, locale:string):AppThunk{
-  return async (dispatch, store)=>{
-    const {currentState} = store().strategy
-    if(currentState.type === "TPAY_HE"){
-      const config = currentState.result.config;
-      try {
-
-        //Check if Error or Success Page
-        const product_url = await confirmTPayCheck();
-        if(product_url !== null){
-          window.location.href = product_url;
-        }else{
-          dispatch({
-            type: "LOAD_TPAY_HE",
-            payload:{
-              type: "LOAD_TPAY_HE",
-              result: RDS.Loading()
-            }
-          })
-
-          const result = await getTpayConfig(
-            window,
-            config
-          )
-          // await addLookUpTpay(result, theme, locale);
-  
-          tracker.advancedInFlow('tallyman.v1-tpay-he', 'load-tpay-success');
-  
-          dispatch({
-            type: "LOAD_TPAY_HE_SUCCESS",
-            payload:{
-              type: "LOAD_TPAY_HE",
-              result: RDS.Success(result)
-            }
-          });
-        }
-
-      } catch (ex) {
-        console.warn(ex);
-        //@ts-ignore
-        const errorType: LOADTPAYErrorTypes =
-          "AlreadySubscribed" === ex.type
-            ? "AlreadySubscribed"
-            : "NotSupported" === ex.type
-              ? "NotSupported"
-              : "SubscriptionFailed" === ex.type 
-                ? "SubscriptionFailed"
-                : "UnknownError";
-
-        tracker.recedeInFlow('tallyman.v1-tpay-he', 'tpay-config-failure',{errorType: errorType || 'UnknownError'})
-        dispatch({
-          type: "LOAD_TPAY_HE",
-          payload:{
-            type: "LOAD_TPAY_HE",
-            result: RDS.Failure({
-              errorType: errorType,
-              error: ex
-            })
-          }
-        });
-
-        dispatch({
-          type:"IDENTIFY_STRATEGY",
-          payload:{
-            type:"PIN",
-            result: {
-              nextAction:"submitMSISDNAction",
-              config:config
-            }
-          }
-        });
-      }
-    }else{
-      tracker.recedeInFlow('tallyman.v1-tpay-he', 'tpay-config-failure',{errorType: 'UnknownError'})
-      dispatch({
-        type: "LOAD_TPAY_HE",
-        payload:{
-          type: "LOAD_TPAY_HE",
-          result: RDS.Failure({
-            errorType:"UnexpectedState"
-          })
-        }
-      })
-      throw "Unexpected state";
-      
-    }
-  }
-}
-
-
-export function confirmTpayAction(locale:string, redirectUrl?:string):AppThunk{
-  return async (dispatch, store)=>{
-    try {
-      dispatch({
-        type: "CONFIRM_TPAY_CLICK",
-        payload:{    
-          type: "CONFIRM_TPAY",
-          result: RDS.Loading()
-        }
-      });
-      tracker.advancedInFlow('tallyman.v1-tpay-he', 'confirm-tpay-clicked',{})
-      const {currentState} = store().strategy
-      if(currentState.type === "TPAY_HE"){
-        const {tpayConfig} = store().tpayHeFlow
-        //@ts-ignore
-        const result = await confirmTPay(window, tpayConfig, locale, redirectUrl)
-        tracker.advancedInFlow('tallyman.v1-tpay-he', 'confirm-tpay-success',{finalUrl: result})
-
-        dispatch({
-          type: "CONFIRM_TPAY_CLICK",
-          payload:{
-            type:"CONFIRM_TPAY",
-            result: RDS.Success<CONFIRMTpayFailure, CONFIRMTpaySuccess>({
-              finalUrl: ""
-            }) 
-          }
-        })
-      }else{
-        tracker.recedeInFlow('tallyman.v1-tpay-he', 'confirm-tpay-failure',{})
-        dispatch({
-          type: "CONFIRM_TPAY_CLICK",
-          payload:{
-            type:"CONFIRM_TPAY",
-            result: RDS.Failure<CONFIRMTpayFailure, CONFIRMTpaySuccess>({errorType: "UnexpectedState"})
-          }
-        })
-        throw "Unexpected state"
-      }
-    } catch(ex) {
-      console.error(ex)
-      const errorType: CONFIRMTpayErrorTypes =
-        "AlreadySubscribed" === ex.type
-        ? "AlreadySubscribed"
-        : "ConfirmError" === ex.type
-          ? "ConfirmError"
-          : "UnknownError";
-          tracker.recedeInFlow('tallyman.v1-tpay-he', 'confirm-tpay',{errorType: errorType || 'UnknownError'})
-
-      dispatch({
-        type: "CONFIRM_TPAY_CLICK",
-        payload:{
-          type:"CONFIRM_TPAY",
-          result: RDS.Failure<CONFIRMTpayFailure, CONFIRMTpaySuccess>({errorType: errorType || 'UnknownError'})
-        }
-      })
-
-    }
-  }
-}
-
-
-
-export function mockTpayFlow(mockState:IMockTpayFlowStates):AppThunk {
-  return (dispatch)=>{
-    if(mockState !== undefined){
-      switch (mockState) {
-        case "confirm-state":
-          return dispatch({
-            type:"MOCK_TPAY_FLOW_STATE",
-            payload:mockedConfirmState.currentState
-          })
-        default:
-          throw "Mock Flow not supported";
-      }
-    }
-  }
-}
-
-
-const initialState:ITpayHeFlowReducerState = {
-  currentState:{
-    type: "LOAD_TPAY_HE",
-    result: RDS.NothingYet<ILOADTPAYFailure, ILOADTPAYSuccess>()
-  },
-  tpayConfig:null
-};
-export const TpayHeFlowFlowActionMaps:ITpayHeFlowActionMaps = {
-  loadTpayAction:loadTpayAction
-}
-export default function TpayHeFlowReducer(state = initialState, action:ITpayHeActions) {
-  switch (action.type) {
-    case "LOAD_TPAY_HE":
-      return genericHandler<ITpayHeFlowReducerState, ILoadTpayPayload>(state, action.payload)
-    case "CONFIRM_TPAY_CLICK":
-      //@ts-ignore
-      return genericHandler<ITpayHeFlowReducerState, ILoadTpayPayload>(state, action.payload) 
-    case "LOAD_TPAY_HE_SUCCESS":
-      return genericHandler<ITpayHeFlowReducerState, ILoadTpayPayload>(state, action.payload) 
-    case "MOCK_TPAY_FLOW_STATE":
-      //@ts-ignore
-      return handleMockFlow<ITpayHeFlowReducerState, any>(state, action.payload)
-    default:
-      return state;
-  }
-}