Merge branch 'develop' into phillip/autocomplete-username

config.json.example

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

test/api/unit/libs/password.test.js

@@ -245,7 +245,9 @@ describe('Password Utilities', () => {
 
     it('returns false if the user has no local auth', async () => {
       let user = await generateUser({
-        auth: 'not an object with valid fields',
+        auth: {
+          facebook: {},
+        },
       });
       let res = await validatePasswordResetCodeAndFindUser(encrypt(JSON.stringify({
         userId: user._id,

test/api/v3/integration/user/GET-user_anonymized.test.js

@@ -18,7 +18,12 @@ describe('GET /user/anonymized', () => {
       'profile.name': 'profile',
       'purchased.plan': 'purchased plan',
       contributor: 'contributor',
-      invitations: 'invitations',
+      invitations: {
+        guilds: ['guild1', 'guild2'],
+        party: {
+          _id: 'partyid',
+        },
+      },
       'items.special.nyeReceived': 'some',
       'items.special.valentineReceived': 'some',
       webhooks: [{url: 'https://somurl.com'}],

test/api/v3/integration/user/auth/POST-auth_reset-password-set-new-one.js

@@ -94,9 +94,6 @@ describe('POST /user/auth/reset-password-set-new-one', () => {
       userId: user._id,
       expiresAt: moment().add({days: 1}),
     }));
-    await user.update({
-      auth: 'not an object with valid fields',
-    });
 
     await expect(api.post(`${endpoint}`, {
       code,

webpack/config/prod.env.js

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

website/client/libs/payments.js

@@ -20,7 +20,7 @@ export function setup () {
   let firstScript = document.getElementsByTagName('script')[0];
   amazonScript.type = 'text/javascript';
   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);
 
   // Stripe

website/server/libs/payments/amazon.js

@@ -22,10 +22,10 @@ import { model as Coupon } from '../../models/coupon';
 // TODO better handling of errors
 
 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({
-  environment: amazonPayments.Environment[IS_PROD ? 'Production' : 'Sandbox'],
+  environment: amazonPayments.Environment[IS_SANDBOX ? 'Sandbox' : 'Production'],
   sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'),
   mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'),
   mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'),