Merge pull request #14695 from mozilla/fxa-6543-auth-invoice-preview

fix(payments): only checkIpOnly if no credentials
This commit is contained in:
Reino Muhl 2022-12-28 14:20:20 -05:00 коммит произвёл GitHub
Родитель 4a86ce7a11 220b6f77d6
Коммит abfd9790ac
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 8 добавлений и 4 удалений

Просмотреть файл

@ -415,7 +415,6 @@ export class StripeHandler {
request: AuthRequest request: AuthRequest
): Promise<invoiceDTO.firstInvoicePreviewSchema> { ): Promise<invoiceDTO.firstInvoicePreviewSchema> {
this.log.begin('subscriptions.previewInvoice', request); this.log.begin('subscriptions.previewInvoice', request);
await this.customs.checkIpOnly(request, 'previewInvoice');
const { promotionCode, priceId } = request.payload as Record< const { promotionCode, priceId } = request.payload as Record<
string, string,
@ -431,6 +430,8 @@ export class StripeHandler {
} catch (e: any) { } catch (e: any) {
this.log.error('previewInvoice.fetchCustomer', { error: e, uid }); this.log.error('previewInvoice.fetchCustomer', { error: e, uid });
} }
} else {
await this.customs.checkIpOnly(request, 'previewInvoice');
} }
const country = request.app.geo.location?.country || 'US'; const country = request.app.geo.location?.country || 'US';

Просмотреть файл

@ -665,8 +665,9 @@ describe('DirectStripeRoutes', () => {
VALID_REQUEST VALID_REQUEST
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(
directStripeRoutesInstance.customs.checkIpOnly, directStripeRoutesInstance.customs.check,
VALID_REQUEST, VALID_REQUEST,
TEST_EMAIL,
'previewInvoice' 'previewInvoice'
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(
@ -707,8 +708,9 @@ describe('DirectStripeRoutes', () => {
VALID_REQUEST VALID_REQUEST
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(
directStripeRoutesInstance.customs.checkIpOnly, directStripeRoutesInstance.customs.check,
VALID_REQUEST, VALID_REQUEST,
TEST_EMAIL,
'previewInvoice' 'previewInvoice'
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(
@ -747,8 +749,9 @@ describe('DirectStripeRoutes', () => {
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(
directStripeRoutesInstance.customs.checkIpOnly, directStripeRoutesInstance.customs.check,
VALID_REQUEST, VALID_REQUEST,
TEST_EMAIL,
'previewInvoice' 'previewInvoice'
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(