Clean up and removing unused code

StaberindeZA · StaberindeZA · commit 3fc1c3a88bc1 · 2026-06-23T16:55:01.000-04:00
diff --git a/apps/payments/api/.env b/apps/payments/api/.env
@@ -1,7 +1,3 @@
-# Auth Server
-AUTH_SERVER_EMAIL_CAPABILITY_CONFIG__BASE_URL=http://localhost:9000/v1
-AUTH_SERVER_EMAIL_CAPABILITY_CONFIG__SUBSCRIPTIONS_SECRET=devsecret
-
 # MySQLConfig
 MYSQL_CONFIG__DATABASE=fxa
 MYSQL_CONFIG__HOST=::1
@@ -104,10 +100,3 @@ METERING_CONFIG__CLOUD_TASKS__THRESHOLD__TASK_URL=http://127.0.0.1:3000/v1/meter
 METERING_CONFIG__CLOUD_TASKS__THRESHOLD__QUEUE_NAME=metering-threshold-checks
 METERING_CONFIG__CLOUD_TASKS__THRESHOLD__BUCKET_SIZE_MS=300000
 METERING_CONFIG__CLOUD_TASKS__THRESHOLD__SCHEDULE_DELAY_MS=420000
-
-# Free Access Program Client Config 
-# NB: Ideally this matches the config in payments-next
-FREE_ACCESS_PROGRAM_CLIENT_CONFIG__FIRESTORE_CACHE_COLLECTION_NAME=subplat-free-access-program-cache
-FREE_ACCESS_PROGRAM_CLIENT_CONFIG__MEM_CACHE_T_T_L=300 # 5 minutes
-FREE_ACCESS_PROGRAM_CLIENT_CONFIG__FIRESTORE_CACHE_TTL=1800 # 30 minutes
-FREE_ACCESS_PROGRAM_CLIENT_CONFIG__FIRESTORE_OFFLINE_CACHE_TTL=604800 # 7 days
diff --git a/apps/payments/api/src/app/app.module.ts b/apps/payments/api/src/app/app.module.ts
@@ -49,7 +49,6 @@ import {
   PaypalCustomerManager,
 } from '@fxa/payments/paypal';
 import { CurrencyManager } from '@fxa/payments/currency';
-import { FreeAccessProgramManager } from '@fxa/free-access-program';
 import { AccountDatabaseNestFactory } from '@fxa/shared/db/mysql/account';
 import { AccountManager } from '@fxa/shared/account/account';
 import { CartManager } from '@fxa/payments/cart';
@@ -108,7 +107,6 @@ import { PaymentsMetricsAggregatorService } from '@fxa/payments/metrics-aggregat
     PriceManager,
     ProductManager,
     FirestoreProvider,
-    FreeAccessProgramManager,
     GoogleIapClient,
     GoogleIapPurchaseManager,
     StatsDProvider,
diff --git a/apps/payments/api/src/config/index.ts b/apps/payments/api/src/config/index.ts
@@ -3,7 +3,6 @@ import { IsDefined, ValidateNested } from 'class-validator';
 
 import { CurrencyConfig } from '@fxa/payments/currency';
 import { MeteringConfig } from '@fxa/entitlements/metering';
-import { FreeAccessProgramClientConfig } from '@fxa/free-access-program';
 import { AppleIapClientConfig, GoogleIapClientConfig } from '@fxa/payments/iap';
 import { PaymentsGleanConfig } from '@fxa/payments/metrics';
 import { PaypalClientConfig } from '@fxa/payments/paypal';
@@ -85,9 +84,4 @@ export class RootConfig {
   @ValidateNested()
   @IsDefined()
   public readonly meteringConfig!: Partial<MeteringConfig>;
-
-  @Type(() => FreeAccessProgramClientConfig)
-  @ValidateNested()
-  @IsDefined()
-  public readonly freeAccessProgramClientConfig!: Partial<FreeAccessProgramClientConfig>;
 }
