Skip to content

Commit 9a6913a

Browse files
kswardsfkswardsf
committed
Merge branch 'develop'
2 parents 1ec02dc + b9df405 commit 9a6913a

File tree

66 files changed

+1698
-2457
lines changed

Some content is hidden

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

66 files changed

+1698
-2457
lines changed

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ documentation/
33
metadata/
44
cartridges/int_kount/cartridge/static/
55
cartridges/kount_sg_changes/
6+
coverage/

cartridges/int_kount/cartridge/scripts/assign/CheckKountStatus.js renamed to cartridges/int_kount/cartridge/scripts/assign/checkKountStatus.js

File renamed without changes.

cartridges/int_kount/cartridge/scripts/assign/PostRIS.js renamed to cartridges/int_kount/cartridge/scripts/assign/postRIS.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
// Kount
11-
var Kount = require('int_kount/cartridge/scripts/kount/LibKount');
11+
var Kount = require('*/cartridge/scripts/kount/libKount');
1212

1313
/**
1414
* @param {Object} args - pdict of the execution

cartridges/int_kount/cartridge/scripts/assign/PreRIS.js renamed to cartridges/int_kount/cartridge/scripts/assign/preRIS.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
// Kount
9-
var Kount = require('int_kount/cartridge/scripts/kount/LibKount');
9+
var Kount = require('*/cartridge/scripts/kount/libKount');
1010

1111
/**
1212
* @param {Object} args - pdict of the execution

‎cartridges/int_kount/cartridge/scripts/init/initKount.js‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var kountService = LocalServiceRegistry.createService('kount', {
2121
return argsArray.join('&');
2222
},
2323
parseResponse: function (svc, client) {
24-
var kount = require('*/cartridge/scripts/kount/LibKount');
24+
var kount = require('*/cartridge/scripts/kount/libKount');
2525
var result;
2626

2727
try {
@@ -33,6 +33,53 @@ var kountService = LocalServiceRegistry.createService('kount', {
3333
errorMessage: 'Kount call failed.'
3434
};
3535
}
36+
},
37+
filterLogMessage: function (msg) {
38+
var log = msg;
39+
log = log.replace(/"UAS": ".*?"/g, '"UAS": "*****"');
40+
log = log.replace(/"BROWSER": ".*?"/g, '"BROWSER": "*****"');
41+
log = log.replace(/"OS": ".*?"/g, '"OS": "*****"');
42+
log = log.replace(/"IP_IPAD": ".*?"/g, '"IP_IPAD": "*****"');
43+
log = log.replace(/"IP_LAT": ".*?"/g, '"IP_LAT": "*****"');
44+
log = log.replace(/"IP_LON": ".*?"/g, '"IP_LON": "*****"');
45+
log = log.replace(/"IP_COUNTRY": ".*?"/g, '"IP_COUNTRY": "*****"');
46+
log = log.replace(/"IP_REGION": ".*?"/g, '"IP_REGION": "*****"');
47+
log = log.replace(/"IP_CITY": ".*?"/g, '"IP_CITY": "*****"');
48+
log = log.replace(/"IP_ORG": ".*?"/g, '"IP_ORG": "*****"');
49+
log = log.replace(/EMAL=.*?\n/g, 'EMAL=*****\n');
50+
log = log.replace(/IPAD=.*?\n/g, 'IPAD=*****\n');
51+
log = log.replace(/PTOK=.*?\n/g, 'PTOK=*****\n');
52+
log = log.replace(/LAST4=.*?\n/g, 'LAST4=*****\n');
53+
log = log.replace(/B2A1=.*?\n/g, 'B2A1=*****\n');
54+
log = log.replace(/B2CC=.*?\n/g, 'B2CC=*****\n');
55+
log = log.replace(/B2CI=.*?\n/g, 'B2CI=*****\n');
56+
log = log.replace(/B2PC=.*?\n/g, 'B2PC=*****\n');
57+
log = log.replace(/B2PN=.*?\n/g, 'B2PN=*****\n');
58+
log = log.replace(/B2ST=.*?\n/g, 'B2ST=*****\n');
59+
log = log.replace(/NAME=.*?\n/g, 'NAME=*****\n');
60+
log = log.replace(/S2A1=.*?\n/g, 'S2A1=*****\n');
61+
log = log.replace(/S2CC=.*?\n/g, 'S2CC=*****\n');
62+
log = log.replace(/S2CI=.*?\n/g, 'S2CI=*****\n');
63+
log = log.replace(/S2EM=.*?\n/g, 'S2EM=*****\n');
64+
log = log.replace(/S2NM=.*?\n/g, 'S2NM=*****\n');
65+
log = log.replace(/S2PC=.*?\n/g, 'S2PC=*****\n');
66+
log = log.replace(/S2PN=.*?\n/g, 'S2PN=*****\n');
67+
log = log.replace(/S2ST=.*?\n/g, 'S2ST=*****\n');
68+
log = log.replace(/LAST4=\d{4}/g, 'LAST4=*****');
69+
return log;
70+
},
71+
getRequestLogMessage: function (req) {
72+
return req.split('&').join('\n');
73+
},
74+
getResponseLogMessage: function (res) {
75+
var log;
76+
try {
77+
var parsed = JSON.parse(res.text);
78+
log = JSON.stringify(parsed, null, 2);
79+
} catch (e) {
80+
log = res.text;
81+
}
82+
return log;
3683
}
3784
});
3885

