Merge pull request #8 from cybersource-tpi/main

Latest code with OCC v23.11 compatible
CyberSource · Mar 4, 2024 · dea3f05 · dea3f05
2 parents c929184 + 8bf5d7c
commit dea3f05
Show file tree

Hide file tree

Showing 53 changed files with 511 additions and 486 deletions.
diff --git a/documentation/Oracle Commerce Cloud Installation Guide.pdf b/documentation/Oracle Commerce Cloud Installation Guide.pdf
diff --git a/documentation/Oracle Commerce Cloud- Cybersource User Installation Guide.pdf b/documentation/Oracle Commerce Cloud- Cybersource User Installation Guide.pdf
diff --git a/documentation/images/extension-version.png b/documentation/images/extension-version.png
diff --git a/documentation/package-contents.md b/documentation/package-contents.md
@@ -179,7 +179,6 @@ server-extension
  ┣ src
  ┃ ┣ common
  ┃ ┃ ┣ logging
- ┃ ┃ ┃ ┣ consoleLogger.ts
  ┃ ┃ ┃ ┗ occLogger.ts
  ┃ ┃ ┣ genericDispatcher.ts
  ┃ ┃ ┗ index.ts
@@ -238,7 +237,9 @@ server-extension
  ┃ ┃ ┃ ┣ converters
  ┃ ┃ ┃ ┃ ┣ request
  ┃ ┃ ┃ ┃ ┃ ┣ mappers
+ ┃ ┃ ┃ ┃ ┃ ┃ ┣ additionalFieldsMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ billingAddressMapper.ts
+ ┃ ┃ ┃ ┃ ┃ ┃ ┣ buyerRiskInformationMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ cardSelectionIndicatorMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ decisionManagerMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ deviceFingerprintMapper.ts
@@ -252,6 +253,7 @@ server-extension
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ savedCardPaymentMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ savePaymentTokenMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┣ shippingAddressMapper.ts
+ ┃ ┃ ┃ ┃ ┃ ┃ ┣ lineItemAndsubTotalMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┃ ┗ transientTokenInfoMapper.ts
  ┃ ┃ ┃ ┃ ┃ ┣ applepayAuthorization.ts
  ┃ ┃ ┃ ┃ ┃ ┣ authorizationReversal.ts

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
     "npmClient": "yarn",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "packages": ["packages/*"]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "isv-occ-payment",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "description": "ISV Oracle Commerce Cloud Payment Plugin",
   "main": "index.js",
   "repository": "[email protected]:cybersource-tpi/cybersource-plugins-oraclecxcommerce.git",
@@ -12,44 +12,21 @@
     "build:prod": "lerna run build:prod",
     "ci": "run-s lint:ci test:ci",
     "clean": "lerna run clean --stream",
-    "configure": "occ configure",
-    "configure-app": "occ configure-app",
-    "create-action": "occ create-action",
-    "create-app": "occ create-app",
-    "create-endpoint": "occ create-endpoint",
-    "create-fetcher": "occ create-fetcher",
-    "create-selector": "occ create-selector",
-    "create-template": "occ create-template",
-    "create-widget": "occ create-widget",
-    "delete": "occ delete",
-    "deploy": "occ deploy",
-    "deploy-log": "occ deploy-log",
-    "deploy-status": "occ deploy-status",
-    "download": "occ download",
-    "download-assets": "occ download-assets",
     "eslint": "eslint .",
     "eslint:fix": "eslint --fix .",
     "format": "prettier --write packages/**/*.{js,jsx,ts,tsx}",
     "lint": "yarn lint:cmd --fix",
     "lint:ci": "yarn lint:cmd -o ./html-reports/lint-report.html -f html",
     "lint:cmd": "eslint . --ext '.ts,.tsx,.json,.js' --cache",
-    "list-apps": "occ list-apps",
     "occ": "node ./bin/index.js",
-    "output": "occ output",
     "perf": "jest -i -c jest.config.perf.js",
     "perf:debug": "node --inspect-brk node_modules/jest/bin/jest.js -i -c jest.config.perf.js",
     "perf:lighthouse": "jest -i -c jest.config.perf.lighthouse.js",
     "perf:wpt": "jest -i -c jest.config.perf.wpt.js",
     "prettier:fix": "prettier --config .prettierrc.js --write \"{packages,qa}/**/*.js\"",
-    "redeploy": "occ redeploy",
-    "seed": "yarn deploy --reset --publishAll",
-    "set-logging-options": "occ set-logging-options",
     "start:mock-server": "yarn workspace @isv-occ-payment/occ-mock-server start",
