Merge pull request #20374 from mozilla/FXA-13080

fix(emails): Update oauth_client_info service/name check

Author: LZoog

packages/fxa-auth-server/lib/senders/oauth_client_info.js

@@ -6,6 +6,9 @@
 
 const { Keyv } = require('keyv');
 const client = require('../oauth/client');
+const { OAuthNativeServices } = require('@fxa/accounts/oauth');
+
+const NATIVE_SERVICES = new Set(Object.values(OAuthNativeServices));
 
 module.exports = (log, config) => {
   const OAUTH_CLIENT_INFO_CACHE_TTL = config.oauth.clientInfoCacheTTL;
@@ -43,7 +46,7 @@ module.exports = (log, config) => {
     }
 
     // Set the client name to 'Firefox' if the service is browser-based
-    if (service === 'sync' || service === 'relay') {
+    if (NATIVE_SERVICES.has(service)) {
       log.trace('fetch.firefoxClient');
       return FIREFOX_CLIENT;
     }

packages/fxa-auth-server/lib/senders/oauth_client_info.spec.ts

@@ -12,7 +12,7 @@ jest.mock('../oauth/client', () => ({
       case '0000000000000000':
         throw new Error();
       default:
-        return { name: 'Firefox' };
+        return { name: 'NotFirefox' };
     }
   },
 }));
@@ -60,6 +60,16 @@ describe('lib/senders/oauth_client_info:', () => {
       expect(res.name).toBe('Firefox');
     });
 
+    it('returns Firefox if service=smartwindow', async () => {
+      const res = await fetch('smartwindow');
+      expect(res.name).toBe('Firefox');
+    });
+
+    it('returns Firefox if service=vpn', async () => {
+      const res = await fetch('vpn');
+      expect(res.name).toBe('Firefox');
+    });
+
     it('falls back to Mozilla if error', async () => {
       const res = await fetch('0000000000000000');
       expect(res.name).toBe('Mozilla');