From 64beee5277cae32532d30f94d2eb3f970723971b Mon Sep 17 00:00:00 2001
From: Reino Muhl <10620585+StaberindeZA@users.noreply.github.com>
Date: Thu, 2 Jul 2026 08:51:44 -0400
Subject: [PATCH 1/2] chore(auth): test branch - do not merge

---
 packages/fxa-auth-server/lib/oauth/grant.js                      | 1 +
 .../fxa-auth-server/test/remote/subscription_tests.in.spec.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/fxa-auth-server/lib/oauth/grant.js b/packages/fxa-auth-server/lib/oauth/grant.js
index 962125fa933..22a1d6affcf 100644
--- a/packages/fxa-auth-server/lib/oauth/grant.js
+++ b/packages/fxa-auth-server/lib/oauth/grant.js
@@ -265,6 +265,7 @@ exports.generateAccessToken = async function generateAccessToken(grant) {
   }
 
   if (grant.scope.contains('profile:subscriptions')) {
+    console.log('test this');
     const capabilities =
       await capabilityService.determineClientVisibleSubscriptionCapabilities(
         clientId,
diff --git a/packages/fxa-auth-server/test/remote/subscription_tests.in.spec.ts b/packages/fxa-auth-server/test/remote/subscription_tests.in.spec.ts
index 411de929a7f..c8d8e5992b4 100644
--- a/packages/fxa-auth-server/test/remote/subscription_tests.in.spec.ts
+++ b/packages/fxa-auth-server/test/remote/subscription_tests.in.spec.ts
@@ -600,6 +600,7 @@ describe.each(testVersions)(
     });
 
     it('should not include subscriptions with session token', async () => {
+      console.log('testing the test');
       const response = await client.accountProfile();
       expect(response.subscriptions).toBeUndefined();
     });

From da8822da92d10326165dd03415842989d0a106cc Mon Sep 17 00:00:00 2001
From: Reino Muhl <10620585+StaberindeZA@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:09:54 -0400
Subject: [PATCH 2/2] try again

---
 packages/fxa-auth-server/lib/routes/account.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/fxa-auth-server/lib/routes/account.ts b/packages/fxa-auth-server/lib/routes/account.ts
index f06599b85ad..8e9ca601894 100644
--- a/packages/fxa-auth-server/lib/routes/account.ts
+++ b/packages/fxa-auth-server/lib/routes/account.ts
@@ -1911,6 +1911,7 @@ export class AccountHandler {
     ) {
       const capabilities =
         await this.capabilityService.subscriptionCapabilities(uid as string);
+      console.log('here we go');
       if (Object.keys(capabilities).length > 0) {
         res.subscriptionsByClientId = capabilities;
       }
@@ -2323,13 +2324,13 @@ export class AccountHandler {
     return response;
   }
 
-  async getEmails (request: AuthRequest) {
+  async getEmails(request: AuthRequest) {
     this.log.begin('Account.emails', request);
     const sessionToken = request.auth.credentials as { uid: string };
     const account = await this.db.account(sessionToken.uid);
     const result = {
       originalEmail: account.email,
-      primaryEmail: account.primaryEmail?.email || account.email
+      primaryEmail: account.primaryEmail?.email || account.email,
     };
     return result;
   }
@@ -3260,8 +3261,7 @@ export const accountRoutes = (
           }),
         },
       },
-      handler: (request: AuthRequest) =>
-        accountHandler.getEmails(request),
+      handler: (request: AuthRequest) => accountHandler.getEmails(request),
     },
     {
       method: 'POST',