gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(env): make PayPal env config dynamic

Browse Source
This commit is contained in:
Mrugesh Mohapatra
2020-03-16 14:32:35 +05:30
parent 6c6eadfbe4
commit f9277b4fec
7 changed files with 45 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
api-server/server/boot/donate.js
View File

@ -12,18 +12,12 @@ import {
import {
durationKeysConfig,
donationOneTimeConfig,
donationSubscriptionConfig,
paypalConfig
donationSubscriptionConfig
} from '../../../config/donation-settings';
import keys from '../../../config/secrets';
const log = debug('fcc:boot:donate');
const paypalWebhookId =
process.env.FREECODECAMP_NODE_ENV === 'production'
? paypalConfig.production.webhookId
: paypalConfig.development.webhookId;
export default function donateBoot(app, done) {
let stripe = false;
const api = app.loopback.Router();
@ -255,6 +249,7 @@ export default function donateBoot(app, done) {
.send({ error: 'Donation failed due to a server error.' })
);
}
function addDonation(req, res) {
const { user, body } = req;
@ -284,7 +279,7 @@ export default function donateBoot(app, done) {
return Promise.resolve(req)
.then(verifyWebHookType)
.then(getAsyncPaypalToken)
.then(token => verifyWebHook(headers, body, token, paypalWebhookId))
.then(token => verifyWebHook(headers, body, token, keys.paypal.webhookId))
.then(hookBody => updateUser(hookBody, app))
.then(() => res.status(200).json({ message: 'received hook' }))
.catch(err => {
@ -310,37 +305,21 @@ export default function donateBoot(app, done) {
!hmacKey || hmacKey === 'secret_key_from_servicebot_dashboard';
const paypalInvalid = paypalPublicInvalid || paypalSecretInvalid;
const stripeInvalid = stripeSecretInvalid || stripPublicInvalid;
if (stripeInvalid) {
if (stripeInvalid || paypalInvalid || hmacKeyInvalid) {
if (process.env.FREECODECAMP_NODE_ENV === 'production') {
throw new Error('Stripe API keys are required to boot the server!');
throw new Error('Donation API keys are required to boot the server!');
}
console.info('No Stripe API keys were found, moving on...');
log('Donation disabled in development unless ALL test keys are provided');
done();
} else {
api.post('/charge-stripe', createStripeDonation);
api.post('/create-hmac-hash', createHmacHash);
}
if (paypalInvalid) {
if (process.env.FREECODECAMP_NODE_ENV === 'production') {
throw new Error('PayPal API keys are required to boot the server!');
}
console.info('No PayPal API keys were found, moving on...');
} else {
api.post('/update-paypal', updatePaypal);
api.post('/add-donation', addDonation);
}
if (hmacKeyInvalid) {
if (process.env.FREECODECAMP_NODE_ENV === 'production') {
throw new Error('Servicebot HMAC key is required to boot the server!');
}
console.info('No servicebot HMAC key was found, moving on...');
}
donateRouter.use('/donate', api);
app.use(donateRouter);
app.use('/internal', donateRouter);
if (stripeInvalid) {
done();
} else {
api.post('/update-paypal', updatePaypal);
donateRouter.use('/donate', api);
app.use(donateRouter);
app.use('/internal', donateRouter);
connectToStripe().then(done);
}
}

14
api-server/server/utils/donation.js
View File

@ -5,14 +5,14 @@ import keys from '../../../config/secrets';
const log = debug('fcc:boot:donate');
const sandBoxSubdomain =
process.env.FREECODECAMP_NODE_ENV === 'production' ? '' : 'sandbox.';
const verificationUrl = `https://api.${sandBoxSubdomain}paypal.com/v1/notifications/verify-webhook-signature`;
const tokenUrl = `https://api.${sandBoxSubdomain}paypal.com/v1/oauth2/token`;
const paypalverifyWebhookURL =
keys.paypal.verifyWebhookURL ||
`https://api.sandbox.paypal.com/v1/notifications/verify-webhook-signature`;
const paypalTokenURL =
keys.paypal.tokenUrl || `https://api.sandbox.paypal.com/v1/oauth2/token`;
export async function getAsyncPaypalToken() {
const res = await axios.post(tokenUrl, null, {
const res = await axios.post(paypalTokenURL, null, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
@ -48,7 +48,7 @@ export async function verifyWebHook(headers, body, token, webhookId) {
webhook_event: webhookEventBody
};
const response = await axios.post(verificationUrl, payload, {
const response = await axios.post(paypalverifyWebhookURL, payload, {
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${token}`

7
api-server/server/utils/donation-uttils.test.js → api-server/server/utils/donation.test.js
View File

@ -22,11 +22,8 @@ import {
jest.mock('axios');
const sandBoxSubdomain =
process.env.FREECODECAMP_NODE_ENV === 'production' ? '' : 'sandbox.';
const verificationUrl = `https://api.${sandBoxSubdomain}paypal.com/v1/notifications/verify-webhook-signature`;
const tokenUrl = `https://api.${sandBoxSubdomain}paypal.com/v1/oauth2/token`;
const verificationUrl = `https://api.sandbox.paypal.com/v1/notifications/verify-webhook-signature`;
const tokenUrl = `https://api.sandbox.paypal.com/v1/oauth2/token`;
const {
body: activationHookBody,
headers: activationHookHeaders