Skip to content
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

Jump to bottom

Device manager - use deleteAccountData to prune device manager client information events #9734

Merged
merged 2 commits into from
Dec 14, 2022
Merged

Device manager - use deleteAccountData to prune device manager client information events #9734

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12063ed
use deleteAccountData to prune device manager client information events
Dec 12, 2022
65c0cf8
Merge branch 'develop' into psg-872/prune-client-info-events
Dec 14, 2022
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
4 changes: 2 additions & 2 deletions src/utils/device/clientInformation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ export const removeClientInformation = async (
const type = getClientInformationEventType(deviceId);
const clientInformation = getDeviceClientInformation(matrixClient, deviceId);

// if a non-empty client info event exists, overwrite to remove the content
// if a non-empty client info event exists, remove it
if (clientInformation.name || clientInformation.version || clientInformation.url) {
await matrixClient.setAccountData(type, {});
await matrixClient.deleteAccountData(type);
}
};

Expand Down
6 changes: 3 additions & 3 deletions test/DeviceListener-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ describe('DeviceListener', () => {
getDeviceId: jest.fn().mockReturnValue(deviceId),
setAccountData: jest.fn(),
getAccountData: jest.fn(),
deleteAccountData: jest.fn(),
checkDeviceTrust: jest.fn().mockReturnValue(new DeviceTrustLevel(false, false, false, false)),
});
jest.spyOn(MatrixClientPeg, 'get').mockReturnValue(mockClient);
Expand Down Expand Up @@ -192,17 +193,16 @@ describe('DeviceListener', () => {
mockClient!.getAccountData.mockReturnValue(clientInfoEvent);
await createAndStart();

expect(mockClient!.setAccountData).toHaveBeenCalledWith(
expect(mockClient!.deleteAccountData).toHaveBeenCalledWith(
`io.element.matrix_client_information.${deviceId}`,
{},
);
});

it('does not try to remove client info event that are already empty', async () => {
mockClient!.getAccountData.mockReturnValue(emptyClientInfoEvent);
await createAndStart();

expect(mockClient!.setAccountData).not.toHaveBeenCalled();
expect(mockClient!.deleteAccountData).not.toHaveBeenCalled();
});

it('does not save client information on logged in action', async () => {
Expand Down