krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(amazon): add new env variable to specify environment

Browse Source
This commit is contained in:
Matteo Pagliazzi
2018-11-28 11:07:06 +01:00
parent 88a2f317d8
commit bf7fabb20a
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.json.example
View File

@@ -44,7 +44,8 @@
"SELLER_ID": "SELLER_ID", "SELLER_ID": "SELLER_ID",
"CLIENT_ID": "CLIENT_ID", "CLIENT_ID": "CLIENT_ID",
"MWS_KEY": "", "MWS_KEY": "",
"MWS_SECRET": "" "MWS_SECRET": "",
"MODE": "sandbox"
}, },
"FLAG_REPORT_EMAIL": "email@mod.com,email2@mod.com", "FLAG_REPORT_EMAIL": "email@mod.com,email2@mod.com",
"EMAIL_SERVER": { "EMAIL_SERVER": {

2
webpack/config/prod.env.js
View File

@@ -19,6 +19,7 @@ setupNconf(configFile);
const AMAZON_SELLER_ID = nconf.get('AMAZON_PAYMENTS:SELLER_ID') || nconf.get('AMAZON_PAYMENTS_SELLER_ID'); const AMAZON_SELLER_ID = nconf.get('AMAZON_PAYMENTS:SELLER_ID') || nconf.get('AMAZON_PAYMENTS_SELLER_ID');
const AMAZON_CLIENT_ID = nconf.get('AMAZON_PAYMENTS:CLIENT_ID') || nconf.get('AMAZON_PAYMENTS_CLIENT_ID'); const AMAZON_CLIENT_ID = nconf.get('AMAZON_PAYMENTS:CLIENT_ID') || nconf.get('AMAZON_PAYMENTS_CLIENT_ID');
const AMAZON_MODE = nconf.get('AMAZON_PAYMENTS:MODE') || nconf.get('AMAZON_PAYMENTS_MODE');
let env = { let env = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
@@ -26,6 +27,7 @@ let env = {
AMAZON_PAYMENTS: { AMAZON_PAYMENTS: {
SELLER_ID: `"${AMAZON_SELLER_ID}"`, SELLER_ID: `"${AMAZON_SELLER_ID}"`,
CLIENT_ID: `"${AMAZON_CLIENT_ID}"`, CLIENT_ID: `"${AMAZON_CLIENT_ID}"`,
MODE: `"${AMAZON_MODE}"`,
}, },
EMAILS: { EMAILS: {
COMMUNITY_MANAGER_EMAIL: `"${nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL')}"`, COMMUNITY_MANAGER_EMAIL: `"${nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL')}"`,

2
website/client/libs/payments.js
View File

@@ -20,7 +20,7 @@ export function setup () {
let firstScript = document.getElementsByTagName('script')[0]; let firstScript = document.getElementsByTagName('script')[0];
amazonScript.type = 'text/javascript'; amazonScript.type = 'text/javascript';
amazonScript.async = true; amazonScript.async = true;
amazonScript.src = `https://static-na.payments-amazon.com/OffAmazonPayments/us/${(NODE_ENV === 'production' ? '' : 'sandbox/')}js/Widgets.js`; amazonScript.src = `https://static-na.payments-amazon.com/OffAmazonPayments/us/${(AMAZON_PAYMENTS.MODE === 'sandbox' ? 'sandbox/' : '')}js/Widgets.js`;
firstScript.parentNode.insertBefore(amazonScript, firstScript); firstScript.parentNode.insertBefore(amazonScript, firstScript);
// Stripe // Stripe

4
website/server/libs/payments/amazon.js
View File

@@ -22,10 +22,10 @@ import { model as Coupon } from '../../models/coupon';
// TODO better handling of errors // TODO better handling of errors
const i18n = common.i18n; const i18n = common.i18n;
const IS_PROD = nconf.get('NODE_ENV') === 'production'; const IS_SANDBOX = nconf.get('AMAZON_PAYMENTS:MODE') === 'sandbox';
let amzPayment = amazonPayments.connect({ let amzPayment = amazonPayments.connect({
environment: amazonPayments.Environment[IS_PROD ? 'Production' : 'Sandbox'], environment: amazonPayments.Environment[IS_SANDBOX ? 'Sandbox' : 'Production'],
sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'),
mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'), mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'),
mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'), mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'),