-    "start:prod": "occ serve",
     "start:server": "yarn workspace @isv-occ-payment/occ-sse-gateway start",
     "start:server-watch": "yarn workspace @isv-occ-payment/occ-sse-gateway start:watch",
-    "start:widget": "nodemon --inspect node_modules/@oracle-cx-commerce/cli/cli.js serve",
-    "start:widget-classic": "yarn workspace @isv-occ-payment/payment-widget start",
     "stylelint": "stylelint **/*.css --ignore-disables",
     "test": "jest -c jest.config.js",
     "test:api": "jest -c jest.config.api.js",
@@ -62,13 +39,11 @@
     "test:int:debug": "node --inspect-brk node_modules/jest/bin/jest.js -i -c jest.config.int.js",
     "test:unit": "lerna run test:unit --stream",
     "tsc": "tsc -p ./tsconfig.json",
-    "upload-custom-typeahead-keywords": "occ upload-custom-typeahead-keywords",
-    "upload-search-config": "occ upload-search-config",
     "start-sse": "yarn workspace @isv-occ-payment/server-extension start:watch --inspect"
   },
   "dependencies": {
     "@popperjs/core": "^2.11.6",
-    "jwt-decode": "^4.0.0",
+
     "tsc-alias": "^1.7.1"
   },
   "devDependencies": {
@@ -77,7 +52,6 @@
     "@types/crypto-js": "^4.1.1",
     "@types/googlepay": "^0.7.3",
     "@types/jest": "^29.2.3",
-    "@types/jwt-decode": "^3.1.0",
     "@types/node": "^20.8.9",
     "@types/node-fetch": "^2.6.2",
     "@types/supertest": "^2.0.12",

diff --git a/packages/applepay-payment-service/package.json b/packages/applepay-payment-service/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/applepay-payment-service",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "description": "ApplePay SSE Payment Service",
     "repository": {
         "type": "git",
@@ -9,16 +9,12 @@
     "author": "ISV Payments",
     "main": "cjs/index.js",
     "dependencies": {
-        "@isv-occ-payment/occ-payment-service": "23.3.0",
-        "@isv-occ-payment/occ-sdk": "23.3.0",
-        "@isv-occ-payment/payment-sdk": "23.3.0",
-        "@isv-occ-payment/server-extension": "23.3.0",
+        "@isv-occ-payment/occ-payment-service": "24.1.0",
+        "@isv-occ-payment/occ-sdk": "24.1.0",
+        "@isv-occ-payment/payment-sdk": "24.1.0",
+        "@isv-occ-payment/server-extension": "24.1.0",
         "cybersource-rest-client": "0.0.50"
     },
-    "devDependencies": {
-        "node-mocks-http": "^1.10.1",
-        "sinon": "^17.0.1"
-    },
     "scripts": {
         "prebuild": "yarn clean && mkdirp node_modules/@isv-occ-payment && symlink-dir ../occ-sdk node_modules/@isv-occ-payment/occ-sdk && symlink-dir ../payment-sdk node_modules/@isv-occ-payment/payment-sdk",
         "build": "tsc -p tsconfig.json",

diff --git a/packages/card-payment-service/package.json b/packages/card-payment-service/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/card-payment-service",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "description": "Card SSE Payment Service",
     "repository": {
         "type": "git",
@@ -9,16 +9,12 @@
     "author": "ISV Payments",
     "main": "cjs/index.js",
     "dependencies": {
-        "@isv-occ-payment/occ-payment-service": "23.3.0",
-        "@isv-occ-payment/occ-sdk": "23.3.0",
-        "@isv-occ-payment/payment-sdk": "23.3.0",
-        "@isv-occ-payment/server-extension": "23.3.0",
+        "@isv-occ-payment/occ-payment-service": "24.1.0",
+        "@isv-occ-payment/occ-sdk": "24.1.0",
+        "@isv-occ-payment/payment-sdk": "24.1.0",
+        "@isv-occ-payment/server-extension": "24.1.0",
         "cybersource-rest-client": "0.0.50"
     },
-    "devDependencies": {
-        "node-mocks-http": "^1.10.1",
-        "sinon": "^17.0.1"
-    },
     "scripts": {
         "prebuild": "yarn clean && mkdirp node_modules/@isv-occ-payment && symlink-dir ../occ-sdk node_modules/@isv-occ-payment/occ-sdk && symlink-dir ../payment-sdk node_modules/@isv-occ-payment/payment-sdk",
         "build": "tsc -p tsconfig.json",

diff --git a/packages/generic-payment-service/package.json b/packages/generic-payment-service/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/generic-payment-service",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "description": "Generic SSE Payment Service",
     "repository": {
         "type": "git",
@@ -9,15 +9,13 @@
     "author": "ISV Payments",
     "main": "cjs/index.js",
     "dependencies": {
-        "@isv-occ-payment/occ-payment-service": "23.3.0",
-        "@isv-occ-payment/occ-sdk": "23.3.0",
-        "@isv-occ-payment/payment-sdk": "23.3.0",
-        "@isv-occ-payment/server-extension": "23.3.0",
+        "@isv-occ-payment/occ-payment-service": "24.1.0",
+        "@isv-occ-payment/occ-sdk": "24.1.0",
+        "@isv-occ-payment/payment-sdk": "24.1.0",
+        "@isv-occ-payment/server-extension": "24.1.0",
         "cybersource-rest-client": "0.0.50"
     },
     "devDependencies": {
-        "node-mocks-http": "^1.10.1",
-        "sinon": "^17.0.1",
         "typescript-transform-paths": "^3.4.4"
     },
     "scripts": {

diff --git a/packages/googlepay-payment-service/package.json b/packages/googlepay-payment-service/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/googlepay-payment-service",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "description": "GooglePay SSE Payment Service",
     "repository": {
         "type": "git",
@@ -9,16 +9,12 @@
     "author": "ISV Payments",
     "main": "cjs/index.js",
     "dependencies": {
-        "@isv-occ-payment/occ-payment-service": "23.3.0",
-        "@isv-occ-payment/occ-sdk": "23.3.0",
-        "@isv-occ-payment/payment-sdk": "23.3.0",
-        "@isv-occ-payment/server-extension": "23.3.0",
+        "@isv-occ-payment/occ-payment-service": "24.1.0",
+        "@isv-occ-payment/occ-sdk": "24.1.0",
+        "@isv-occ-payment/payment-sdk": "24.1.0",
+        "@isv-occ-payment/server-extension": "24.1.0",
         "cybersource-rest-client": "0.0.50"
     },
-    "devDependencies": {
-        "node-mocks-http": "^1.10.1",
-        "sinon": "^17.0.1"
-    },
     "scripts": {
         "prebuild": "yarn clean && mkdirp node_modules/@isv-occ-payment && symlink-dir ../occ-sdk node_modules/@isv-occ-payment/occ-sdk && symlink-dir ../payment-sdk node_modules/@isv-occ-payment/payment-sdk",
         "build": "tsc -p tsconfig.json",

diff --git a/packages/occ-mock-server/package.json b/packages/occ-mock-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@isv-occ-payment/occ-mock-server",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": true,
   "description": "Mock OCC APIs",
   "repository": {
@@ -22,7 +22,7 @@
     "ssl_port": "5001"
   },
   "dependencies": {
-    "@isv-occ-payment/payment-gateway": "23.3.0",
+    "@isv-occ-payment/payment-gateway": "24.1.0",
     "@types/json-server": "^0.14.2",
     "json-server": "^0.17.1",
     "node-fetch": "^3.3.0"

diff --git a/packages/occ-payment-factory/package.json b/packages/occ-payment-factory/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/occ-payment-factory",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "private": true,
     "description": "Oracle Commerce payment service factory",
     "repository": {
@@ -11,11 +11,6 @@
     "main": "cjs/indexPaymentFactory.js",
     "types": "cjs/indexPaymentFactory.d.ts",
     "devDependencies": {
-        "async": "^3.2.3",
-        "fecha": "^4.2.0",
-        "is-stream": "^3.0.0",
-        "logform": "^2.1.1",
-        "one-time": "^1.0.0",
         "winston": "latest"
     },
     "scripts": {

diff --git a/packages/occ-payment-service/package.json b/packages/occ-payment-service/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/occ-payment-service",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "description": "Oracle Commerce payment service",
     "repository": {
         "type": "git",
@@ -9,10 +9,6 @@
     "author": "ISV Payments",
     "main": "cjs/indexPaymentService.js",
     "types": "cjs/indexPaymentService.d.ts",
-    "devDependencies": {
-        "node-mocks-http": "^1.10.1",
-        "sinon": "^17.0.1"
-    },
     "scripts": {
         "prebuild": "yarn clean",
         "build": "tsc -p tsconfig.json",

diff --git a/packages/occ-sdk/package.json b/packages/occ-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@isv-occ-payment/occ-sdk",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": true,
   "description": "OCC SDK",
   "repository": {

diff --git a/packages/occ-sse-gateway/lib/types/occ-sdk.d.ts b/packages/occ-sse-gateway/lib/types/occ-sdk.d.ts
@@ -240,6 +240,10 @@ declare namespace OCC {
     accessToken?: string;
     pareq?: string;
     challengeCode?: string;
+    couponCode?: string;
+    numberOfPurchases?: string;
+    lineItems?:any;
+    subTotal?:string;
   }
 
   export interface CaptureContextRequest {

diff --git a/packages/occ-sse-gateway/package.json b/packages/occ-sse-gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@isv-occ-payment/occ-sse-gateway",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": true,
   "description": "Oracle Commerce SSE payment gateway",
   "repository": {
@@ -51,9 +51,9 @@
     "ssl_port": "3001"
   },
   "dependencies": {
-    "@isv-occ-payment/occ-sdk": "23.3.0",
-    "@isv-occ-payment/payment-sdk": "23.3.0",
-    "@isv-occ-payment/server-extension": "23.3.0",
+    "@isv-occ-payment/occ-sdk": "24.1.0",
+    "@isv-occ-payment/payment-sdk": "24.1.0",
+    "@isv-occ-payment/server-extension": "24.1.0",
     "cybersource-rest-client": "0.0.50",
     "deepmerge": "^4.2.2",
     "express-validator": "7.0.1",

diff --git a/packages/payment-gateway/ext.json b/packages/payment-gateway/ext.json
@@ -2,8 +2,8 @@
     "extensionID": "",
     "developerID": "999",
     "createdBy": "ISV Plugins",
-    "name": "payment-gateway-23.3.0",
-    "version": 2330,
+    "name": "payment-gateway-24.1.0",
+    "version": 2410,
     "timeCreated": "2023-11-24",
     "description": "ISV Payment Gateway"    
 }
diff --git a/packages/payment-gateway/package.json b/packages/payment-gateway/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@isv-occ-payment/payment-gateway",
-    "version": "23.3.0",
+    "version": "24.1.0",
     "private": true,
     "description": "ISV OCC Payment Gateway",
     "repository": "",

diff --git a/packages/payment-sdk/package.json b/packages/payment-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@isv-occ-payment/payment-sdk",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": true,
   "description": "Payment SDK",
   "repository": {

diff --git a/packages/server-extension/config/app.local.json b/packages/server-extension/config/app.local.json
@@ -12,7 +12,7 @@
   "report.daily.download.path": "",
   "crypto.service.key": "l8myMlkZiBX/kLbpDcn3Nw==",
   "partner.developerId": "999",
-  "partner.solutionId": "1AP1ZRHP",
+  "partner.solutionId": "EQU9OF9E",
   "logging.webhook.http": true,
   "logging.api.error": true,
   "logging.api.access": true

diff --git a/packages/server-extension/config/app.prod.json b/packages/server-extension/config/app.prod.json
@@ -4,7 +4,7 @@
     "crypto.service.key": "l8myMlkZiBX/kLbpDcn3Nw==",
     "feature.gatewaysettings.payload": "disabled",
     "partner.developerId": "999",
-    "partner.solutionId": "1AP1ZRHP",
+    "partner.solutionId": "EQU9OF9E",
     "logging.webhook.http": true,
     "logging.api.error": true,
     "logging.api.access": true,

diff --git a/packages/server-extension/package.json b/packages/server-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@isv-occ-payment/server-extension",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": true,
   "description": "Payment Server Extension",
   "repository": {
@@ -55,10 +55,10 @@
     "ssl_port": "3001"
   },
   "dependencies": {
-    "@isv-occ-payment/occ-payment-factory": "23.3.0",
-    "@isv-occ-payment/occ-sdk": "23.3.0",
-    "@isv-occ-payment/payment-gateway": "23.3.0",
-    "@isv-occ-payment/payment-sdk": "23.3.0",
+    "@isv-occ-payment/occ-payment-factory": "24.1.0",
+    "@isv-occ-payment/occ-sdk": "24.1.0",
+    "@isv-occ-payment/payment-gateway": "24.1.0",
+    "@isv-occ-payment/payment-sdk": "24.1.0",
     "cybersource-rest-client": "0.0.50",
     "deepmerge": "^4.2.2",
     "express-validator": "7.0.1",