krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Server Deps (#12328)

Browse Source 
* upgrade uuid

* upgrade gulp-imagemin

* upgrade bcrypt

* upgrade validator.js

* fix uuid import

* upgrade got

* upgrade sinon

* upgrade passport-google-oauth2

* fix unit test
This commit is contained in:
Matteo Pagliazzi
2020-06-22 11:51:52 +02:00
committed by GitHub
parent fa7448c41d
commit ba16fa6854
7 changed files with 762 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ import amazonPayments from 'amazon-payments';
import nconf from 'nconf';
import moment from 'moment';
import cc from 'coupon-code';
import uuid from 'uuid';
import util from 'util';
import common from '../../../common';
@@ -356,7 +355,7 @@ api.chargeForAdditionalGroupMember = async function chargeForAdditionalGroupMemb
return this.authorizeOnBillingAgreement({
AmazonBillingAgreementId: group.purchased.plan.customerId,
AuthorizationReferenceId: uuid.v4().substring(0, 32),
AuthorizationReferenceId: common.uuid().substring(0, 32),
AuthorizationAmount: {
CurrencyCode: this.constants.CURRENCY_CODE,
Amount: priceForNewMember,
@@ -366,7 +365,7 @@ api.chargeForAdditionalGroupMember = async function chargeForAdditionalGroupMemb
CaptureNow: true,
SellerNote: this.constants.SELLER_NOTE_GROUP_NEW_MEMBER,
SellerOrderAttributes: {
SellerOrderId: uuid.v4(),
SellerOrderId: common.uuid(),
StoreName: this.constants.STORE_NAME,
},
});