Skip to content

Commit dea3f05

Browse files
Merge pull request #8 from cybersource-tpi/main
Latest code with OCC v23.11 compatible
2 parents c929184 + 8bf5d7c commit dea3f05

File tree

53 files changed

+511
-486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+511
-486
lines changed
Binary file not shown.
Binary file not shown.
-108 KB
Loading

documentation/package-contents.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ server-extension
179179
┣ src
180180
┃ ┣ common
181181
┃ ┃ ┣ logging
182-
┃ ┃ ┃ ┣ consoleLogger.ts
183182
┃ ┃ ┃ ┗ occLogger.ts
184183
┃ ┃ ┣ genericDispatcher.ts
185184
┃ ┃ ┗ index.ts
@@ -238,7 +237,9 @@ server-extension
238237
┃ ┃ ┃ ┣ converters
239238
┃ ┃ ┃ ┃ ┣ request
240239
┃ ┃ ┃ ┃ ┃ ┣ mappers
240+
┃ ┃ ┃ ┃ ┃ ┃ ┣ additionalFieldsMapper.ts
241241
┃ ┃ ┃ ┃ ┃ ┃ ┣ billingAddressMapper.ts
242+
┃ ┃ ┃ ┃ ┃ ┃ ┣ buyerRiskInformationMapper.ts
242243
┃ ┃ ┃ ┃ ┃ ┃ ┣ cardSelectionIndicatorMapper.ts
243244
┃ ┃ ┃ ┃ ┃ ┃ ┣ decisionManagerMapper.ts
244245
┃ ┃ ┃ ┃ ┃ ┃ ┣ deviceFingerprintMapper.ts
@@ -252,6 +253,7 @@ server-extension
252253
┃ ┃ ┃ ┃ ┃ ┃ ┣ savedCardPaymentMapper.ts
253254
┃ ┃ ┃ ┃ ┃ ┃ ┣ savePaymentTokenMapper.ts
254255
┃ ┃ ┃ ┃ ┃ ┃ ┣ shippingAddressMapper.ts
256+
┃ ┃ ┃ ┃ ┃ ┃ ┣ lineItemAndsubTotalMapper.ts
255257
┃ ┃ ┃ ┃ ┃ ┃ ┗ transientTokenInfoMapper.ts
256258
┃ ┃ ┃ ┃ ┃ ┣ applepayAuthorization.ts
257259
┃ ┃ ┃ ┃ ┃ ┣ authorizationReversal.ts

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"npmClient": "yarn",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"packages": ["packages/*"]
55
}

package.json