‎cartridges/int_kount/cartridge/scripts/jobs/kountRetry.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ var logger = require('dw/system/Logger').getLogger('kount', '');
1717
* @returns {dw.system.Status} status object
1818
*/
1919
function execute(args) { // eslint-disable-line
20-
var RiskService = require('*/cartridge/scripts/kount/PostRiskInqueryService');
21-
var UpdateOrder = require('*/cartridge/scripts/kount/UpdateOrder');
22-
var kount = require('*/cartridge/scripts/kount/LibKount');
20+
var RiskService = require('*/cartridge/scripts/kount/postRiskInqueryService');
21+
var UpdateOrder = require('*/cartridge/scripts/kount/updateOrder');
22+
var kount = require('*/cartridge/scripts/kount/libKount');
2323
try {
2424
var maxOrderRetries = Site.current.getCustomPreferenceValue('kount_OrderMaxRetries');
2525
var queryStr = 'custom.kount_Status={0} AND exportStatus={1}';
@@ -96,7 +96,7 @@ function execute(args) { // eslint-disable-line
9696
var COHelpers = require('*/cartridge/scripts/checkout/checkoutHelpers');
9797
COHelpers.sendConfirmationEmail(order, request.locale.id); // eslint-disable-line
9898
} else {
99-
var controllersApp = kount.getCoreScript('app');
99+
var controllersApp = require('*/cartridge/scripts/app');
100100
var Resource = require('dw/web/Resource');
101101
var EmailModel = controllersApp.getModel('Email');
102102
EmailModel.sendMail({

cartridges/int_kount/cartridge/scripts/jobs/ProcessKountENSQueue.js renamed to cartridges/int_kount/cartridge/scripts/jobs/processKountENSQueue.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ function processENSRecord(EventHub, kount, record) {
4848
* @param {Object} args - Optional arguments to filter the search
4949
*/
5050
function execute() {
51-
var EventHub = require('*/cartridge/scripts/kount/KountEventHub');
52-
var kount = require('*/cartridge/scripts/kount/LibKount');
51+
var EventHub = require('*/cartridge/scripts/kount/kountEventHub');
52+
var kount = require('*/cartridge/scripts/kount/libKount');
5353
var results = CustomObjectMgr.queryCustomObjects('KountENSQueue', null, 'creationDate ASC', null);
5454
if (results.count > 0) {
5555
while (results.hasNext()) {

‎cartridges/int_kount/cartridge/scripts/kount/KountUtils.ds‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)