ouisys-engine 2.1.75 → 3.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ouisys-engine",
-  "version": "2.1.75",
+  "version": "3.0.1",
   "description": "",
   "main": "dist/index.js",
   "directories": "dist dev-tools",
@@ -11,78 +11,83 @@
     "build:init": "tsc --init --declaration --allowSyntheticDefaultImports --target esnext --outDir dist",
     "release": "ts-node ./src/dev-tools/publish-package",
     "manage:configs": "ts-node ./src/test-tools/configure-page-strategy.ts",
+    "lint": "eslint --fix 'src/**/*.{ts,tsx}'",
     "format": "prettier --write ."
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "awesome-phonenumber": "^2.53.0",
-    "pacman-client": "^1.5.4",
-    "react-addons-update": "^15.6.2",
-    "redux": "^4.1.1",
+    "awesome-phonenumber": "^3.2.0",
+    "immutability-helper": "^3.1.1",
+    "pacman-client": "^1.5.6",
+    "react-addons-update": "^15.6.3",
+    "redux": "^4.2.0",
     "redux-logger": "^3.0.6",
-    "redux-thunk": "^2.3.0",
-    "rxjs": "^6.3.3",
-    "rxjs-compat": "^6.3.3",
-    "typescript": "^4.4.3",
-    "uuid": "^3.3.2"
+    "redux-thunk": "^2.4.1",
+    "rxjs": "^7.5.5",
+    "rxjs-compat": "^6.6.7",
+    "typescript": "^4.7.4",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "7.5.5",
-    "@babel/core": "7.5.5",
-    "@babel/plugin-proposal-class-properties": "7.5.5",
-    "@babel/plugin-transform-member-expression-literals": "^7.7.4",
-    "@babel/preset-env": "7.5.5",
-    "@babel/preset-typescript": "7.3.3",
-    "@babel/runtime": "7.5.5",
-    "@reduxjs/toolkit": "https://pkg.csb.dev/reduxjs/redux-toolkit/commit/933aa4a1/@reduxjs/toolkit",
-    "@types/chai": "^4.1.7",
-    "@types/crypto-js": "^4.0.1",
-    "@types/fs-extra": "^7.0.0",
-    "@types/inquirer": "^6.5.0",
-    "@types/mocha": "^5.2.5",
-    "@types/node": "^16.9.4",
-    "@types/node-fetch": "^2.5.7",
-    "@types/ramda": "^0.25.42",
-    "@types/react": "^16.8.6",
-    "@types/react-addons-update": "^0.14.20",
-    "@types/react-dom": "^16.8.2",
-    "@types/react-redux": "^7.1.8",
-    "@types/react-test-renderer": "^16.0.3",
-    "@types/redux-logger": "^3.0.7",
-    "@types/redux-mock-store": "^1.0.2",
-    "@types/uuid": "^8.0.0",
-    "chai": "^4.2.0",
-    "core-js": "3.6.5",
-    "eslint": "^7.16.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-react": "^7.21.5",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-testing-library": "^3.10.1",
-    "eslint-webpack-plugin": "^2.5.2",
-    "jsdom": "^13.2.0",
+    "@babel/cli": "7.18.6",
+    "@babel/core": "7.18.6",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+    "@babel/preset-env": "7.18.6",
+    "@babel/preset-typescript": "7.18.6",
+    "@babel/runtime": "7.18.6",
+    "@reduxjs/toolkit": "1.8.3",
+    "@types/chai": "^4.3.1",
+    "@types/crypto-js": "^4.1.1",
+    "@types/fs-extra": "^9.0.13",
+    "@types/inquirer": "^8.2.1",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.0.3",
+    "@types/node-fetch": "^2.6.2",
+    "@types/ramda": "^0.28.15",
+    "@types/react": "^18.0.15",
+    "@types/react-dom": "^18.0.6",
+    "@types/react-redux": "^7.1.24",
+    "@types/react-test-renderer": "^18.0.0",
+    "@types/redux-logger": "^3.0.9",
+    "@types/redux-mock-store": "^1.0.3",
+    "@types/uuid": "^8.3.4",
+    "chai": "^4.3.6",
+    "core-js": "3.23.4",
+    "eslint": "^8.19.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.5.3",
+    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.30.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-testing-library": "^5.5.1",
+    "eslint-webpack-plugin": "^3.2.0",
+    "jsdom": "^20.0.0",
     "jsdom-global": "^3.0.2",
-    "msw": "^0.35.0",
-    "prettier": "^2.4.1",
-    "prettier-plugin-organize-imports": "^2.3.3",
-    "react-test-renderer": "^16.7.0",
+    "msw": "^0.43.1",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "react-test-renderer": "^18.2.0",
     "redux-cli-logger": "^2.1.0",
     "redux-mock-store": "^1.5.4",
