Skip to content

Commit bb52af3

Browse files
refactor(auth): move google-play and apple-app-store dirs to lib/payments/iap
Also: * move lib/payments/google-play/types/firestore.ts to lib/payments/iap/types, since the types are shared with apple-app-store. * move test/local/payments/google-play to test/local/payments/iap/google-play
1 parent dfb406c commit bb52af3

40 files changed

+59
-54
lines changed

packages/fxa-auth-server/bin/key_server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const jwtool = require('fxa-jwtool');
99
const { StatsD } = require('hot-shots');
1010
const { Container } = require('typedi');
1111
const { StripeHelper } = require('../lib/payments/stripe');
12-
const { PlayBilling } = require('../lib/payments/google-play');
12+
const { PlayBilling } = require('../lib/payments/iap/google-play');
1313
const { CurrencyHelper } = require('../lib/payments/currencies');
1414
const {
1515
AuthLogger,

packages/fxa-auth-server/lib/payments/capability.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { commaSeparatedListToArray } from './utils';
1111
import error from '../error';
1212
import { authEvents } from '../events';
1313
import { AuthLogger, AuthRequest, ProfileClient } from '../types';
14-
import { PlayBilling } from './google-play/play-billing';
15-
import { SubscriptionPurchase } from './google-play/subscription-purchase';
16-
import { PurchaseQueryError } from './google-play/types';
14+
import { PlayBilling } from './iap/google-play/play-billing';
15+
import { SubscriptionPurchase } from './iap/google-play/subscription-purchase';
16+
import { PurchaseQueryError } from './iap/google-play/types';
1717
import { StripeHelper } from './stripe';
1818

1919
function hex(blob: Buffer | string): string {

packages/fxa-auth-server/lib/payments/apple-app-store/apple-iap.ts packages/fxa-auth-server/lib/payments/iap/apple-app-store/apple-iap.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import { AppStoreServerAPI, Environment } from 'app-store-server-api';
66
import { Container } from 'typedi';
77
import { TypedCollectionReference } from 'typesafe-node-firestore';
88

9-
import { AppConfig, AuthFirestore, AuthLogger } from '../../types';
10-
// TODO: promote this to a shared dir
11-
import { IapConfig } from '../google-play/types';
9+
import { AppConfig, AuthFirestore, AuthLogger } from '../../../types';
10+
import { IapConfig } from '../types';
1211
import { PurchaseManager } from './purchase-manager';
1312

1413
export class AppleIAP {

packages/fxa-auth-server/lib/payments/google-play/play-billing.ts packages/fxa-auth-server/lib/payments/iap/google-play/play-billing.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { Auth, google } from 'googleapis';
66
import { Container } from 'typedi';
77
import { TypedCollectionReference } from 'typesafe-node-firestore';
88

9-
import { AppConfig, AuthFirestore, AuthLogger } from '../../types';
9+
import { AppConfig, AuthFirestore, AuthLogger } from '../../../types';
1010
import { PurchaseManager } from './purchase-manager';
11-
import { IapConfig } from './types';
11+
import { IapConfig } from '../types';
1212
import { UserManager } from './user-manager';
1313

1414
export class PlayBilling {

packages/fxa-auth-server/lib/payments/google-play/purchase-manager.ts packages/fxa-auth-server/lib/payments/iap/google-play/purchase-manager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { CollectionReference } from '@google-cloud/firestore';
2020
import { androidpublisher_v3 } from 'googleapis';
2121
import Container from 'typedi';
2222

23-
import { AuthLogger } from '../../types';
23+
import { AuthLogger } from '../../../types';
2424
import {
2525
mergePurchaseWithFirestorePurchaseRecord,
2626
SubscriptionPurchase,

packages/fxa-auth-server/lib/payments/google-play/subscriptions.ts packages/fxa-auth-server/lib/payments/iap/google-play/subscriptions.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {
88
} from 'fxa-shared/subscriptions/types';
99
import Container from 'typedi';
1010

11-
import { internalValidationError } from '../../../lib/error';
12-
import { AppConfig } from '../../types';
13-
import { StripeHelper } from '../stripe';
11+
import { internalValidationError } from '../../../../lib/error';
12+
import { AppConfig } from '../../../types';
13+
import { StripeHelper } from '../../stripe';
1414
import { PlayBilling } from './play-billing';
1515
import { SubscriptionPurchase } from './subscription-purchase';
1616

packages/fxa-auth-server/lib/payments/google-play/types/index.ts packages/fxa-auth-server/lib/payments/iap/google-play/types/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44
export { PurchaseQueryError, PurchaseUpdateError } from './errors';
5-
export { IapConfig } from './firestore';
65
export {
76
DeveloperNotification,
87
NotificationType,

packages/fxa-auth-server/lib/payments/google-play/user-manager.ts packages/fxa-auth-server/lib/payments/iap/google-play/user-manager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import { CollectionReference } from '@google-cloud/firestore';
2020
import Container from 'typedi';
2121

22-
import { AuthLogger } from '../../types';
22+
import { AuthLogger } from '../../../types';
2323
import { PurchaseManager } from './purchase-manager';
2424
import {
2525
GOOGLE_PLAY_FORM_OF_PAYMENT,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/* This Source Code Form is subject to the terms of the Mozilla Public
2+
* License, v. 2.0. If a copy of the MPL was not distributed with this
3+
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4+
5+
export { IapConfig } from './firestore';

packages/fxa-auth-server/lib/payments/stripe.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import {
5858
import { AppConfig, AuthFirestore, AuthLogger } from '../types';
5959
import { PaymentConfigManager } from './configuration/manager';
6060
import { CurrencyHelper } from './currencies';
61-
import { SubscriptionPurchase } from './google-play/subscription-purchase';
61+
import { SubscriptionPurchase } from './iap/google-play/subscription-purchase';
6262
import { FirestoreStripeError, StripeFirestore } from './stripe-firestore';
6363

6464
// @ts-ignore

packages/fxa-auth-server/lib/routes/account.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { getClientById } from '../oauth/client';
2424
import { generateAccessToken } from '../oauth/grant';
2525
import jwt from '../oauth/jwt';
2626
import { CapabilityService } from '../payments/capability';
27-
import { PlaySubscriptions } from '../payments/google-play/subscriptions';
27+
import { PlaySubscriptions } from '../payments/iap/google-play/subscriptions';
2828
import { PayPalHelper } from '../payments/paypal/helper';
2929
import { StripeHelper } from '../payments/stripe';
3030
import { AuthLogger, AuthRequest } from '../types';

packages/fxa-auth-server/lib/routes/subscriptions/google.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { Container } from 'typedi';
88

99
import error from '../../error';
1010
import { CapabilityService } from '../../payments/capability';
11-
import { PlayBilling } from '../../payments/google-play/play-billing';
12-
import { PurchaseUpdateError } from '../../payments/google-play/types/errors';
13-
import { SkuType } from '../../payments/google-play/types/purchases';
11+
import { PlayBilling } from '../../payments/iap/google-play/play-billing';
12+
import { PurchaseUpdateError } from '../../payments/iap/google-play/types/errors';
13+
import { SkuType } from '../../payments/iap/google-play/types/purchases';
1414
import { AuthLogger, AuthRequest } from '../../types';
1515
import { handleAuthScoped } from './utils';
1616

packages/fxa-auth-server/lib/routes/subscriptions/mozilla.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { ServerRoute } from '@hapi/hapi';
55
import { MozillaSubscription } from 'fxa-shared/subscriptions/types';
66
import { Container } from 'typedi';
7-
import { PlaySubscriptions } from '../../../lib/payments/google-play/subscriptions';
7+
import { PlaySubscriptions } from '../../../lib/payments/iap/google-play/subscriptions';
88
import error from '../../error';
99
import { PaymentBillingDetails, StripeHelper } from '../../payments/stripe';
1010
import { AuthLogger, AuthRequest } from '../../types';

packages/fxa-auth-server/lib/routes/subscriptions/play-pubsub.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { Container } from 'typedi';
77

88
import error from '../../error';
99
import { CapabilityService } from '../../payments/capability';
10-
import { PlayBilling } from '../../payments/google-play/play-billing';
11-
import { DeveloperNotification } from '../../payments/google-play/types';
10+
import { PlayBilling } from '../../payments/iap/google-play/play-billing';
11+
import { DeveloperNotification } from '../../payments/iap/google-play/types';
1212
import { reportSentryError } from '../../sentry';
1313
import { AuthLogger, AuthRequest } from '../../types';
1414

packages/fxa-auth-server/lib/routes/support-panel.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import isA from '@hapi/joi';
77
import { MozillaSubscriptionTypes } from 'fxa-shared/subscriptions/types';
88
import { Container } from 'typedi';
99
import { ConfigType } from '../../config';
10-
import { PlaySubscriptions } from '../../lib/payments/google-play/subscriptions';
10+
import { PlaySubscriptions } from '../../lib/payments/iap/google-play/subscriptions';
1111
import { StripeHelper } from '../payments/stripe';
1212
import { AuthLogger, AuthRequest } from '../types';
1313
import validators from './validators';

packages/fxa-auth-server/test/local/payments/capability.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ const { Container } = require('typedi');
1111
const { mockLog } = require('../../mocks');
1212
const { AuthLogger } = require('../../../lib/types');
1313
const { StripeHelper } = require('../../../lib/payments/stripe');
14-
const { PlayBilling } = require('../../../lib/payments/google-play');
14+
const { PlayBilling } = require('../../../lib/payments/iap/google-play');
1515

1616
const subscriptionCreated =
1717
require('./fixtures/stripe/subscription_created.json').data.object;
1818

1919
const { ProfileClient } = require('../../../lib/types');
2020
const {
2121
SubscriptionPurchase,
22-
} = require('../../../lib/payments/google-play/subscription-purchase');
22+
} = require('../../../lib/payments/iap/google-play/subscription-purchase');
2323
const proxyquire = require('proxyquire').noPreserveCache();
2424

2525
const authDbModule = require('fxa-shared/db/models/auth');
2626
const {
2727
PurchaseQueryError,
28-
} = require('../../../lib/payments/google-play/types');
28+
} = require('../../../lib/payments/iap/google-play/types');
2929

3030
const mockAuthEvents = {};
3131

packages/fxa-auth-server/test/local/payments/google-play/play-billing.js packages/fxa-auth-server/test/local/payments/iap/google-play/play-billing.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ const sinon = require('sinon');
88
const { assert } = require('chai');
99
const { default: Container } = require('typedi');
1010

11-
const { mockLog } = require('../../../mocks');
11+
const { mockLog } = require('../../../../mocks');
1212
const {
1313
AuthFirestore,
1414
AuthLogger,
1515
AppConfig,
16-
} = require('../../../../lib/types');
17-
const { PlayBilling } = require('../../../../lib/payments/google-play');
16+
} = require('../../../../../lib/types');
17+
const { PlayBilling } = require('../../../../../lib/payments/iap/google-play');
1818

1919
const mockConfig = {
2020
authFirestore: {

packages/fxa-auth-server/test/local/payments/google-play/purchase-manager.js packages/fxa-auth-server/test/local/payments/iap/google-play/purchase-manager.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ const { assert } = require('chai');
99
const { default: Container } = require('typedi');
1010
const proxyquire = require('proxyquire').noPreserveCache();
1111

12-
const { mockLog } = require('../../../mocks');
13-
const { AuthLogger } = require('../../../../lib/types');
12+
const { mockLog } = require('../../../../mocks');
13+
const { AuthLogger } = require('../../../../../lib/types');
1414
const {
1515
PurchaseQueryError,
1616
SkuType,
1717
PurchaseUpdateError,
1818
NotificationType,
19-
} = require('../../../../lib/payments/google-play/types');
19+
} = require('../../../../../lib/payments/iap/google-play/types');
2020

2121
const mockSubscriptionPurchase = {};
2222
const mockMergePurchase = sinon.fake.returns({});
2323
const { PurchaseManager } = proxyquire(
24-
'../../../../lib/payments/google-play/purchase-manager',
24+
'../../../../../lib/payments/iap/google-play/purchase-manager',
2525
{
2626
'./subscription-purchase': {
2727
SubscriptionPurchase: mockSubscriptionPurchase,

packages/fxa-auth-server/test/local/payments/google-play/subscription-purchase.js packages/fxa-auth-server/test/local/payments/iap/google-play/subscription-purchase.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ const { assert } = require('chai');
99
const {
1010
SubscriptionPurchase,
1111
GOOGLE_PLAY_FORM_OF_PAYMENT,
12-
} = require('../../../../lib/payments/google-play/subscription-purchase');
13-
const { SkuType } = require('../../../../lib/payments/google-play/types');
12+
} = require('../../../../../lib/payments/iap/google-play/subscription-purchase');
13+
const {
14+
SkuType,
15+
} = require('../../../../../lib/payments/iap/google-play/types');
1416

1517
describe('SubscriptionPurchase', () => {
1618
beforeEach(() => {});

packages/fxa-auth-server/test/local/payments/google-play/subscriptions.js packages/fxa-auth-server/test/local/payments/iap/google-play/subscriptions.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
const sinon = require('sinon');
66
const assert = { ...sinon.assert, ...require('chai').assert };
77
const { Container } = require('typedi');
8-
const { PlayBilling } = require('../../../../lib/payments/google-play');
8+
const { PlayBilling } = require('../../../../../lib/payments/iap/google-play');
99
const {
1010
PlaySubscriptions,
1111
abbrevPlayPurchaseFromSubscriptionPurchase,
12-
} = require('../../../../lib/payments/google-play/subscriptions');
12+
} = require('../../../../../lib/payments/iap/google-play/subscriptions');
1313
const { MozillaSubscriptionTypes } = require('fxa-shared/subscriptions/types');
14-
const { AppConfig } = require('../../../../lib/types');
15-
const { StripeHelper } = require('../../../../lib/payments/stripe');
14+
const { AppConfig } = require('../../../../../lib/types');
15+
const { StripeHelper } = require('../../../../../lib/payments/stripe');
1616

1717
describe('PlaySubscriptions', () => {
1818
const mockConfig = { subscriptions: { enabled: true } };

packages/fxa-auth-server/test/local/payments/google-play/user-manager.js packages/fxa-auth-server/test/local/payments/iap/google-play/user-manager.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ const sinon = require('sinon');
88
const { assert } = require('chai');
99
const { default: Container } = require('typedi');
1010

11-
const { mockLog } = require('../../../mocks');
11+
const { mockLog } = require('../../../../mocks');
1212

1313
const {
1414
UserManager,
15-
} = require('../../../../lib/payments/google-play/user-manager');
16-
const { AuthLogger } = require('../../../../lib/types');
15+
} = require('../../../../../lib/payments/iap/google-play/user-manager');
16+
const { AuthLogger } = require('../../../../../lib/types');
1717
const {
1818
SubscriptionPurchase,
19-
} = require('../../../../lib/payments/google-play/subscription-purchase');
19+
} = require('../../../../../lib/payments/iap/google-play/subscription-purchase');
2020
const {
2121
PurchaseQueryError,
22-
} = require('../../../../lib/payments/google-play/types');
22+
} = require('../../../../../lib/payments/iap/google-play/types');
2323

2424
const USER_ID = 'testUser';
2525
const VALID_SUB_API_RESPONSE = {

packages/fxa-auth-server/test/local/payments/stripe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const {
8383
} = require('fxa-shared/db/models/auth');
8484
const {
8585
SubscriptionPurchase,
86-
} = require('../../../lib/payments/google-play/subscription-purchase');
86+
} = require('../../../lib/payments/iap/google-play/subscription-purchase');
8787
const { AuthFirestore, AuthLogger, AppConfig } = require('../../../lib/types');
8888
const {
8989
INVOICES_RESOURCE,

packages/fxa-auth-server/test/local/routes/account.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const { normalizeEmail } = require('fxa-shared').email.helpers;
2424
const { MozillaSubscriptionTypes } = require('fxa-shared/subscriptions/types');
2525
const {
2626
PlaySubscriptions,
27-
} = require('../../../lib/payments/google-play/subscriptions');
27+
} = require('../../../lib/payments/iap/google-play/subscriptions');
2828

2929
const { AccountHandler } = require('../../../lib/routes/account');
3030

packages/fxa-auth-server/test/local/routes/subscriptions/google.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ const {
1515
} = require('../../../../lib/routes/subscriptions/google');
1616
const {
1717
PurchaseUpdateError,
18-
} = require('../../../../lib/payments/google-play/types/errors');
18+
} = require('../../../../lib/payments/iap/google-play/types/errors');
1919
const error = require('../../../../lib/error');
2020
const { AuthLogger } = require('../../../../lib/types');
21-
const { PlayBilling } = require('../../../../lib/payments/google-play');
21+
const { PlayBilling } = require('../../../../lib/payments/iap/google-play');
2222
const { OAUTH_SCOPE_SUBSCRIPTIONS_IAP } = require('fxa-shared/oauth/constants');
2323
const { CapabilityService } = require('../../../../lib/payments/capability');
2424

packages/fxa-auth-server/test/local/routes/subscriptions/paypal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const buildRoutes = require('../../../../lib/routes/subscriptions');
2727
const ACCOUNT_LOCALE = 'en-US';
2828
const { OAUTH_SCOPE_SUBSCRIPTIONS } = require('fxa-shared/oauth/constants');
2929
const { CapabilityService } = require('../../../../lib/payments/capability');
30-
const { PlayBilling } = require('../../../../lib/payments/google-play');
30+
const { PlayBilling } = require('../../../../lib/payments/iap/google-play');
3131
const TEST_EMAIL = 'test@email.com';
3232
const UID = uuid.v4({}, Buffer.alloc(16)).toString('hex');
3333
const MOCK_SCOPES = ['profile:email', OAUTH_SCOPE_SUBSCRIPTIONS];

packages/fxa-auth-server/test/local/routes/subscriptions/play-pubsub.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const {
1616
const { default: Container } = require('typedi');
1717
const { mockLog } = require('../../../mocks');
1818
const { AuthLogger } = require('../../../../lib/types');
19-
const { PlayBilling } = require('../../../../lib/payments/google-play');
19+
const { PlayBilling } = require('../../../../lib/payments/iap/google-play');
2020
const { CapabilityService } = require('../../../../lib/payments/capability');
2121

2222
const ACCOUNT_LOCALE = 'en-US';

packages/fxa-auth-server/test/local/routes/subscriptions/stripe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const { StripeHandler: DirectStripeRoutes } = proxyquire(
3434

3535
const { AuthLogger, AppConfig } = require('../../../../lib/types');
3636
const { CapabilityService } = require('../../../../lib/payments/capability');
37-
const { PlayBilling } = require('../../../../lib/payments/google-play');
37+
const { PlayBilling } = require('../../../../lib/payments/iap/google-play');
3838
const {
3939
stripeInvoiceToFirstInvoicePreviewDTO,
4040
stripeInvoicesToSubsequentInvoicePreviewsDTO,

packages/fxa-auth-server/test/mocks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,6 @@ function mockPayPalHelper(methods) {
852852
function mockPlaySubscriptions(methods) {
853853
return mockObject(
854854
methods,
855-
require('../lib/payments/google-play/subscriptions').PlaySubscriptions
855+
require('../lib/payments/iap/google-play/subscriptions').PlaySubscriptions
856856
);
857857
}

packages/fxa-auth-server/test/remote/subscription_tests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const { StripeHelper } = require('../../lib/payments/stripe');
1818
const { AuthLogger } = require('../../lib/types');
1919
const {
2020
PlaySubscriptions,
21-
} = require('../../lib/payments/google-play/subscriptions');
21+
} = require('../../lib/payments/iap/google-play/subscriptions');
2222

2323
const validClients = config.oauthServer.clients.filter(
2424
(client) => client.trusted && client.canGrant && client.publicClient

0 commit comments

Comments
 (0)