diff --git a/libs/shared/account/account/src/lib/account.manager.ts b/libs/shared/account/account/src/lib/account.manager.ts
@@ -13,7 +13,7 @@ import {
   verifyAccountSession,
   VerificationMethods,
 } from './account.repository';
-import { randomBytesAsync, normalizeEmail } from './account.util';
+import { normalizeEmail, randomBytesAsync } from './account.util';
 import { uuidTransformer } from '@fxa/shared/db/mysql/core';
 
 @Injectable()
diff --git a/libs/shared/cms/src/__generated__/gql.ts b/libs/shared/cms/src/__generated__/gql.ts
diff --git a/libs/shared/cms/src/__generated__/graphql.ts b/libs/shared/cms/src/__generated__/graphql.ts
diff --git a/libs/shared/cms/src/lib/queries/services-with-capabilities/factories.ts b/libs/shared/cms/src/lib/queries/services-with-capabilities/factories.ts
@@ -18,8 +18,6 @@ export const ServiceResultFactory = (
   override?: Partial<ServiceResult>
 ): ServiceResult => ({
   oauthClientId: faker.string.sample(),
-  internalName: faker.company.name(),
-  description: faker.lorem.sentence(),
   capabilities: [CapabilitiesResultFactory()],
   ...override,
 });
