Skip to content

Commit 65199cf

Browse files
m1awm1aw
authored
Removes deprecated request package from internal server (#2850)
* removes deprecated request package from internal server * remove unsuded code * fix remove route * fix order route
1 parent 03572cb commit 65199cf

16 files changed

+60
-88
lines changed

‎packages/server/api/details.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('/payments/details', { merchantAccount, ...request });
8-
9-
post(params, (err, response, body) => handleCallback({ err, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('/payments/details', { merchantAccount, ...request });
7+
handleCallback(response, res);
108
};

‎packages/server/api/donation.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('donations', { merchantAccount, shopperInteraction: 'ContAuth', ...request });
8-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('donations', { merchantAccount, shopperInteraction: 'ContAuth', ...request });
7+
handleCallback(response, res);
98
};

‎packages/server/api/donationCampaign.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('donationCampaigns', { merchantAccount, ...request });
8-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('donationCampaigns', { merchantAccount, ...request });
7+
handleCallback(response, res);
98
};

‎packages/server/api/mock/addressSearch.js

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
const { post } = require('request');
2-
const handleCallback = require('../../utils/handleCallback');
3-
const { MERCHANT_ACCOUNT: merchantAccount } = require('../../utils/config');
4-
51
module.exports = (res, request) => {
62
const MOCK_ADDRESS_ARRAY = [
73
{

‎packages/server/api/orders.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('orders', { merchantAccount, ...request });
8-
9-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('orders', { merchantAccount, ...request });
7+
handleCallback(response, res);
108
};

‎packages/server/api/ordersCancel.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('orders/cancel', { merchantAccount, ...request });
8-
9-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('orders/cancel', { merchantAccount, ...request });
7+
handleCallback(response, res);
108
};

‎packages/server/api/originKeys.js

-10
This file was deleted.

‎packages/server/api/paymentMethods.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('paymentMethods', { merchantAccount, ...request });
8-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('paymentMethods', { merchantAccount, ...request });
7+
handleCallback(response, res);
98
};

‎packages/server/api/paymentMethodsBalance.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('/paymentMethods/balance', { merchantAccount, ...request });
8-
9-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('/paymentMethods/balance', { merchantAccount, ...request });
7+
handleCallback(response, res);
108
};

‎packages/server/api/payments.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('/payments', { merchantAccount, ...request });
8-
post(params, (err, response, body) => handleCallback({ err, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('/payments', { merchantAccount, ...request });
7+
handleCallback(response, res);
98
};

‎packages/server/api/paypalUpdateOrder.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('paypal/updateOrder', { ...request });
8-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('paypal/updateOrder', { ...request });
7+
handleCallback(response, res);
98
};

‎packages/server/api/sessions.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const { post } = require('request');
2-
const getPostParameters = require('../utils/getPostParameters');
1+
const makePostRequest = require('../utils/makePostRequest');
32
const handleCallback = require('../utils/handleCallback');
43
const { MERCHANT_ACCOUNT: merchantAccount } = require('../utils/config');
54

6-
module.exports = (res, request) => {
7-
const params = getPostParameters('sessions', { merchantAccount, ...request });
8-
post(params, (error, response, body) => handleCallback({ error, response, body }, res));
5+
module.exports = async (res, request) => {
6+
const response = await makePostRequest('sessions', { merchantAccount, ...request });
7+
handleCallback(response, res);
98
};

‎packages/server/index.js

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ const express = require('express');
33
require('dotenv').config({ path: path.resolve('../../', '.env') });
44
const getPaymentMethods = require('./api/paymentMethods');
55
const getPaymentMethodsBalance = require('./api/paymentMethodsBalance');
6-
const getOriginKeys = require('./api/originKeys');
76
const makePayment = require('./api/payments');
87
const postDetails = require('./api/details');
98
const createOrder = require('./api/orders');
@@ -25,8 +24,6 @@ module.exports = (app = express(), options = {}) => {
2524
next();
2625
});
2726

28-
app.all('/originKeys', (req, res) => getOriginKeys(res, req));
29-
3027
app.all('/paypal/updateOrder', (req, res) => paypalUpdateOrder(res, req.body));
3128

3229
app.all('/paymentMethods', (req, res) => getPaymentMethods(res, req.body));

‎packages/server/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"devDependencies": {
2424
"cross-env": "^7.0.3",
2525
"dotenv": "16.4.4",
26-
"express": "^4.20.0",
27-
"request": "^2.81.0"
26+
"express": "^4.20.0"
2827
},
2928
"dependencies": {}
3029
}

‎packages/server/utils/handleCallback.js

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
module.exports = ({ error, response = {}, body }, res) => {
2-
if (error) {
3-
console.error(error);
4-
return res.send(error);
5-
}
1+
module.exports = async (response, res) => {
2+
try {
3+
if (!response.ok) {
4+
console.error(`Request to ${res.req.url} ended with status ${response.status} - ${response.statusText}`);
5+
return res.status(response.status).send({
6+
status: response.status,
7+
message: response.statusText
8+
});
9+
}
610

7-
if (response.statusCode && response.statusMessage) {
8-
console.log(`Request to ${res.req.url} ended with status ${response.statusCode} - ${response.statusMessage}`);
11+
const body = await response.json();
12+
res.send(body);
13+
} catch (error) {
14+
console.error(error);
15+
res.status(500).send({ error: 'Internal Server Error' });
916
}
10-
11-
res.send(body);
1217
};

‎packages/server/utils/getPostParameters.js ‎packages/server/utils/makePostRequest.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ const { CHECKOUT_API_KEY, CHECKOUT_URL } = require('./config');
33
module.exports = (endpoint, request) => {
44
const body = JSON.stringify(request);
55

6-
return {
6+
return fetch(`${CHECKOUT_URL}/${endpoint}`, {
7+
method: 'POST',
78
body,
8-
url: `${CHECKOUT_URL}/${endpoint}`,
99
headers: {
10-
'Access-Control-Allow-Origin': '*',
1110
'Content-Type': 'application/json',
12-
'Content-Length': Buffer.byteLength(body, 'utf8'),
13-
'X-Api-Key': CHECKOUT_API_KEY
11+
'Content-Length': Buffer.byteLength(body, 'utf8'), // Content length in bytes
12+
'X-Api-Key': CHECKOUT_API_KEY // API key added to headers
1413
}
15-
};
14+
});
1615
};

0 commit comments

Comments
 (0)