Skip to content

fix(settings): group connected services by deviceId to avoid name merging #19931

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
Open

fix(settings): group connected services by deviceId to avoid name merging #19931

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
26 changes: 12 additions & 14 deletions packages/fxa-settings/src/components/Settings/ConnectedServices/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ const DEVICES_SUPPORT_URL =
export function sortAndFilterConnectedClients(
attachedClients: Array<AttachedClient>
) {
const groupedByName = groupBy(attachedClients, 'name');
const groupedByDevice = groupBy(attachedClients, (c) => c.deviceId || c.name);

// get a unique (by name) list and sort by time last accessed
const sortedAndUniqueClients = Object.keys(groupedByName)
// get a unique (by device or name) list and sort by time last accessed
const sortedAndUniqueClients = Object.keys(groupedByDevice)
.map((key) => {
return groupedByName[key].sort(
return groupedByDevice[key].sort(
(a: AttachedClient, b: AttachedClient) =>
b.lastAccessTime - a.lastAccessTime
)[0];
Expand All @@ -49,14 +49,14 @@ export function sortAndFilterConnectedClients(
}
});

return { groupedByName, sortedAndUniqueClients };
return { groupedByDevice, sortedAndUniqueClients };
}

export const ConnectedServices = forwardRef<HTMLDivElement>((_, ref) => {
const alertBar = useAlertBar();
const account = useAccount();
const attachedClients = account.attachedClients;
const { groupedByName, sortedAndUniqueClients } =
const { groupedByDevice, sortedAndUniqueClients } =
sortAndFilterConnectedClients([...attachedClients]);

const showMobilePromo = !sortedAndUniqueClients.filter(isMobileDevice).length;
Expand Down Expand Up @@ -107,14 +107,12 @@ export const ConnectedServices = forwardRef<HTMLDivElement>((_, ref) => {
// disconnect all clients/sessions with this name since only unique names
// are displayed to the user. This is batched into one network request
// via BatchHttpLink
const groupByKey = client.name ?? 'undefined';
const clientsWithMatchingName = groupedByName[groupByKey];
const hasMultipleSessions = clientsWithMatchingName.length > 1;
const groupByKey = (client.deviceId || client.name) ?? 'undefined';
const sessionsInGroup = groupedByDevice[groupByKey];
const hasMultipleSessions = sessionsInGroup.length > 1;
if (hasMultipleSessions) {
await Promise.all(
clientsWithMatchingName.map(
async (c) => await account.disconnectClient(c)
)
sessionsInGroup.map(async (c) => await account.disconnectClient(c))
);
} else {
await account.disconnectClient(client);
Expand All @@ -125,7 +123,7 @@ export const ConnectedServices = forwardRef<HTMLDivElement>((_, ref) => {
if (
client.isCurrentSession ||
(hasMultipleSessions &&
clientsWithMatchingName.find((c) => c.isCurrentSession))
sessionsInGroup.find((c) => c.isCurrentSession))
) {
clearSignedInAccountUid();
window.location.assign(`${window.location.origin}/signin`);
Expand All @@ -151,7 +149,7 @@ export const ConnectedServices = forwardRef<HTMLDivElement>((_, ref) => {
[
account,
hideConfirmDisconnectModal,
groupedByName,
groupedByDevice,
revealAdviceModal,
alertBar,
l10n,
Expand Down