diff --git a/libs/shared/cms/src/lib/queries/services-with-capabilities/query.ts b/libs/shared/cms/src/lib/queries/services-with-capabilities/query.ts
@@ -8,8 +8,6 @@ export const servicesWithCapabilitiesQuery = graphql(`
   query ServicesWithCapabilities {
     services(pagination: { limit: 500 }) {
       oauthClientId
-      internalName
-      description
       capabilities {
         slug
       }
diff --git a/libs/shared/cms/src/lib/queries/services-with-capabilities/types.ts b/libs/shared/cms/src/lib/queries/services-with-capabilities/types.ts
@@ -8,8 +8,6 @@ export interface CapabilitiesResult {
 
 export interface ServiceResult {
   oauthClientId: string;
-  internalName: string;
-  description: string | null;
   capabilities: CapabilitiesResult[];
 }
 
diff --git a/libs/shared/cms/src/lib/queries/services-with-capabilities/util.spec.ts b/libs/shared/cms/src/lib/queries/services-with-capabilities/util.spec.ts
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import {
-  ServiceResultFactory,
   ServicesWithCapabilitiesQueryFactory,
   ServicesWithCapabilitiesResult,
   ServicesWithCapabilitiesResultUtil,
@@ -33,38 +32,4 @@ describe('ServicesWithCapabilitiesResultUtil', () => {
       result.services?.[0]?.capabilities?.[0]?.slug
     );
   });
-
-  describe('findServiceByClientId', () => {
-    it('returns the service entry matching the clientId (case-insensitive)', () => {
-      const result = ServicesWithCapabilitiesQueryFactory({
-        services: [
-          ServiceResultFactory({
-            oauthClientId: 'Some-Client',
-            internalName: 'Some Service',
-            description: 'A useful service.',
-          }),
-        ],
-      });
-      const util = new ServicesWithCapabilitiesResultUtil(
-        result as ServicesWithCapabilitiesResult
-      );
-
-      const match = util.findServiceByClientId('SOME-CLIENT');
-      expect(match).toBeDefined();
-      expect(match?.oauthClientId).toBe('Some-Client');
-      expect(match?.internalName).toBe('Some Service');
-      expect(match?.description).toBe('A useful service.');
-    });
-
-    it('returns undefined for an unknown clientId', () => {
-      const result = ServicesWithCapabilitiesQueryFactory({
-        services: [ServiceResultFactory({ oauthClientId: 'known' })],
-      });
-      const util = new ServicesWithCapabilitiesResultUtil(
-        result as ServicesWithCapabilitiesResult
-      );
-
-      expect(util.findServiceByClientId('unknown')).toBeUndefined();
-    });
-  });
 });
diff --git a/libs/shared/cms/src/lib/queries/services-with-capabilities/util.ts b/libs/shared/cms/src/lib/queries/services-with-capabilities/util.ts
@@ -5,16 +5,7 @@
 import { ServiceResult, ServicesWithCapabilitiesResult } from './types';
 
 export class ServicesWithCapabilitiesResultUtil {
-  private readonly byClientId: ReadonlyMap<string, ServiceResult>;
-
-  constructor(private rawResult: ServicesWithCapabilitiesResult) {
-    const index = new Map<string, ServiceResult>();
-    for (const service of this.rawResult.services ?? []) {
-      if (!service?.oauthClientId) continue;
-      index.set(service.oauthClientId.toLowerCase(), service);
-    }
-    this.byClientId = index;
-  }
+  constructor(private rawResult: ServicesWithCapabilitiesResult) {}
 
   getServices(): ServiceResult[] {
     return this.services;
@@ -23,8 +14,4 @@ export class ServicesWithCapabilitiesResultUtil {
   get services() {
     return this.rawResult.services;
   }
-
-  findServiceByClientId(clientId: string): ServiceResult | undefined {
-    return this.byClientId.get(clientId.toLowerCase());
-  }
 }
diff --git a/packages/fxa-auth-server/bin/key_server.js b/packages/fxa-auth-server/bin/key_server.js
@@ -23,6 +23,7 @@ const { StatsDService } = require('@fxa/shared/metrics/statsd');
 const {
   FreeAccessInProcessNotifier,
 } = require('../lib/payments/free-access-in-process-notifier');
+const { CapabilityService } = require('../lib/payments/capability');
 const { EligibilityManager } = require('@fxa/payments/eligibility');
 const {
   PriceManager,
@@ -267,26 +268,14 @@ async function run(config) {
       );
       Container.set(FreeAccessProgramManager, freeAccessProgramManager);
       Container.set(FreeAccessProgramClientConfig, freeAccessProgramConfig);
-
-      const freeAccessNotifier = new FreeAccessInProcessNotifier({
-        log,
-        db: database,
-      });
-      Container.set(FREE_ACCESS_NOTIFIER, freeAccessNotifier);
       Container.set(FirestoreService, firestore);
       Container.set(StatsDService, statsd);
       Container.set(Logger, log);
 
-      const freeAccessReconciler = new FreeAccessProgramReconcilerService(
-        freeAccessProgramManager,
-        freeAccessNotifier,
-        statsd,
-        log
-      );
-      Container.set(
-        FreeAccessProgramReconcilerService,
-        freeAccessReconciler
-      );
+      // The FreeAccessInProcessNotifier + reconciler depend on a fully-
+      // wired CapabilityService (specifically ProfileClient), which isn't
+      // in Container yet at this point. We finish their wiring below,
+      // after `Container.set(ProfileClient, ...)`.
     }
     // CMS-disabled branch: no FreeAccessProgramManager is registered, so
     // CapabilityService's `Container.has` guard short-circuits the lookup
@@ -426,6 +415,30 @@ async function run(config) {
   });
   Container.set(ProfileClient, profile);
 
+  // Wire the free-access notifier + reconciler now that CapabilityService's
+  // required deps (ProfileClient) are in Container. CapabilityService is
+  // auto-instantiated by TypeDI on first `Container.get` and captures its
+  // deps at construction time — calling it before ProfileClient was set
+  // would have permanently baked in the missing dep.
+  if (Container.has(FreeAccessProgramManager)) {
+    const freeAccessProgramManager = Container.get(FreeAccessProgramManager);
+    const capabilityService = Container.get(CapabilityService);
+    const freeAccessNotifier = new FreeAccessInProcessNotifier(
+      database,
+      capabilityService
+    );
+    Container.set(FREE_ACCESS_NOTIFIER, freeAccessNotifier);
+    Container.set(
+      FreeAccessProgramReconcilerService,
+      new FreeAccessProgramReconcilerService(
+        freeAccessProgramManager,
+        freeAccessNotifier,
+        statsd,
+        log
+      )
+    );
+  }
+
   const bounces = new Bounces(config.smtp.bounces, {
     // libs expectation for db is a bit simpler so we just pass through the
     // existing function
diff --git a/packages/fxa-auth-server/lib/payments/free-access-in-process-notifier.spec.ts b/packages/fxa-auth-server/lib/payments/free-access-in-process-notifier.spec.ts
@@ -2,37 +2,28 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Container } from 'typedi';
-import { createMock } from '@golevelup/ts-jest';
-
 import { AppError as error } from '@fxa/accounts/errors';
 
-import { CapabilityService } from './capability';
 import { FreeAccessInProcessNotifier } from './free-access-in-process-notifier';
-import { AuthLogger } from '../types';
 
 describe('FreeAccessInProcessNotifier', () => {
-  let log: any;
   let db: { accountRecord: jest.Mock };
   let capabilityService: { processEmailListChange: jest.Mock };
   let notifier: FreeAccessInProcessNotifier;
 
   const UID = 'a'.repeat(32);
 
   beforeEach(() => {
-    log = createMock<AuthLogger>();
     db = {
       accountRecord: jest.fn().mockResolvedValue({ uid: UID }),
     };
     capabilityService = {
       processEmailListChange: jest.fn().mockResolvedValue(undefined),
     };
-    Container.set(CapabilityService, capabilityService);
-    notifier = new FreeAccessInProcessNotifier({ log, db });
+    notifier = new FreeAccessInProcessNotifier(db, capabilityService as any);
   });
 
   afterEach(() => {
-    Container.reset();
     jest.restoreAllMocks();
   });
 
@@ -49,10 +40,22 @@ describe('FreeAccessInProcessNotifier', () => {
       added: ['cap-a'],
       removed: ['cap-b'],
       eventCreatedAt: expect.any(Number),
-      request: undefined,
     });
   });
 
+  it('stamps eventCreatedAt at call time, not construction time', async () => {
+    const beforeCall = Math.floor(Date.now() / 1000);
+    await notifier.notifyCapabilityChange({
+      email: 'user@example.com',
+      added: ['cap-a'],
+    });
+    const afterCall = Math.floor(Date.now() / 1000);
+    const stamped =
+      capabilityService.processEmailListChange.mock.calls[0][0].eventCreatedAt;
+    expect(stamped).toBeGreaterThanOrEqual(beforeCall);
+    expect(stamped).toBeLessThanOrEqual(afterCall);
+  });
+
   it('short-circuits when both added and removed are empty', async () => {
     await notifier.notifyCapabilityChange({
       email: 'user@example.com',
diff --git a/packages/fxa-auth-server/lib/payments/free-access-in-process-notifier.ts b/packages/fxa-auth-server/lib/payments/free-access-in-process-notifier.ts
@@ -2,21 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import Container from 'typedi';
-
 import { AppError as error } from '@fxa/accounts/errors';
 import type {
   CapabilityChange,
   FreeAccessNotifier,
 } from '@fxa/free-access-program';
 
 import { CapabilityService } from './capability';
-import type { AuthLogger, AuthRequest } from '../types';
-
-interface FreeAccessNotifierDeps {
-  log: AuthLogger;
-  db: any;
-}
 
 /**
  * Resolves `CapabilityChange` deltas into the in-process side effects
@@ -28,14 +20,13 @@ interface FreeAccessNotifierDeps {
  * notifier into the reconciler.
  *
  * Unknown emails are swallowed: free-access lists can legitimately include
- * not-yet-registered accounts; we log the count and keep going so the rest
- * of the batch lands.
+ * not-yet-registered accounts; we let those drop through silently so the
+ * rest of the batch lands.
  */
 export class FreeAccessInProcessNotifier implements FreeAccessNotifier {
   constructor(
-    private deps: FreeAccessNotifierDeps,
-    private eventCreatedAt: number = Math.floor(Date.now() / 1000),
-    private request?: AuthRequest
+    private db: any,
+    private capabilityService: CapabilityService
   ) {}
 
   async notifyCapabilityChange(change: CapabilityChange): Promise<void> {
@@ -47,7 +38,7 @@ export class FreeAccessInProcessNotifier implements FreeAccessNotifier {
 
     let uid: string;
     try {
-      const account = await this.deps.db.accountRecord(change.email);
+      const account = await this.db.accountRecord(change.email);
       uid = account.uid;
     } catch (err: any) {
       if (err?.errno === error.ERRNO.ACCOUNT_UNKNOWN) {
@@ -56,13 +47,11 @@ export class FreeAccessInProcessNotifier implements FreeAccessNotifier {
       throw err;
     }
 
-    const capabilityService = Container.get(CapabilityService);
-    await capabilityService.processEmailListChange({
+    await this.capabilityService.processEmailListChange({
       uid,
       added: [...added],
       removed: [...removed],
-      eventCreatedAt: this.eventCreatedAt,
-      request: this.request,
+      eventCreatedAt: Math.floor(Date.now() / 1000),
     });
   }
 }
diff --git a/packages/fxa-auth-server/lib/routes/subscriptions/free-access-program-webhook.spec.ts b/packages/fxa-auth-server/lib/routes/subscriptions/free-access-program-webhook.spec.ts
@@ -2,13 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { Container } from 'typedi';
 import { createMock } from '@golevelup/ts-jest';
 import Boom from '@hapi/boom';
 
-import { FreeAccessProgramReconcilerService } from '@fxa/free-access-program';
-import { StrapiClient } from '@fxa/shared/cms';
-
 import { FreeAccessProgramWebhookHandler } from './free-access-program-webhook';
 import { AuthLogger } from '../../types';
 
@@ -34,13 +30,14 @@ describe('FreeAccessProgramWebhookHandler', () => {
         deleted: 0,
       }),
     };
-    Container.set(StrapiClient, strapiClient);
-    Container.set(FreeAccessProgramReconcilerService, reconciler);
-    handler = new FreeAccessProgramWebhookHandler(log);
+    handler = new FreeAccessProgramWebhookHandler(
+      log,
+      strapiClient as any,
+      reconciler as any
+    );
   });
 
   afterEach(() => {
-    Container.reset();
     jest.restoreAllMocks();
   });
 
diff --git a/packages/fxa-auth-server/lib/routes/subscriptions/free-access-program-webhook.ts b/packages/fxa-auth-server/lib/routes/subscriptions/free-access-program-webhook.ts
diff --git a/packages/fxa-auth-server/lib/routes/subscriptions/index.ts b/packages/fxa-auth-server/lib/routes/subscriptions/index.ts
diff --git a/packages/fxa-auth-server/scripts/free-access-program-reconcile.ts b/packages/fxa-auth-server/scripts/free-access-program-reconcile.ts

Original file line number	Diff line number	Diff line change
@@ -8,8 +8,6 @@ export const servicesWithCapabilitiesQuery = graphql(`
`8`	`8`	`query ServicesWithCapabilities {`
`9`	`9`	`services(pagination: { limit: 500 }) {`
`10`	`10`	`oauthClientId`
`11`		`- internalName`
`12`		`- description`
`13`	`11`	`capabilities {`
`14`	`12`	`slug`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ export interface CapabilitiesResult {`
`8`	`8`
`9`	`9`	`export interface ServiceResult {`
`10`	`10`	`oauthClientId: string;`
`11`		`- internalName: string;`
`12`		`- description: string \| null;`
`13`	`11`	`capabilities: CapabilitiesResult[];`
`14`	`12`	`}`
`15`	`13`