Skip to content

Revert "fix: Editing encrypted message attachment description" #37453

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
amaricbrown04-maker wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Revert "fix: Editing encrypted message attachment description" #37453

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
6 changes: 0 additions & 6 deletions .changeset/healthy-colts-notice.md
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
isQuoteAttachment,
isTranslatedAttachment,
isTranslatedMessage,
isEncryptedMessageAttachment,
} from '@rocket.chat/core-typings';
import type { Options, Root } from '@rocket.chat/message-parser';
import { parse } from '@rocket.chat/message-parser';
Expand Down Expand Up @@ -78,10 +77,9 @@ export const parseMessageAttachment = <T extends MessageAttachment>(
'';

if (isFileAttachment(attachment) && attachment.description) {
attachment.descriptionMd =
translated || isEncryptedMessageAttachment(attachment)
? textToMessageToken(text, parseOptions)
: (attachment.descriptionMd ?? textToMessageToken(text, parseOptions));
attachment.descriptionMd = translated
? textToMessageToken(text, parseOptions)
: (attachment.descriptionMd ?? textToMessageToken(text, parseOptions));
}

return {
Expand Down
14 changes: 1 addition & 13 deletions apps/meteor/tests/e2e/e2e-encryption/e2ee-file-encryption.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test.describe('E2EE File Encryption', () => {
await page.goto('/home');
});

test('File and description encryption and editing the description', async ({ page }) => {
test('File and description encryption', async ({ page }) => {
await test.step('create an encrypted channel', async () => {
const channelName = faker.string.uuid();

Expand All @@ -59,18 +59,6 @@ test.describe('E2EE File Encryption', () => {
await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
await expect(poHomeChannel.content.lastMessageFileName).toContainText('any_file1.txt');
});

await test.step('edit the description', async () => {
await poHomeChannel.content.openLastMessageMenu();
await poHomeChannel.content.btnOptionEditMessage.click();

expect(await poHomeChannel.composer.inputValue()).toBe('any_description');

await poHomeChannel.content.inputMessage.fill('edited any_description');
await page.keyboard.press('Enter');

await expect(poHomeChannel.content.getFileDescription).toHaveText('edited any_description');
});
});

test('File encryption with whitelisted and blacklisted media types', async ({ page, api }) => {
Expand Down
8 changes: 0 additions & 8 deletions packages/core-typings/src/IMessage/MessageAttachment/MessageAttachmentBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@ export type MessageAttachmentBase = {
sha256: string;
};
};

export type EncryptedMessageAttachment = MessageAttachmentBase & {
encryption: Required<MessageAttachmentBase>['encryption'];
};

export const isEncryptedMessageAttachment = (attachment: MessageAttachmentBase): attachment is EncryptedMessageAttachment => {
return attachment?.encryption !== undefined && typeof attachment.encryption === 'object';
};