+2-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "isv-occ-payment",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"description": "ISV Oracle Commerce Cloud Payment Plugin",
55
"main": "index.js",
66
"repository": "[email protected]:cybersource-tpi/cybersource-plugins-oraclecxcommerce.git",
@@ -12,44 +12,21 @@
1212
"build:prod": "lerna run build:prod",
1313
"ci": "run-s lint:ci test:ci",
1414
"clean": "lerna run clean --stream",
15-
"configure": "occ configure",
16-
"configure-app": "occ configure-app",
17-
"create-action": "occ create-action",
18-
"create-app": "occ create-app",
19-
"create-endpoint": "occ create-endpoint",
20-
"create-fetcher": "occ create-fetcher",
21-
"create-selector": "occ create-selector",
22-
"create-template": "occ create-template",
23-
"create-widget": "occ create-widget",
24-
"delete": "occ delete",
25-
"deploy": "occ deploy",
26-
"deploy-log": "occ deploy-log",
27-
"deploy-status": "occ deploy-status",
28-
"download": "occ download",
29-
"download-assets": "occ download-assets",
3015
"eslint": "eslint .",
3116
"eslint:fix": "eslint --fix .",
3217
"format": "prettier --write packages/**/*.{js,jsx,ts,tsx}",
3318
"lint": "yarn lint:cmd --fix",
3419
"lint:ci": "yarn lint:cmd -o ./html-reports/lint-report.html -f html",
3520
"lint:cmd": "eslint . --ext '.ts,.tsx,.json,.js' --cache",
36-
"list-apps": "occ list-apps",
3721
"occ": "node ./bin/index.js",
38-
"output": "occ output",
3922
"perf": "jest -i -c jest.config.perf.js",
4023
"perf:debug": "node --inspect-brk node_modules/jest/bin/jest.js -i -c jest.config.perf.js",
4124
"perf:lighthouse": "jest -i -c jest.config.perf.lighthouse.js",
4225
"perf:wpt": "jest -i -c jest.config.perf.wpt.js",
4326
"prettier:fix": "prettier --config .prettierrc.js --write \"{packages,qa}/**/*.js\"",
44-
"redeploy": "occ redeploy",
45-
"seed": "yarn deploy --reset --publishAll",
46-
"set-logging-options": "occ set-logging-options",
4727
"start:mock-server": "yarn workspace @isv-occ-payment/occ-mock-server start",
48-
"start:prod": "occ serve",
4928
"start:server": "yarn workspace @isv-occ-payment/occ-sse-gateway start",
5029
"start:server-watch": "yarn workspace @isv-occ-payment/occ-sse-gateway start:watch",
51-
"start:widget": "nodemon --inspect node_modules/@oracle-cx-commerce/cli/cli.js serve",
52-
"start:widget-classic": "yarn workspace @isv-occ-payment/payment-widget start",
5330
"stylelint": "stylelint **/*.css --ignore-disables",
5431
"test": "jest -c jest.config.js",
5532
"test:api": "jest -c jest.config.api.js",
@@ -62,13 +39,11 @@
6239
"test:int:debug": "node --inspect-brk node_modules/jest/bin/jest.js -i -c jest.config.int.js",
6340
"test:unit": "lerna run test:unit --stream",
6441
"tsc": "tsc -p ./tsconfig.json",
65-
"upload-custom-typeahead-keywords": "occ upload-custom-typeahead-keywords",
66-
"upload-search-config": "occ upload-search-config",
6742
"start-sse": "yarn workspace @isv-occ-payment/server-extension start:watch --inspect"
6843
},
6944
"dependencies": {
7045
"@popperjs/core": "^2.11.6",
71-
"jwt-decode": "^4.0.0",
46+
7247
"tsc-alias": "^1.7.1"
7348
},
7449
"devDependencies": {
@@ -77,7 +52,6 @@
7752
"@types/crypto-js": "^4.1.1",
7853
"@types/googlepay": "^0.7.3",
7954
"@types/jest": "^29.2.3",
80-
"@types/jwt-decode": "^3.1.0",
8155
"@types/node": "^20.8.9",
8256
"@types/node-fetch": "^2.6.2",
8357
"@types/supertest": "^2.0.12",

packages/applepay-payment-service/package.json

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/applepay-payment-service",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"description": "ApplePay SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,16 +9,12 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.3.0",
13-
"@isv-occ-payment/occ-sdk": "23.3.0",
14-
"@isv-occ-payment/payment-sdk": "23.3.0",
15-
"@isv-occ-payment/server-extension": "23.3.0",
12+
"@isv-occ-payment/occ-payment-service": "24.1.0",
13+
"@isv-occ-payment/occ-sdk": "24.1.0",
14+
"@isv-occ-payment/payment-sdk": "24.1.0",
15+
"@isv-occ-payment/server-extension": "24.1.0",
1616
"cybersource-rest-client": "0.0.50"
1717
},
18-
"devDependencies": {
19-
"node-mocks-http": "^1.10.1",
20-
"sinon": "^17.0.1"
21-
},
2218
"scripts": {
2319
"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",
2420
"build": "tsc -p tsconfig.json",

packages/card-payment-service/package.json

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/card-payment-service",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"description": "Card SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,16 +9,12 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.3.0",
13-
"@isv-occ-payment/occ-sdk": "23.3.0",
14-
"@isv-occ-payment/payment-sdk": "23.3.0",
15-
"@isv-occ-payment/server-extension": "23.3.0",
12+
"@isv-occ-payment/occ-payment-service": "24.1.0",
13+
"@isv-occ-payment/occ-sdk": "24.1.0",
14+
"@isv-occ-payment/payment-sdk": "24.1.0",
15+
"@isv-occ-payment/server-extension": "24.1.0",
1616
"cybersource-rest-client": "0.0.50"
1717
},
18-
"devDependencies": {
19-
"node-mocks-http": "^1.10.1",
20-
"sinon": "^17.0.1"
21-
},
2218
"scripts": {
2319
"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",
2420
"build": "tsc -p tsconfig.json",

packages/generic-payment-service/package.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/generic-payment-service",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"description": "Generic SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,15 +9,13 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.3.0",
13-
"@isv-occ-payment/occ-sdk": "23.3.0",
14-
"@isv-occ-payment/payment-sdk": "23.3.0",
15-
"@isv-occ-payment/server-extension": "23.3.0",
12+
"@isv-occ-payment/occ-payment-service": "24.1.0",
13+
"@isv-occ-payment/occ-sdk": "24.1.0",
14+
"@isv-occ-payment/payment-sdk": "24.1.0",
15+
"@isv-occ-payment/server-extension": "24.1.0",
1616
"cybersource-rest-client": "0.0.50"
1717
},
1818
"devDependencies": {
19-
"node-mocks-http": "^1.10.1",
20-
"sinon": "^17.0.1",
2119
"typescript-transform-paths": "^3.4.4"
2220
},
2321
"scripts": {

packages/googlepay-payment-service/package.json

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/googlepay-payment-service",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"description": "GooglePay SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,16 +9,12 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.3.0",
13-
"@isv-occ-payment/occ-sdk": "23.3.0",
14-
"@isv-occ-payment/payment-sdk": "23.3.0",
15-
"@isv-occ-payment/server-extension": "23.3.0",
12+
"@isv-occ-payment/occ-payment-service": "24.1.0",
13+
"@isv-occ-payment/occ-sdk": "24.1.0",
14+
"@isv-occ-payment/payment-sdk": "24.1.0",
15+
"@isv-occ-payment/server-extension": "24.1.0",
1616
"cybersource-rest-client": "0.0.50"
1717
},
18-
"devDependencies": {
19-
"node-mocks-http": "^1.10.1",
20-
"sinon": "^17.0.1"
21-
},
2218
"scripts": {
2319
"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",
2420
"build": "tsc -p tsconfig.json",

packages/occ-mock-server/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-mock-server",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "Mock OCC APIs",
66
"repository": {
@@ -22,7 +22,7 @@
2222
"ssl_port": "5001"
2323
},
2424
"dependencies": {
25-
"@isv-occ-payment/payment-gateway": "23.3.0",
25+
"@isv-occ-payment/payment-gateway": "24.1.0",
2626
"@types/json-server": "^0.14.2",
2727
"json-server": "^0.17.1",
2828
"node-fetch": "^3.3.0"

packages/occ-payment-factory/package.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-payment-factory",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "Oracle Commerce payment service factory",
66
"repository": {
@@ -11,11 +11,6 @@
1111
"main": "cjs/indexPaymentFactory.js",
1212
"types": "cjs/indexPaymentFactory.d.ts",
1313
"devDependencies": {
14-
"async": "^3.2.3",
15-
"fecha": "^4.2.0",
16-
"is-stream": "^3.0.0",
17-
"logform": "^2.1.1",
18-
"one-time": "^1.0.0",
1914
"winston": "latest"
2015
},
2116
"scripts": {

packages/occ-payment-service/package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-payment-service",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"description": "Oracle Commerce payment service",
55
"repository": {
66
"type": "git",
@@ -9,10 +9,6 @@
99
"author": "ISV Payments",
1010
"main": "cjs/indexPaymentService.js",
1111
"types": "cjs/indexPaymentService.d.ts",
12-
"devDependencies": {
13-
"node-mocks-http": "^1.10.1",
14-
"sinon": "^17.0.1"
15-
},
1612
"scripts": {
1713
"prebuild": "yarn clean",
1814
"build": "tsc -p tsconfig.json",

packages/occ-sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-sdk",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "OCC SDK",
66
"repository": {

packages/occ-sse-gateway/lib/types/occ-sdk.d.ts

+4
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ declare namespace OCC {
240240
accessToken?: string;
241241
pareq?: string;
242242
challengeCode?: string;
243+
couponCode?: string;
244+
numberOfPurchases?: string;
245+
lineItems?:any;
246+
subTotal?:string;
243247
}
244248

245249
export interface CaptureContextRequest {

packages/occ-sse-gateway/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-sse-gateway",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "Oracle Commerce SSE payment gateway",
66
"repository": {
@@ -51,9 +51,9 @@
5151
"ssl_port": "3001"
5252
},
5353
"dependencies": {
54-
"@isv-occ-payment/occ-sdk": "23.3.0",
55-
"@isv-occ-payment/payment-sdk": "23.3.0",
56-
"@isv-occ-payment/server-extension": "23.3.0",
54+
"@isv-occ-payment/occ-sdk": "24.1.0",
55+
"@isv-occ-payment/payment-sdk": "24.1.0",
56+
"@isv-occ-payment/server-extension": "24.1.0",
5757
"cybersource-rest-client": "0.0.50",
5858
"deepmerge": "^4.2.2",
5959
"express-validator": "7.0.1",

packages/payment-gateway/ext.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"extensionID": "",
33
"developerID": "999",
44
"createdBy": "ISV Plugins",
5-
"name": "payment-gateway-23.3.0",
6-
"version": 2330,
5+
"name": "payment-gateway-24.1.0",
6+
"version": 2410,
77
"timeCreated": "2023-11-24",
88
"description": "ISV Payment Gateway"
99
}

packages/payment-gateway/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/payment-gateway",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "ISV OCC Payment Gateway",
66
"repository": "",

packages/payment-sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/payment-sdk",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "Payment SDK",
66
"repository": {

packages/server-extension/config/app.local.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"report.daily.download.path": "",
1313
"crypto.service.key": "l8myMlkZiBX/kLbpDcn3Nw==",
1414
"partner.developerId": "999",
15-
"partner.solutionId": "1AP1ZRHP",
15+
"partner.solutionId": "EQU9OF9E",
1616
"logging.webhook.http": true,
1717
"logging.api.error": true,
1818
"logging.api.access": true

packages/server-extension/config/app.prod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"crypto.service.key": "l8myMlkZiBX/kLbpDcn3Nw==",
55
"feature.gatewaysettings.payload": "disabled",
66
"partner.developerId": "999",
7-
"partner.solutionId": "1AP1ZRHP",
7+
"partner.solutionId": "EQU9OF9E",
88
"logging.webhook.http": true,
99
"logging.api.error": true,
1010
"logging.api.access": true,

packages/server-extension/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/server-extension",
3-
"version": "23.3.0",
3+
"version": "24.1.0",
44
"private": true,
55
"description": "Payment Server Extension",
66
"repository": {
@@ -55,10 +55,10 @@
5555
"ssl_port": "3001"
5656
},
5757
"dependencies": {
58-
"@isv-occ-payment/occ-payment-factory": "23.3.0",
59-
"@isv-occ-payment/occ-sdk": "23.3.0",
60-
"@isv-occ-payment/payment-gateway": "23.3.0",
61-
"@isv-occ-payment/payment-sdk": "23.3.0",
58+
"@isv-occ-payment/occ-payment-factory": "24.1.0",
59+
"@isv-occ-payment/occ-sdk": "24.1.0",
60+
"@isv-occ-payment/payment-gateway": "24.1.0",
61+
"@isv-occ-payment/payment-sdk": "24.1.0",
6262
"cybersource-rest-client": "0.0.50",
6363
"deepmerge": "^4.2.2",
6464
"express-validator": "7.0.1",

0 commit comments

Comments
 (0)