diff --git a/packages/fxa-settings/src/lib/channels/firefox.ts b/packages/fxa-settings/src/lib/channels/firefox.ts index 904c26b220c..00e1831d969 100644 --- a/packages/fxa-settings/src/lib/channels/firefox.ts +++ b/packages/fxa-settings/src/lib/channels/firefox.ts @@ -107,12 +107,12 @@ export type WebChannelServices = | { sync: SyncEngines; } - // For sync optional flows (currently Relay and AiWindow) + // For sync optional flows (currently Relay and SmartWindow) | { relay: {}; } | { - aiwindow: {}; + smartwindow: {}; }; // ref: [FxAccounts.sys.mjs](https://searchfox.org/mozilla-central/rev/82828dba9e290914eddd294a0871533875b3a0b5/services/fxaccounts/FxAccounts.sys.mjs#910) diff --git a/packages/fxa-settings/src/lib/constants.ts b/packages/fxa-settings/src/lib/constants.ts index 2f3d5d70fb7..46b81d96b8b 100644 --- a/packages/fxa-settings/src/lib/constants.ts +++ b/packages/fxa-settings/src/lib/constants.ts @@ -80,7 +80,7 @@ export const Constants = { // flows that use the Firefox `client_id`. These may be placeholders/defaults // we move some of these into the CMS in FXA-12378, based on entrypoint. RELIER_FF_CLIENT_RELAY_SERVICE_NAME: 'Firefox Relay', - RELIER_FF_CLIENT_AI_MODE_SERVICE_NAME: 'Firefox AI Window', + RELIER_FF_CLIENT_SMART_WINDOW_SERVICE_NAME: 'Firefox Smart Window', RELIER_KEYS_LENGTH: 32, RELIER_KEYS_CONTEXT_INFO_PREFIX: 'identity.mozilla.com/picl/v1/oauth/', diff --git a/packages/fxa-settings/src/lib/hooks/useFxAStatus/index.test.tsx b/packages/fxa-settings/src/lib/hooks/useFxAStatus/index.test.tsx index f690a854447..77082110e0b 100644 --- a/packages/fxa-settings/src/lib/hooks/useFxAStatus/index.test.tsx +++ b/packages/fxa-settings/src/lib/hooks/useFxAStatus/index.test.tsx @@ -120,7 +120,7 @@ describe('useFxAStatus', () => { }); }); - it('returns supportsKeysOptionalLogin: true when Relay or AiWindow service', async () => { + it('returns supportsKeysOptionalLogin: true when Relay or SmartWindow service', async () => { const integration = { type: IntegrationType.OAuthNative, isSync: () => false, diff --git a/packages/fxa-settings/src/models/integrations/integration.ts b/packages/fxa-settings/src/models/integrations/integration.ts index b67a049badc..ccb04fdacda 100644 --- a/packages/fxa-settings/src/models/integrations/integration.ts +++ b/packages/fxa-settings/src/models/integrations/integration.ts @@ -86,7 +86,7 @@ export class GenericIntegration< return false; } - isFirefoxClientServiceAiWindow() { + isFirefoxClientServiceSmartWindow() { return false; } diff --git a/packages/fxa-settings/src/models/integrations/oauth-native-integration.test.ts b/packages/fxa-settings/src/models/integrations/oauth-native-integration.test.ts index aaf42881a13..98599cab0ad 100644 --- a/packages/fxa-settings/src/models/integrations/oauth-native-integration.test.ts +++ b/packages/fxa-settings/src/models/integrations/oauth-native-integration.test.ts @@ -153,10 +153,10 @@ describe('OAuthNativeIntegration', function () { expect(model.getServiceName()).toBe('Firefox Relay'); }); - it('returns AI Window service name for aiwindow service', () => { + it('returns Smart Window service name for smartwindow service', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); - model.data.service = OAuthNativeServices.AiWindow; - expect(model.getServiceName()).toBe('Firefox AI Window'); + model.data.service = OAuthNativeServices.SmartWindow; + expect(model.getServiceName()).toBe('Firefox Smart Window'); }); }); @@ -173,30 +173,30 @@ describe('OAuthNativeIntegration', function () { expect(model.isFirefoxClientServiceRelay()).toBe(false); }); - it('returns false when service is aiwindow', () => { + it('returns false when service is smartwindow', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); - model.data.service = OAuthNativeServices.AiWindow; + model.data.service = OAuthNativeServices.SmartWindow; expect(model.isFirefoxClientServiceRelay()).toBe(false); }); }); - describe('isFirefoxClientServiceAiWindow', () => { - it('returns true when service is aiwindow', () => { + describe('isFirefoxClientServiceSmartWindow', () => { + it('returns true when service is smartwindow', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); - model.data.service = OAuthNativeServices.AiWindow; - expect(model.isFirefoxClientServiceAiWindow()).toBe(true); + model.data.service = OAuthNativeServices.SmartWindow; + expect(model.isFirefoxClientServiceSmartWindow()).toBe(true); }); it('returns false when service is sync', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); model.data.service = OAuthNativeServices.Sync; - expect(model.isFirefoxClientServiceAiWindow()).toBe(false); + expect(model.isFirefoxClientServiceSmartWindow()).toBe(false); }); it('returns false when service is relay', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); model.data.service = OAuthNativeServices.Relay; - expect(model.isFirefoxClientServiceAiWindow()).toBe(false); + expect(model.isFirefoxClientServiceSmartWindow()).toBe(false); }); }); @@ -218,9 +218,9 @@ describe('OAuthNativeIntegration', function () { expect(model.isFirefoxNonSync()).toBe(true); }); - it('returns true when service is aiwindow', () => { + it('returns true when service is smartwindow', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); - model.data.service = OAuthNativeServices.AiWindow; + model.data.service = OAuthNativeServices.SmartWindow; expect(model.isFirefoxNonSync()).toBe(true); }); }); @@ -232,10 +232,10 @@ describe('OAuthNativeIntegration', function () { expect(model.getWebChannelServices()).toEqual({ relay: {} }); }); - it('returns aiwindow services when service is aiwindow', () => { + it('returns smartwindow services when service is smartwindow', () => { model.clientInfo = mockClientInfo(OAuthNativeClients.FirefoxDesktop); - model.data.service = OAuthNativeServices.AiWindow; - expect(model.getWebChannelServices()).toEqual({ aiwindow: {} }); + model.data.service = OAuthNativeServices.SmartWindow; + expect(model.getWebChannelServices()).toEqual({ smartwindow: {} }); }); it('returns sync services when service is sync', () => { diff --git a/packages/fxa-settings/src/models/integrations/oauth-native-integration.ts b/packages/fxa-settings/src/models/integrations/oauth-native-integration.ts index 8a099e3079e..4b639d6be99 100644 --- a/packages/fxa-settings/src/models/integrations/oauth-native-integration.ts +++ b/packages/fxa-settings/src/models/integrations/oauth-native-integration.ts @@ -48,7 +48,7 @@ export enum OAuthNativeClients { export enum OAuthNativeServices { Sync = 'sync', Relay = 'relay', - AiWindow = 'aiwindow', + SmartWindow = 'smartwindow', } /** @@ -101,17 +101,17 @@ export class OAuthNativeIntegration extends OAuthWebIntegration { ); } - isFirefoxClientServiceAiWindow() { + isFirefoxClientServiceSmartWindow() { return ( this.isFirefoxClient() && - this.data.service === OAuthNativeServices.AiWindow + this.data.service === OAuthNativeServices.SmartWindow ); } isFirefoxNonSync() { return ( this.isFirefoxClientServiceRelay() || - this.isFirefoxClientServiceAiWindow() + this.isFirefoxClientServiceSmartWindow() ); } @@ -141,8 +141,8 @@ export class OAuthNativeIntegration extends OAuthWebIntegration { if (this.isFirefoxClientServiceRelay()) { return { relay: {} }; } - if (this.isFirefoxClientServiceAiWindow()) { - return { aiwindow: {} }; + if (this.isFirefoxClientServiceSmartWindow()) { + return { smartwindow: {} }; } if (this.isDefaultSyncService()) { return { sync: syncEngines || {} }; @@ -157,8 +157,8 @@ export class OAuthNativeIntegration extends OAuthWebIntegration { if (this.isFirefoxClientServiceRelay()) { return Constants.RELIER_FF_CLIENT_RELAY_SERVICE_NAME; } - if (this.isFirefoxClientServiceAiWindow()) { - return Constants.RELIER_FF_CLIENT_AI_MODE_SERVICE_NAME; + if (this.isFirefoxClientServiceSmartWindow()) { + return Constants.RELIER_FF_CLIENT_SMART_WINDOW_SERVICE_NAME; } // TODO: handle Thunderbird case better? FXA-10848 return 'Firefox'; diff --git a/packages/fxa-settings/src/models/integrations/utils.test.ts b/packages/fxa-settings/src/models/integrations/utils.test.ts index eca74606e85..6bdd54e68ff 100644 --- a/packages/fxa-settings/src/models/integrations/utils.test.ts +++ b/packages/fxa-settings/src/models/integrations/utils.test.ts @@ -16,8 +16,8 @@ describe('isFirefoxService', () => { expect(result).toBe(true); }); - it('should return true for OAuthNativeServices.AiWindow', () => { - const result = isFirefoxService(OAuthNativeServices.AiWindow); + it('should return true for OAuthNativeServices.SmartWindow', () => { + const result = isFirefoxService(OAuthNativeServices.SmartWindow); expect(result).toBe(true); }); diff --git a/packages/fxa-settings/src/models/integrations/utils.ts b/packages/fxa-settings/src/models/integrations/utils.ts index d24629b923b..33a28a49091 100644 --- a/packages/fxa-settings/src/models/integrations/utils.ts +++ b/packages/fxa-settings/src/models/integrations/utils.ts @@ -8,7 +8,7 @@ export function isFirefoxService(service?: string) { return ( service === OAuthNativeServices.Sync || service === OAuthNativeServices.Relay || - service === OAuthNativeServices.AiWindow + service === OAuthNativeServices.SmartWindow ); } diff --git a/packages/fxa-settings/src/pages/Index/container.test.tsx b/packages/fxa-settings/src/pages/Index/container.test.tsx index 0d503376c35..927f8d7df59 100644 --- a/packages/fxa-settings/src/pages/Index/container.test.tsx +++ b/packages/fxa-settings/src/pages/Index/container.test.tsx @@ -142,7 +142,7 @@ describe('IndexContainer', () => { getClientId: () => 'abc123', isSync: () => true, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, wantsKeys: () => true, getCmsInfo: () => undefined, data: { clientId: 'abc123' }, diff --git a/packages/fxa-settings/src/pages/Index/index.stories.tsx b/packages/fxa-settings/src/pages/Index/index.stories.tsx index a6473ce8d81..33a73a75695 100644 --- a/packages/fxa-settings/src/pages/Index/index.stories.tsx +++ b/packages/fxa-settings/src/pages/Index/index.stories.tsx @@ -50,9 +50,9 @@ export const WithThirdPartyAuthServiceRelayIntegration = storyWithProps({ supportsKeysOptionalLogin: true, }); -export const WithThirdPartyAuthServiceAIWindowIntegration = storyWithProps({ +export const WithThirdPartyAuthServiceSmartWindowIntegration = storyWithProps({ integration: createMockIndexOAuthNativeIntegration({ - isFirefoxClientServiceAiWindow: true, + isFirefoxClientServiceSmartWindow: true, isSync: false, }), supportsKeysOptionalLogin: true, diff --git a/packages/fxa-settings/src/pages/Index/index.test.tsx b/packages/fxa-settings/src/pages/Index/index.test.tsx index 385c4f6e094..4198197b230 100644 --- a/packages/fxa-settings/src/pages/Index/index.test.tsx +++ b/packages/fxa-settings/src/pages/Index/index.test.tsx @@ -117,12 +117,12 @@ describe('Index page', () => { thirdPartyAuthWithSeparatorRendered(); }); - it('renders third party auth with service=aiwindow when supportsKeysOptionalLogin is true', () => { + it('renders third party auth with service=smartwindow when supportsKeysOptionalLogin is true', () => { renderWithLocalizationProvider( diff --git a/packages/fxa-settings/src/pages/Index/interfaces.ts b/packages/fxa-settings/src/pages/Index/interfaces.ts index bb8fe8d1237..b6971ff58ee 100644 --- a/packages/fxa-settings/src/pages/Index/interfaces.ts +++ b/packages/fxa-settings/src/pages/Index/interfaces.ts @@ -13,7 +13,7 @@ export type IndexIntegration = Pick< | 'isSync' | 'getClientId' | 'isFirefoxClientServiceRelay' - | 'isFirefoxClientServiceAiWindow' + | 'isFirefoxClientServiceSmartWindow' | 'isFirefoxNonSync' | 'data' | 'getCmsInfo' diff --git a/packages/fxa-settings/src/pages/Index/mocks.tsx b/packages/fxa-settings/src/pages/Index/mocks.tsx index a5b037502c1..cf57652f805 100644 --- a/packages/fxa-settings/src/pages/Index/mocks.tsx +++ b/packages/fxa-settings/src/pages/Index/mocks.tsx @@ -53,12 +53,12 @@ export function createMockIndexOAuthIntegration({ export function createMockIndexOAuthNativeIntegration({ isSync = true, isFirefoxClientServiceRelay = false, - isFirefoxClientServiceAiWindow = false, + isFirefoxClientServiceSmartWindow = false, cmsInfo, }: { isSync?: boolean; isFirefoxClientServiceRelay?: boolean; - isFirefoxClientServiceAiWindow?: boolean; + isFirefoxClientServiceSmartWindow?: boolean; cmsInfo?: RelierCmsInfo; } = {}): IndexIntegration { return { @@ -66,9 +66,9 @@ export function createMockIndexOAuthNativeIntegration({ isSync: () => isSync, getClientId: () => MOCK_CLIENT_ID, isFirefoxClientServiceRelay: () => isFirefoxClientServiceRelay, - isFirefoxClientServiceAiWindow: () => isFirefoxClientServiceAiWindow, + isFirefoxClientServiceSmartWindow: () => isFirefoxClientServiceSmartWindow, isFirefoxNonSync: () => - isFirefoxClientServiceRelay || isFirefoxClientServiceAiWindow, + isFirefoxClientServiceRelay || isFirefoxClientServiceSmartWindow, getCmsInfo: () => cmsInfo, getLegalTerms: () => undefined, data: new OAuthIntegrationData( @@ -85,7 +85,7 @@ export function createMockIndexWebIntegration(): IndexIntegration { isSync: () => false, getClientId: () => undefined, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getCmsInfo: () => undefined, getLegalTerms: () => undefined, diff --git a/packages/fxa-settings/src/pages/PostVerify/SetPassword/container.test.tsx b/packages/fxa-settings/src/pages/PostVerify/SetPassword/container.test.tsx index 05ea456134d..47128428d41 100644 --- a/packages/fxa-settings/src/pages/PostVerify/SetPassword/container.test.tsx +++ b/packages/fxa-settings/src/pages/PostVerify/SetPassword/container.test.tsx @@ -151,7 +151,7 @@ function mockSyncDesktopV3Integration() { data: { service: 'sync' }, isDesktopSync: () => true, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, isFirefoxMobileClient: () => false, getCmsInfo: () => undefined, @@ -172,7 +172,7 @@ function mockOAuthNativeIntegration( data: { service: 'sync' }, isDesktopSync: () => true, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, isFirefoxMobileClient: () => isFirefoxMobileClient, getCmsInfo: () => undefined, diff --git a/packages/fxa-settings/src/pages/Signin/SigninRecoveryCode/mocks.tsx b/packages/fxa-settings/src/pages/Signin/SigninRecoveryCode/mocks.tsx index 5098cb12abc..21a688654a6 100644 --- a/packages/fxa-settings/src/pages/Signin/SigninRecoveryCode/mocks.tsx +++ b/packages/fxa-settings/src/pages/Signin/SigninRecoveryCode/mocks.tsx @@ -42,7 +42,7 @@ export const mockWebIntegration = { isSync: () => false, wantsKeys: () => false, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, getCmsInfo: () => undefined, data: { validate: () => {}, diff --git a/packages/fxa-settings/src/pages/Signin/SigninTotpCode/mocks.tsx b/packages/fxa-settings/src/pages/Signin/SigninTotpCode/mocks.tsx index 702678ae980..4cb75324217 100644 --- a/packages/fxa-settings/src/pages/Signin/SigninTotpCode/mocks.tsx +++ b/packages/fxa-settings/src/pages/Signin/SigninTotpCode/mocks.tsx @@ -29,7 +29,7 @@ export const mockWebSigninIntegration = { isSync: () => false, wantsKeys: () => false, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices(), getCmsInfo: () => undefined, @@ -48,7 +48,7 @@ export const mockOAuthNativeSigninIntegration = ( isSync: () => isSync, wantsKeys: () => false, isFirefoxClientServiceRelay: () => isRelay, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => isRelay, getWebChannelServices: mockGetWebChannelServices({ isSync, isRelay }), data: new IntegrationData( diff --git a/packages/fxa-settings/src/pages/Signin/SigninUnblock/mocks.tsx b/packages/fxa-settings/src/pages/Signin/SigninUnblock/mocks.tsx index ce97fefaa81..1e8dbfbbba4 100644 --- a/packages/fxa-settings/src/pages/Signin/SigninUnblock/mocks.tsx +++ b/packages/fxa-settings/src/pages/Signin/SigninUnblock/mocks.tsx @@ -80,7 +80,7 @@ export function createMockSigninWebSyncIntegration() { data: new WebIntegrationData(new GenericData({})), isDesktopSync: () => true, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices({ isSync: true }), wantsLogin: () => false, diff --git a/packages/fxa-settings/src/pages/Signin/index.stories.tsx b/packages/fxa-settings/src/pages/Signin/index.stories.tsx index 681be4c2da0..143f3c8caa1 100644 --- a/packages/fxa-settings/src/pages/Signin/index.stories.tsx +++ b/packages/fxa-settings/src/pages/Signin/index.stories.tsx @@ -139,27 +139,27 @@ export const SignInRelayWithPasswordlessSupport = storyWithProps({ supportsKeysOptionalLogin: true, }); -export const CachedSignInAiWindowWithPasswordlessSupport = storyWithProps({ +export const CachedSignInRelayWithPasswordlessSupport = storyWithProps({ sessionToken: MOCK_SESSION_TOKEN, integration: createMockSigninOAuthNativeIntegration({ - service: OAuthNativeServices.AiWindow, + service: OAuthNativeServices.Relay, isSync: false, }), supportsKeysOptionalLogin: true, }); -export const CachedSignInRelayWithPasswordlessSupport = storyWithProps({ +export const CachedSignInSmartWindowWithPasswordlessSupport = storyWithProps({ sessionToken: MOCK_SESSION_TOKEN, integration: createMockSigninOAuthNativeIntegration({ - service: OAuthNativeServices.Relay, + service: OAuthNativeServices.SmartWindow, isSync: false, }), supportsKeysOptionalLogin: true, }); -export const SignInAiWindowWithPasswordlessSupport = storyWithProps({ +export const SignInSmartWindowWithPasswordlessSupport = storyWithProps({ integration: createMockSigninOAuthNativeIntegration({ - service: OAuthNativeServices.AiWindow, + service: OAuthNativeServices.SmartWindow, isSync: false, }), supportsKeysOptionalLogin: true, diff --git a/packages/fxa-settings/src/pages/Signin/index.test.tsx b/packages/fxa-settings/src/pages/Signin/index.test.tsx index b1e382f9fae..0a82560e3f1 100644 --- a/packages/fxa-settings/src/pages/Signin/index.test.tsx +++ b/packages/fxa-settings/src/pages/Signin/index.test.tsx @@ -314,9 +314,9 @@ describe('Signin component', () => { }); }); - it('renders third party auth when service=aiwindow and supportsKeysOptionalLogin is true', () => { + it('renders third party auth when service=smartwindow and supportsKeysOptionalLogin is true', () => { const integration = createMockSigninOAuthNativeIntegration({ - service: OAuthNativeServices.AiWindow, + service: OAuthNativeServices.SmartWindow, isSync: false, }); render({ @@ -1048,9 +1048,9 @@ describe('Signin component', () => { }); }); - it('shows cached signin for service=aiwindow when supportsKeysOptionalLogin is true', () => { + it('shows cached signin for service=smartwindow when supportsKeysOptionalLogin is true', () => { const integration = createMockSigninOAuthNativeIntegration({ - service: OAuthNativeServices.AiWindow, + service: OAuthNativeServices.SmartWindow, isSync: false, }); render({ diff --git a/packages/fxa-settings/src/pages/Signin/interfaces.ts b/packages/fxa-settings/src/pages/Signin/interfaces.ts index 428e892d178..7ab07d27141 100644 --- a/packages/fxa-settings/src/pages/Signin/interfaces.ts +++ b/packages/fxa-settings/src/pages/Signin/interfaces.ts @@ -31,7 +31,7 @@ export type SigninUnblockIntegration = Pick< | 'data' | 'isDesktopSync' | 'isFirefoxClientServiceRelay' - | 'isFirefoxClientServiceAiWindow' + | 'isFirefoxClientServiceSmartWindow' | 'isFirefoxNonSync' | 'getWebChannelServices' | 'wantsLogin' @@ -51,7 +51,7 @@ export type SigninIntegration = | 'data' | 'isDesktopSync' | 'isFirefoxClientServiceRelay' - | 'isFirefoxClientServiceAiWindow' + | 'isFirefoxClientServiceSmartWindow' | 'isFirefoxNonSync' | 'getWebChannelServices' | 'getCmsInfo' @@ -72,7 +72,7 @@ export type SigninOAuthIntegration = Pick< | 'data' | 'isDesktopSync' | 'isFirefoxClientServiceRelay' - | 'isFirefoxClientServiceAiWindow' + | 'isFirefoxClientServiceSmartWindow' | 'isFirefoxNonSync' | 'getWebChannelServices' | 'getCmsInfo' diff --git a/packages/fxa-settings/src/pages/Signin/mocks.tsx b/packages/fxa-settings/src/pages/Signin/mocks.tsx index 883734434d0..871d06584ae 100644 --- a/packages/fxa-settings/src/pages/Signin/mocks.tsx +++ b/packages/fxa-settings/src/pages/Signin/mocks.tsx @@ -120,7 +120,7 @@ export function createMockSigninWebIntegration({ data: new IntegrationData(new GenericData({})), isDesktopSync: () => false, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices(), wantsLogin: () => false, @@ -149,7 +149,7 @@ export function createMockSigninOAuthNativeSyncIntegration({ data: new IntegrationData(new GenericData({})), isDesktopSync: () => isSync && !isMobile, isFirefoxClientServiceRelay: () => !isSync && !isMobile, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => !isSync && !isMobile, getWebChannelServices: mockGetWebChannelServices({ isSync }), wantsLogin: () => false, @@ -184,7 +184,7 @@ export function createMockSigninOAuthIntegration({ isDesktopSync: () => isSync, data: new IntegrationData(new GenericData({})), isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices({ isSync }), getCmsInfo: () => cmsInfo, @@ -203,7 +203,7 @@ export function createMockSigninOAuthNativeIntegration({ isMobile?: boolean; } = {}): SigninOAuthIntegration { const isRelay = service === OAuthNativeServices.Relay; - const isAiWindow = service === OAuthNativeServices.AiWindow; + const isSmartWindow = service === OAuthNativeServices.SmartWindow; return { type: IntegrationType.OAuthNative, getService: () => service, @@ -214,12 +214,12 @@ export function createMockSigninOAuthNativeIntegration({ isDesktopSync: () => isSync && !isMobile, data: new IntegrationData(new GenericData({})), isFirefoxClientServiceRelay: () => isRelay, - isFirefoxClientServiceAiWindow: () => isAiWindow, - isFirefoxNonSync: () => isRelay || isAiWindow, + isFirefoxClientServiceSmartWindow: () => isSmartWindow, + isFirefoxNonSync: () => isRelay || isSmartWindow, getWebChannelServices: mockGetWebChannelServices({ isSync, isRelay, - isAiWindow, + isSmartWindow, }), getClientId: () => MOCK_CLIENT_ID, getCmsInfo: () => undefined, diff --git a/packages/fxa-settings/src/pages/Signin/utils.test.ts b/packages/fxa-settings/src/pages/Signin/utils.test.ts index 7e548fc0c7b..eb539af207e 100644 --- a/packages/fxa-settings/src/pages/Signin/utils.test.ts +++ b/packages/fxa-settings/src/pages/Signin/utils.test.ts @@ -84,11 +84,11 @@ describe('Signin utils', () => { expect(hardNavigateSpy).not.toHaveBeenCalled(); }); - it('sends fxaLogin with aiwindow services and navigates to settings for OAuthNative service=aiwindow', async () => { + it('sends fxaLogin with smartwindow services and navigates to settings for OAuthNative service=smartwindow', async () => { const navigationOptions = createBaseNavigationOptions({ integration: createMockSigninOAuthNativeIntegration({ isSync: false, - service: OAuthNativeServices.AiWindow, + service: OAuthNativeServices.SmartWindow, }), performNavigation: true, handleFxaLogin: true, @@ -100,7 +100,7 @@ describe('Signin utils', () => { sessionToken: MOCK_SESSION_TOKEN, uid: MOCK_UID, verified: true, - services: { aiwindow: {} }, + services: { smartwindow: {} }, }); expect(result.error).toBeUndefined(); expect(navigateSpy).toHaveBeenCalledWith('/settings', { replace: true }); diff --git a/packages/fxa-settings/src/pages/Signup/ConfirmSignupCode/interfaces.ts b/packages/fxa-settings/src/pages/Signup/ConfirmSignupCode/interfaces.ts index 478b3c774e0..7e171fa0d2e 100644 --- a/packages/fxa-settings/src/pages/Signup/ConfirmSignupCode/interfaces.ts +++ b/packages/fxa-settings/src/pages/Signup/ConfirmSignupCode/interfaces.ts @@ -46,7 +46,7 @@ export type ConfirmSignupCodeBaseIntegration = Pick< | 'getService' | 'getClientId' | 'isFirefoxClientServiceRelay' - | 'isFirefoxClientServiceAiWindow' + | 'isFirefoxClientServiceSmartWindow' | 'isFirefoxNonSync' | 'isSync' | 'getCmsInfo' @@ -63,7 +63,7 @@ export type ConfirmSignupCodeOAuthIntegration = Pick< | 'isSync' | 'getPermissions' | 'isFirefoxClientServiceRelay' - | 'isFirefoxClientServiceAiWindow' + | 'isFirefoxClientServiceSmartWindow' | 'isFirefoxNonSync' | 'getCmsInfo' | 'isFirefoxMobileClient' diff --git a/packages/fxa-settings/src/pages/Signup/container.test.tsx b/packages/fxa-settings/src/pages/Signup/container.test.tsx index da1365711a1..9c09f4d39b7 100644 --- a/packages/fxa-settings/src/pages/Signup/container.test.tsx +++ b/packages/fxa-settings/src/pages/Signup/container.test.tsx @@ -58,7 +58,7 @@ function mockIntegration() { isSync: () => true, wantsKeys: () => true, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices({ isSync: true }), getCmsInfo: () => undefined, diff --git a/packages/fxa-settings/src/pages/Signup/index.stories.tsx b/packages/fxa-settings/src/pages/Signup/index.stories.tsx index bf75ce4fe8d..6193b00e4fd 100644 --- a/packages/fxa-settings/src/pages/Signup/index.stories.tsx +++ b/packages/fxa-settings/src/pages/Signup/index.stories.tsx @@ -95,10 +95,10 @@ export const WithThirdPartyAuthServiceRelayIntegration = () => ( /> ); -export const WithThirdPartyAuthServiceAIWindowIntegration = () => ( +export const WithThirdPartyAuthServiceSmartWindowIntegration = () => ( { ).toBeInTheDocument(); }); - it('renders third party auth when service=aiwindow and supportsKeysOptionalLogin is true', async () => { + it('renders third party auth when service=smartwindow and supportsKeysOptionalLogin is true', async () => { await act(() => { renderWithLocalizationProvider( undefined, isSync: () => false, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices(), wantsKeys: () => false, @@ -52,7 +52,7 @@ export function createMockSignupSyncDesktopV3Integration(): SignupBaseIntegratio getClientId: () => undefined, isSync: () => true, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices({ isSync: true }), wantsKeys: () => false, @@ -74,7 +74,7 @@ export function createMockSignupOAuthWebIntegration( getClientId: () => clientId || MOCK_CLIENT_ID, isSync: () => false, isFirefoxClientServiceRelay: () => false, - isFirefoxClientServiceAiWindow: () => false, + isFirefoxClientServiceSmartWindow: () => false, isFirefoxNonSync: () => false, getWebChannelServices: mockGetWebChannelServices(), wantsKeys: () => false, @@ -89,7 +89,7 @@ export function createMockSignupOAuthNativeIntegration( cmsInfo?: RelierCmsInfo ): SignupOAuthIntegration { const isRelay = service === OAuthNativeServices.Relay; - const isAiWindow = service === OAuthNativeServices.AiWindow; + const isSmartWindow = service === OAuthNativeServices.SmartWindow; return { type: IntegrationType.OAuthNative, getRedirectUri: () => MOCK_REDIRECT_URI, @@ -98,12 +98,12 @@ export function createMockSignupOAuthNativeIntegration( getClientId: () => MOCK_CLIENT_ID, isSync: () => isSync, isFirefoxClientServiceRelay: () => isRelay, - isFirefoxClientServiceAiWindow: () => isAiWindow, - isFirefoxNonSync: () => isRelay || isAiWindow, + isFirefoxClientServiceSmartWindow: () => isSmartWindow, + isFirefoxNonSync: () => isRelay || isSmartWindow, getWebChannelServices: mockGetWebChannelServices({ isSync, isRelay, - isAiWindow, + isSmartWindow, }), wantsKeys: () => true, getCmsInfo: () => cmsInfo, diff --git a/packages/fxa-settings/src/pages/mocks.tsx b/packages/fxa-settings/src/pages/mocks.tsx index 72e83fad0a6..d5df38fc4f2 100644 --- a/packages/fxa-settings/src/pages/mocks.tsx +++ b/packages/fxa-settings/src/pages/mocks.tsx @@ -194,18 +194,18 @@ export const createMockIntegrationWithCms = () => export function mockGetWebChannelServices({ isSync = false, isRelay = false, - isAiWindow = false, + isSmartWindow = false, }: { isSync?: boolean; isRelay?: boolean; - isAiWindow?: boolean; + isSmartWindow?: boolean; } = {}) { return (syncEngines?: SyncEngines): WebChannelServices | undefined => { if (isRelay) { return { relay: {} }; } - if (isAiWindow) { - return { aiwindow: {} }; + if (isSmartWindow) { + return { smartwindow: {} }; } if (isSync) { return { sync: syncEngines || {} };