Skip to content

Commit 9df5c17

Browse files
cybersource-tpicybersource-tpi
authored
Merge pull request #13 from cybersource-tpi/develop
Merging the latest develop branch to the main branch
2 parents 2ea65fa + 039585c commit 9df5c17

File tree

31 files changed

+649
-552
lines changed

31 files changed

+649
-552
lines changed

‎documentation/Release Notes v23.1.0.docx

19.3 KB
Binary file not shown.

‎documentation/Release Notes v23.1.1.docx

26 KB
Binary file not shown.

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"npmClient": "yarn",
33
"useWorkspaces": true,
4-
"version": "23.1.0",
4+
"version": "23.2.0",
55
"packages": ["packages/*"]
66
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "isv-occ-payment",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"description": "ISV Oracle Commerce Cloud Payment Plugin",
55
"main": "index.js",
66
"repository": "[email protected]:cybersource-tpi/cybersource-plugins-oraclecxcommerce.git",

‎packages/applepay-payment-service/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/applepay-payment-service",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"description": "ApplePay SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,10 +9,10 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.1.0",
13-
"@isv-occ-payment/occ-sdk": "23.1.0",
14-
"@isv-occ-payment/payment-sdk": "23.1.0",
15-
"@isv-occ-payment/server-extension": "23.1.0",
12+
"@isv-occ-payment/occ-payment-service": "23.2.0",
13+
"@isv-occ-payment/occ-sdk": "23.2.0",
14+
"@isv-occ-payment/payment-sdk": "23.2.0",
15+
"@isv-occ-payment/server-extension": "23.2.0",
1616
"cybersource-rest-client": "0.0.43"
1717
},
1818
"devDependencies": {

‎packages/card-payment-service/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/card-payment-service",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"description": "Card SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,10 +9,10 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.1.0",
13-
"@isv-occ-payment/occ-sdk": "23.1.0",
14-
"@isv-occ-payment/payment-sdk": "23.1.0",
15-
"@isv-occ-payment/server-extension": "23.1.0",
12+
"@isv-occ-payment/occ-payment-service": "23.2.0",
13+
"@isv-occ-payment/occ-sdk": "23.2.0",
14+
"@isv-occ-payment/payment-sdk": "23.2.0",
15+
"@isv-occ-payment/server-extension": "23.2.0",
1616
"cybersource-rest-client": "0.0.43"
1717
},
1818
"devDependencies": {

‎packages/generic-payment-service/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/generic-payment-service",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"description": "Generic SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,10 +9,10 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.1.0",
13-
"@isv-occ-payment/occ-sdk": "23.1.0",
14-
"@isv-occ-payment/payment-sdk": "23.1.0",
15-
"@isv-occ-payment/server-extension": "23.1.0",
12+
"@isv-occ-payment/occ-payment-service": "23.2.0",
13+
"@isv-occ-payment/occ-sdk": "23.2.0",
14+
"@isv-occ-payment/payment-sdk": "23.2.0",
15+
"@isv-occ-payment/server-extension": "23.2.0",
1616
"cybersource-rest-client": "0.0.43"
1717
},
1818
"devDependencies": {

‎packages/googlepay-payment-service/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/googlepay-payment-service",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"description": "GooglePay SSE Payment Service",
55
"repository": {
66
"type": "git",
@@ -9,10 +9,10 @@
99
"author": "ISV Payments",
1010
"main": "cjs/index.js",
1111
"dependencies": {
12-
"@isv-occ-payment/occ-payment-service": "23.1.0",
13-
"@isv-occ-payment/occ-sdk": "23.1.0",
14-
"@isv-occ-payment/payment-sdk": "23.1.0",
15-
"@isv-occ-payment/server-extension": "23.1.0",
12+
"@isv-occ-payment/occ-payment-service": "23.2.0",
13+
"@isv-occ-payment/occ-sdk": "23.2.0",
14+
"@isv-occ-payment/payment-sdk": "23.2.0",
15+
"@isv-occ-payment/server-extension": "23.2.0",
1616
"cybersource-rest-client": "0.0.43"
1717
},
1818
"devDependencies": {

‎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.1.0",
3+
"version": "23.2.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.1.0",
25+
"@isv-occ-payment/payment-gateway": "23.2.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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-payment-factory",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"private": true,
55
"description": "Oracle Commerce payment service factory",
66
"repository": {

‎packages/occ-payment-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-payment-service",
3-
"version": "23.1.0",
3+
"version": "23.2.0",
44
"description": "Oracle Commerce payment service",
55
"repository": {
66
"type": "git",

‎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.1.0",
3+
"version": "23.2.0",
44
"private": true,
55
"description": "OCC SDK",
66
"repository": {

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

+18-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ declare interface GooglePayConfig {
4545

4646
declare interface ApplePayConfig {
4747
applePaySdkUrl: string;
48-
applePayDisplayName:string;
48+
applePayDisplayName: string;
4949
applePaySupportedNetworks: string;
5050
}
5151

@@ -80,6 +80,7 @@ declare namespace OCC {
8080
payerAuthOrgUnitId: string;
8181
payerAuthEnabled: boolean;
8282
paymentOptions: string;
83+
paymentMethodTypes: string;
8384
googlePaySdkUrl: string;
8485
googlePayEnvironment: string;
8586
googlePayGateway: string;
@@ -113,7 +114,7 @@ declare namespace OCC {
113114
};
114115
}
115116

116-
export interface PayerAuthSetupRequest {
117+
export interface PayerAuthSetupRequest {
117118
orderId:string;
118119
transientToken: string;
119120
savedCardId?: string;
@@ -151,6 +152,21 @@ declare namespace OCC {
151152
country: string;
152153
}
153154

155+
export type genericItems = Array<item>;
156+
157+
export interface item {
158+
id: String,
159+
rawTotalPrice: Number,
160+
price: Number,
161+
productId: String,
162+
catRefId: String,
163+
unitPrice: String,
164+
quantity: Number,
165+
displayName: String,
166+
description: String,
167+
options: []
168+
}
169+
154170
export interface ShippingAddress {
155171
lastName: string;
156172
postalCode: string;

‎packages/occ-sse-gateway/package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/occ-sse-gateway",
3-
"version": "23.1.0",
3+
"version": "23.2.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.1.0",
55-
"@isv-occ-payment/payment-sdk": "23.1.0",
56-
"@isv-occ-payment/server-extension": "23.1.0",
54+
"@isv-occ-payment/occ-sdk": "23.2.0",
55+
"@isv-occ-payment/payment-sdk": "23.2.0",
56+
"@isv-occ-payment/server-extension": "23.2.0",
5757
"cybersource-rest-client": "0.0.43",
5858
"deepmerge": "^4.2.2",
5959
"express-validator": "6.14.2",
@@ -83,7 +83,9 @@
8383
"typescript-transform-paths": "^3.4.4",
8484
"winston": "latest"
8585
},
86-
"authenticatedUrls": [],
86+
"authenticatedUrls": [
87+
88+
],
8789
"publicUrls": [
8890
"/ccstorex/custom/isv-payment/v2/paymentMethods",
8991
"/ccstorex/custom/isv-payment/v2/keys",
@@ -92,13 +94,13 @@
9294
"/ccstorex/custom/isv-payment/v2/applepay/validate",
9395
"/ccstorex/custom/isv-payment/v2/report/daily",
9496
"/ccstorex/custom/isv-payment/v2/report/onDemand",
95-
"/ccstorex/custom/isv-payment/v2/capture",
96-
"/ccstorex/custom/isv-payment/v2/refund",
9797
"/ccstorex/custom/isv-payment/v2/payerAuth/setup",
98-
"/ccstorex/custom/isv-payment/v2/payerAuthReturnUrl"
98+
"/ccstorex/custom/isv-payment/v2/payerAuthReturnUrl",
99+
"/ccstorex/custom/isv-payment/v2/capture",
100+
"/ccstorex/custom/isv-payment/v2/refund"
99101
],
100102
"whitelistUrls": [
101103
"https://apitest.cybersource.com",
102104
"https://api.cybersource.com"
103105
]
104-
}
106+
}

‎packages/payment-gateway/ext.json

+3-3
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.1.0",
6-
"version": 2310,
7-
"timeCreated": "2023-06-14",
5+
"name": "payment-gateway-23.2.0",
6+
"version": 2320,
7+
"timeCreated": "2023-06-28",
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.1.0",
3+
"version": "23.2.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.1.0",
3+
"version": "23.2.0",
44
"private": true,
55
"description": "Payment SDK",
66
"repository": {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"logging.webhook.http": true,
99
"logging.api.error": true,
1010
"logging.api.access": true,
11-
"payments.secret.key": "3ftGntd9GSnlTJ+pWddY7xBgL9tx3VlwqJjW8h79nvD8qJsJ0gUBv32Pc2kYbFLDvfSwPzEOA3NE2NHyRbv1iw=="
11+
"payments.secret.key": "eAGpAMAGj2wmssjvREMe1a/LGXvB/VC+B1ZV+QMc+NA4xTgpqMw4AjQRSQhEkgxEDuHgWY6nvBqx7cAaR+bPaA=="
1212
}

‎packages/server-extension/package.json

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@isv-occ-payment/server-extension",
3-
"version": "23.1.0",
3+
"version": "23.2.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.1.0",
59-
"@isv-occ-payment/occ-sdk": "23.1.0",
60-
"@isv-occ-payment/payment-gateway": "23.1.0",
61-
"@isv-occ-payment/payment-sdk": "23.1.0",
58+
"@isv-occ-payment/occ-payment-factory": "23.2.0",
59+
"@isv-occ-payment/occ-sdk": "23.2.0",
60+
"@isv-occ-payment/payment-gateway": "23.2.0",
61+
"@isv-occ-payment/payment-sdk": "23.2.0",
6262
"cybersource-rest-client": "0.0.43",
6363
"deepmerge": "^4.2.2",
6464
"express-validator": "6.14.2",
@@ -89,21 +89,23 @@
8989
"typescript-transform-paths": "^3.4.4",
9090
"winston": "latest"
9191
},
92-
"authenticatedUrls": [],
92+
"authenticatedUrls": [
93+
94+
],
9395
"publicUrls": [
9496
"/ccstorex/custom/isv-payment/v2/keys",
9597
"/ccstorex/custom/isv-payment/v2/payments",
9698
"/ccstorex/custom/isv-payment/v2/paymentMethods",
9799
"/ccstorex/custom/isv-payment/v2/applepay/validate",
98100
"/ccstorex/custom/isv-payment/v2/report/daily",
99101
"/ccstorex/custom/isv-payment/v2/report/onDemand",
100-
"/ccstorex/custom/isv-payment/v2/capture",
101-
"/ccstorex/custom/isv-payment/v2/refund",
102102
"/ccstorex/custom/isv-payment/v2/payerAuth/setup",
103-
"/ccstorex/custom/isv-payment/v2/payerAuthReturnUrl"
103+
"/ccstorex/custom/isv-payment/v2/payerAuthReturnUrl",
104+
"/ccstorex/custom/isv-payment/v2/capture",
105+
"/ccstorex/custom/isv-payment/v2/refund"
104106
],
105107
"whitelistUrls": [
106108
"https://apitest.cybersource.com",
107109
"https://api.cybersource.com"
108110
]
109-
}
111+
}

‎packages/server-extension/src/controllers/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ router.use('/v2/capture', paymentCapture);
2020
router.use('/v2/refund', paymentRefund);
2121
router.use('/v2/report', report);
2222

23-
router.post('/v2/payerAuthReturnUrl',(req,res)=>{
23+
router.post('/v2/payerAuthReturnUrl',(req: Request,res: Response)=>{
2424
const transactionId = JSON.stringify(req.body?.TransactionId);
2525
res.send(`<script>
2626
window.parent.postMessage({

‎packages/server-extension/src/services/payments/applePayService.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import request from 'superagent';
66
import httpProxy from 'superagent-proxy';
77

88

9+
let CERT: string | null = null;
10+
let KEY: string | null = null;
11+
912
const CERT_PATH = path.join(__dirname, '../../../certs/applePayIdentityCert.pem');
10-
const CERT = fs.readFileSync(CERT_PATH, 'utf8');
1113
const KEY_PATH = path.join(__dirname, '../../../certs/applePayIdentityKey.key');
12-
const KEY = fs.readFileSync(KEY_PATH, 'utf8');
1314

1415
httpProxy(request);
1516

@@ -25,6 +26,13 @@ export default async function createSession(
2526
): Promise<string> {
2627
const settings = requestContext.gatewaySettings;
2728

29+
if (!CERT) {
30+
CERT = fs.readFileSync(CERT_PATH, 'utf8');
31+
}
32+
if (!KEY) {
33+
KEY = fs.readFileSync(KEY_PATH, 'utf8');
34+
}
35+
2836
const validationResult = await createRequest(validationUrl)
2937
.set('Content-Type', 'application/json')
3038
.send({

‎packages/server-extension/src/services/payments/converters/response/common/genericCardPayment.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default function convert(context: PaymentContext): OCC.GenericCardWebhook
2020
const paymentResponse = <DeepRequired<PspResponse>>context.data.response;
2121
const timestamp = new Date().getTime().toString();
2222
const pspResponseType = pspResponseTypeMappings[webhookRequest.transactionType];
23-
const { processorInformation } = <DeepRequired<PtsV2PaymentsPost201Response>>paymentResponse;
23+
const { processorInformation, errorInformation } = <DeepRequired<PtsV2PaymentsPost201Response>>paymentResponse;
2424

2525
return {
2626
orderId: webhookRequest.orderId,
@@ -49,6 +49,7 @@ export default function convert(context: PaymentContext): OCC.GenericCardWebhook
4949
authAvsCode: processorInformation?.avs?.code,
5050
authCvResult: processorInformation?.cardVerification?.resultCode,
5151
authTime: paymentResponse.submitTimeUtc,
52+
dmMsg: errorInformation?.message,
5253
...addCustomProperties(webhookRequest)
5354
}
5455
}

0 commit comments

Comments
 (0)