Skip to content

fix(settings): support Multi-Account Containers in WebChannel status requests #19933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sreecharan-desu wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −6
Open

fix(settings): support Multi-Account Containers in WebChannel status requests #19933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/fxa-settings/src/components/App/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ const ResetPasswordConfirmedContainer = lazy(
);
const ResetPasswordWithRecoveryKeyVerifiedContainer = lazy(
() =>
import(
'../../pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/container'
)
import('../../pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified/container')
);
const CompleteSigninContainer = lazy(
() => import('../../pages/Signin/CompleteSignin/container')
Expand Down Expand Up @@ -228,7 +226,8 @@ export const App = ({
integration.data.context || '',
// TODO with React pairing flow, update this if pairing flow
false,
integration.data.service || ''
integration.data.service || '',
integration.data.userContextId
);
}

Expand Down
5 changes: 4 additions & 1 deletion packages/fxa-settings/src/lib/channels/firefox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type FxAStatusRequest = {
service: string; // ex. 'sync'
isPairing: boolean;
context: string; // ex. 'fx_desktop_v3'
userContextId?: string;
};

export type FxAStatusResponse = {
Expand Down Expand Up @@ -382,7 +383,8 @@ export class Firefox extends EventTarget {
async requestSignedInUser(
context: string,
isPairing: boolean,
service: string
service: string,
userContextId?: string
): Promise<undefined | SignedInUser> {
let timeoutId: number;
return Promise.race<undefined | SignedInUser>([
Expand All @@ -406,6 +408,7 @@ export class Firefox extends EventTarget {
context,
isPairing,
service,
userContextId,
});
});
}),
Expand Down
11 changes: 10 additions & 1 deletion packages/fxa-settings/src/models/integrations/data/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ import {
KeyTransforms as T,
ModelDataProvider,
} from '../../../lib/model-data';
import { IsEmailOrEmpty, IsFxaRedirectToUrl, IsFxaRedirectUri } from '../../../lib/validation';
import {
IsEmailOrEmpty,
IsFxaRedirectToUrl,
IsFxaRedirectUri,
} from '../../../lib/validation';

/**
* Base integration class. Fields in this class represents data commonly accessed across many pages and is useful for various flows.
Expand Down Expand Up @@ -115,6 +119,11 @@ export class IntegrationData extends ModelDataProvider {
@IsString()
@bind(T.snakeCase)
flowBeginTime: string | undefined;

@IsOptional()
@IsString()
@bind(T.snakeCase)
userContextId: string | undefined;
}

/**
Expand Down