-    "ts-node": "^8.0.2",
-    "yarn": "^1.17.3"
+    "ts-node": "^10.8.2"
   },
   "resolutions": {
-    "@types/react": "^16.7.13",
-    "@types/react-dom": "^16.0.11",
-    "react": "16.8.3",
-    "react-dom": "16.8.3"
+    "@types/react": "^18.0.14",
+    "@types/react-dom": "^18.0.5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "proxy": "http://localhost:3030/",
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write",
     "src/**/*.{ts,tsx}": "eslint --fix"

package/prettier.config.js

@@ -4,4 +4,4 @@ module.exports = {
   "singleQuote": true,
   "printWidth": 120,
   "tabWidth": 2
-};
+};

package/src/reducers/pinFlow/index.ts

@@ -5,15 +5,26 @@ import { MSISDNEntryFailure, MSISDNEntryErrorTypes, PINEntryFailure, PINEntrySuc
 import { AppThunk } from "../../common-types/AppThunk";
 import submitMSISDN, { mockedCompletedState, mockedMSISDNEntryFailure, mockedPINState, submitPIN } from "./utils";
 import { genericHandler, tracker } from "../strategy";
+import { getSAOperatorByMsisdnPrefix } from "../../utilities";
+import { determineFlowByOperator } from "../strategy/utils";
 
 
+const getConfigByMsisdnPrefix = (msisdn:string)=>{
+  const operatorByPrefix = getSAOperatorByMsisdnPrefix(msisdn);
+  const flowObj = determineFlowByOperator(operatorByPrefix);
+  return flowObj.flowConfig;
+}
+
 //ACTION CREATORS
 export function submitMSISDNAction(msisdn:string, extraParams?:IHash):AppThunk{
   return async (dispatch, store)=>{
     const {currentState} = store().strategy;
     const pinFlowCurrentState = store().pinFlow.currentState;
     if(currentState.type === "PIN"){
-      const config = currentState.result.config;
+      const { config: configByStrategy, isUseMsisdnPrefix } = currentState.result;
+
+      const config = isUseMsisdnPrefix ? getConfigByMsisdnPrefix(msisdn) : configByStrategy;
+
       const pinMaxLengthByOp:{[key:string]:number} = {
         "SA_MOBILY":6,
         "SA_STC":4,

package/src/reducers/pinFlow/utils.ts

@@ -73,7 +73,6 @@ 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 = (!!uniqidResult && uniqidResult != "") ? `&mcpUniqid=${uniqidResult}` : '';
-  
 
 
   const result: IMSISDNSubmissionResult = await window.tallymanApi.triggerPin(host, country, slug, device, offer, msisdn, rockmanId, extraParamsQs, search, uniqid)

package/src/reducers/strategy/StrategyTypes.ts

@@ -4,9 +4,9 @@ import { AppThunk } from "../../common-types/AppThunk";
 
 export type IIdentifyResult = {
   operator:   string;
-  flow:       string;
+  flow?:       string;
   success:    boolean;
-  rockman_id: string;
+  rockman_id?: string;
   message?:string;
 }
 
@@ -46,6 +46,7 @@ export type StrategyConfig = {
     [key:string]:IFlow;
   };
   default:IFlow;
+  isUseMsisdnPrefix?:boolean;
 }
 // export type IStrategy = IPinStrategy | IMoStrategy;
 
@@ -111,6 +112,7 @@ export type IdentifyFlowOptionsResult<F> = {
   rockman_id?:string;
   isHeaderEnrichmentSuccess?:boolean;
   autoRedirect?:boolean;
+  isUseMsisdnPrefix?: boolean;
 }
 
 

package/src/reducers/strategy/index.ts

@@ -21,7 +21,7 @@ import ask_mobile_number,
 { 
   submitMSISDNAction
 } from "./strategies/ask_mobile_number";
-import update from "react-addons-update";
+import update from 'immutability-helper';
 import mkTracker from "../../pacman";
 import detect_operator_by_ip from "./strategies/detect_operator_by_ip";
 import { loadOc2sms } from "../click2smsFlow";
@@ -100,6 +100,7 @@ export function mockStrategyStateByUrlParam():AppThunk {
 export function  identifyStrategy():AppThunk {
   return async (dispatch)=>{
     const { strategy, strategyConfigs } = getConfig();
+    const { isUseMsisdnPrefix } = strategyConfigs;
     const search = searchToObject() as IMockFlowParams<IMockPinFlowStates>;
 
     if(search["mock-flow"] !== undefined){
@@ -138,7 +139,8 @@ export function  identifyStrategy():AppThunk {
               type:"PIN",
               result: {
                 nextAction:"submitMSISDNAction",
-                config:strategyConfigs.default.flowConfig
+                config:strategyConfigs.default.flowConfig,
+                isUseMsisdnPrefix
               }
             }
           });
@@ -270,8 +272,9 @@ export function checkSubscriptionAction(trackingArgs:{flow: string, action: stri
 }
 export function genericHandler<S,P>(state:S, payload:P){
   return update(state, {
+    //@ts-ignore
     currentState:{
-      $set:payload,
+      $set: payload
     }
   });
 }

package/src/reducers/strategy/strategies/detect_operator_by_ip.ts

@@ -2,7 +2,6 @@ import * as RDS from "../../../common-types/RemoteDataState";
 
 import {getConfig, determineFlowByOperatorFromIp } from "../utils";
 import { AppThunk } from "../../../common-types/AppThunk";
-import update from "react-addons-update";
 import {
   IFlow
 } from "../StrategyTypes";

package/src/utilities/index.ts

@@ -24,4 +24,91 @@ export const setOnLoadUtilities = (config:IConfig)=>{
       loadMcpShield(window, config);
     }
   }
+}
+
+export type SAOperators = 'SA_VIRGIN' | 'SA_MOBILY' | 'SA_STC' | 'SA_ZAIN';
+const sa_prefix_operator_map = new Map<string, SAOperators>([
+    ['966571', 'SA_VIRGIN']
+  , ['966500', 'SA_STC']
+  , ['966501', 'SA_STC']
+  , ['966502', 'SA_STC']
+  , ['966503', 'SA_STC']
+  , ['966504', 'SA_STC']
+  , ['966505', 'SA_STC']
+  , ['966506', 'SA_STC']
+  , ['966507', 'SA_STC']
+  , ['966508', 'SA_STC']
+  , ['966509', 'SA_STC']
+  , ['966512', 'SA_STC'] 
+  , ['966514', 'SA_STC'] 
+  , ['966515', 'SA_STC'] 
+  , ['966517', 'SA_STC'] 
+  , ['966530', 'SA_STC']
+  , ['966531', 'SA_STC']
+  , ['966532', 'SA_STC']
+  , ['966533', 'SA_STC']
+  , ['966534', 'SA_STC']
+  , ['966535', 'SA_STC']
+  , ['966536', 'SA_STC']
+  , ['966537', 'SA_STC']
+  , ['966538', 'SA_STC']
+  , ['966539', 'SA_STC'] 
+  , ['966540', 'SA_MOBILY']
+  , ['966541', 'SA_MOBILY']
+  , ['966542', 'SA_MOBILY']
+  , ['966543', 'SA_MOBILY']
+  , ['966544', 'SA_MOBILY']
+  , ['966545', 'SA_MOBILY']
+  , ['966546', 'SA_MOBILY']
+  , ['966547', 'SA_MOBILY']
+  , ['966548', 'SA_MOBILY']
+  , ['966549', 'SA_MOBILY']
+  , ['966550', 'SA_STC']
+  , ['966551', 'SA_STC']
+  , ['966552', 'SA_STC']
+  , ['966553', 'SA_STC']
+  , ['966554', 'SA_STC']
+  , ['966555', 'SA_STC']
+  , ['966556', 'SA_STC']
+  , ['966557', 'SA_STC']
+  , ['966558', 'SA_STC']
+  , ['966559', 'SA_STC']
+  , ['966560', 'SA_MOBILY']
+  , ['966561', 'SA_MOBILY']
+  , ['966562', 'SA_MOBILY']
+  , ['966563', 'SA_MOBILY']
+  , ['966564', 'SA_MOBILY']
+  , ['966565', 'SA_MOBILY']
+  , ['966566', 'SA_MOBILY']
+  , ['966567', 'SA_MOBILY']
+  , ['966568', 'SA_MOBILY']
+  , ['966569', 'SA_MOBILY']
+  , ['966570', 'SA_VIRGIN']
+  , ['966572', 'SA_VIRGIN']
+  , ['966573', 'SA_VIRGIN']
+  , ['966580', 'SA_ZAIN']
+  , ['966581', 'SA_ZAIN']
+  , ['966582', 'SA_ZAIN']
+  , ['966583', 'SA_ZAIN']
+  , ['966586', 'SA_ZAIN'] 
+  , ['966588', 'SA_ZAIN'] 
+  , ['966589', 'SA_ZAIN'] 
+  , ['966590', 'SA_ZAIN']
+  , ['966591', 'SA_ZAIN']
+  , ['966592', 'SA_ZAIN']
+  , ['966593', 'SA_ZAIN']
+  , ['966594', 'SA_ZAIN']
+  , ['966595', 'SA_ZAIN']
+  , ['966596', 'SA_ZAIN']
+  , ['966597', 'SA_ZAIN']
+  , ['966598', 'SA_ZAIN']
+  , ['966599', 'SA_ZAIN']
+]);
+
+export function getSAOperatorByMsisdnPrefix(msisdn: string) : SAOperators | undefined {
+  if(msisdn[0] === "0") {
+    msisdn = "966" + msisdn.substring(1);
+  }
+  const prefix = msisdn.substring(0, 6)
+  return sa_prefix_operator_map.get(prefix);
 }

package/tsconfig.json

@@ -17,5 +17,5 @@
     "typeRoots": ["node_modules/@types", "src/@types"]
   },
   "include": ["src/**/*", "dev-tools/**/*"],
-  "exclude": [ "node_modules", "webpack/**/*"]
+  "exclude": [ "node_modules/**/*", "webpack/**/*"]
 }