feat: mls migration

server/config/client.config.ts

@@ -71,11 +71,11 @@
       SHOW_LOADING_INFORMATION: env.FEATURE_SHOW_LOADING_INFORMATION == 'true',
       USE_CORE_CRYPTO: env.FEATURE_USE_CORE_CRYPTO == 'true',
       MAX_USERS_TO_PING_WITHOUT_ALERT:
         (env.FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT && Number(env.FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT)) || 4,
     },
     MAX_GROUP_PARTICIPANTS: (env.MAX_GROUP_PARTICIPANTS && Number(env.MAX_GROUP_PARTICIPANTS)) || 500,
     MAX_VIDEO_PARTICIPANTS: (env.MAX_VIDEO_PARTICIPANTS && Number(env.MAX_VIDEO_PARTICIPANTS)) || 4,
     NEW_PASSWORD_MINIMUM_LENGTH: (env.NEW_PASSWORD_MINIMUM_LENGTH && Number(env.NEW_PASSWORD_MINIMUM_LENGTH)) || 8,
     URL: {
       ACCOUNT_BASE: env.URL_ACCOUNT_BASE,
       MOBILE_BASE: env.URL_MOBILE_BASE,
@@ -93,6 +93,7 @@
         INDEX: env.URL_SUPPORT_INDEX,
         LEGAL_HOLD_BLOCK: env.URL_SUPPORT_LEGAL_HOLD_BLOCK,
         MICROPHONE_ACCESS_DENIED: env.URL_SUPPORT_MICROPHONE_ACCESS_DENIED,
+        MLS_LEARN_MORE: env.URL_SUPPORT_MLS_LEARN_MORE,
         PRIVACY_VERIFY_FINGERPRINT: env.URL_SUPPORT_PRIVACY_VERIFY_FINGERPRINT,
         SCREEN_ACCESS_DENIED: env.URL_SUPPORT_SCREEN_ACCESS_DENIED,
         NON_FEDERATING_INFO: env.URL_SUPPORT_NON_FEDERATING_INFO,

server/config/env.ts

@@ -240,6 +240,8 @@ export type Env = {
 
   URL_SUPPORT_LEGAL_HOLD_BLOCK: string;
 
+  URL_SUPPORT_MLS_LEARN_MORE: string;
+
   URL_SUPPORT_MICROPHONE_ACCESS_DENIED: string;
 
   URL_SUPPORT_PRIVACY_VERIFY_FINGERPRINT: string;

src/__mocks__/@wireapp/core.ts

@@ -36,12 +36,14 @@ export class Account extends EventEmitter {
   service = {
     mls: {
       schedulePeriodicKeyMaterialRenewals: jest.fn(),
+      addUsersToExistingConversation: jest.fn(),
+      conversationExists: jest.fn(),
+      wipeConversation: jest.fn(),
       registerConversation: jest.fn(),
       getGroupIdFromConversationId: jest.fn(),
       renewKeyMaterial: jest.fn(),
       getClientIds: jest.fn(),
       getEpoch: jest.fn(),
-      conversationExists: jest.fn(),
       exportSecretKey: jest.fn(),
       on: this.on,
       emit: this.emit,
@@ -56,13 +58,16 @@ export class Account extends EventEmitter {
       mlsGroupExistsLocally: jest.fn(),
       joinByExternalCommit: jest.fn(),
       addUsersToMLSConversation: jest.fn(),
-      isMLSGroupEstablishedLocally: jest.fn(),
-      establishMLS1to1Conversation: jest.fn(),
+      removeUserFromConversation: jest.fn(),
+      removeUsersFromMLSConversation: jest.fn(),
+      wipeMLSConversation: jest.fn(),
+      addUsersToProteusConversation: jest.fn(),
       messageTimer: {
         setConversationLevelTimer: jest.fn(),
       },
-      removeUsersFromMLSConversation: jest.fn(),
-      removeUserFromConversation: jest.fn(),
+      tryEstablishingMLSGroup: jest.fn(),
+      isMLSGroupEstablishedLocally: jest.fn(),
+      establishMLS1to1Conversation: jest.fn(),
       blacklistConversation: jest.fn(),
       removeConversationFromBlacklist: jest.fn(),
     },

src/i18n/en-US.json

@@ -435,6 +435,8 @@
   "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
+  "conversationJoinedAfterMLSMigrationFinalisation": "You haven’t updated this device for a while. In the meantime, the standard messaging protocol changed from Proteus to Messaging Layer Security (MLS). Due to this change, some messages may not appear here. [link]Learn more about MLS[/link]",
+  "conversationMLSMigrationFinalisationOngoingCall": "Due to migration to MLS, you might have issues with your current call. If that's the case, hang up and call again.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
   "conversationModalRestrictedFileSharingHeadline": "File sharing restrictions",
   "conversationMultipleMembersRemovedMissingLegalHoldConsent": "{{users}} were removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
@@ -482,6 +484,9 @@
   "conversationYouAccusative": "you",
   "conversationYouDative": "you",
   "conversationYouNominative": "you",
+  "conversationProtocolUpdatedToMixedPart1": "The standard messaging protocol is changing from Proteus to the new Messaging Layer Security (MLS). [link]Learn more about MLS[/link]",
+  "conversationProtocolUpdatedToMixedPart2": "Ensure you use the latest version of Wire to be ready for MLS and continue communicating seamlessly.",
+  "conversationProtocolUpdatedToMLS": "This conversation now uses the new Messaging Layer Security (MLS) protocol. To communicate seamlessly, always use the latest version of Wire on your devices. [link]Learn more about MLS[/link]",
   "conversationYouRemovedMissingLegalHoldConsent": "[bold]You[/bold] were removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationsAllArchived": "Everything archived",
   "conversationsConnectionRequestMany": "{{number}} people waiting",

src/script/backup/BackupRepository.test.ts

@@ -200,11 +200,12 @@ describe('BackupRepository', () => {
     it('successfully imports a backup', async () => {
       const [backupRepository, {backupService, conversationRepository}] = await buildBackupRepository();
       const user = new User('user1');
-      jest.spyOn(backupService, 'getDatabaseVersion').mockReturnValue(15);
+      const mockedDBVersion = 20;
+      jest.spyOn(backupService, 'getDatabaseVersion').mockReturnValue(mockedDBVersion);
       const importSpy = jest.spyOn(backupService, 'importEntities').mockResolvedValue(1);
       const users = [generateAPIUser(), generateAPIUser()];
 
-      const metadata = {...backupRepository.createMetaData(user, 'client1'), version: 15};
+      const metadata = {...backupRepository.createMetaData(user, 'client1'), version: mockedDBVersion};
 
       const files = {
         [Filename.METADATA]: JSON.stringify(metadata),

src/script/calling/Call.ts

@@ -60,6 +60,7 @@ export class Call {
   public currentPage: ko.Observable<number> = ko.observable(0);
   public pages: ko.ObservableArray<Participant[]> = ko.observableArray();
   readonly maximizedParticipant: ko.Observable<Participant | null>;
+  public readonly isActive: ko.PureComputed<boolean>;
 
   private readonly audios: Record<string, {audioElement: HTMLAudioElement; stream: MediaStream}> = {};
   /**
@@ -97,6 +98,9 @@ export class Call {
     this.muteState(isMuted ? MuteState.SELF_MUTED : MuteState.NOT_MUTED);
     this.isConference = [CONV_TYPE.CONFERENCE, CONV_TYPE.CONFERENCE_MLS].includes(this.conversationType);
     this.isGroupOrConference = this.isConference || this.conversationType === CONV_TYPE.GROUP;
+    this.isActive = ko.pureComputed(() =>
+      [CALL_STATE.OUTGOING, CALL_STATE.ANSWERED, CALL_STATE.MEDIA_ESTAB].includes(this.state()),
+    );
   }
 
   get hasWorkingAudioInput(): boolean {

src/script/components/MessagesList/Message/MessageWrapper.tsx

@@ -262,8 +262,10 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
   if (message.isFileTypeRestricted()) {
     return <FileTypeRestrictedMessage message={message} />;
   }
+
   if (message.isMissed()) {
     return <MissedMessage />;
   }
+
   return null;
 };

src/script/components/MessagesList/Message/ProtocolUpdateMessage/ProtocolUpdateMessage.tsx

@@ -0,0 +1,60 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
+
+import {Icon} from 'Components/Icon';
+import {Config} from 'src/script/Config';
+import {ProtocolUpdateMessage as ProtocolUpdateMessageEntity} from 'src/script/entity/message/ProtocolUpdateMessage';
+import {SystemMessage} from 'src/script/entity/message/SystemMessage';
+import {replaceLink, t} from 'Util/LocalizerUtil';
+
+import {SystemMessageBase} from '../SystemMessage/SystemMessageBase';
+
+interface ProtocolUpdateMessageProps {
+  message: ProtocolUpdateMessageEntity;
+}
+
+const createSystemMessage = (caption: string) => {
+  const message = new SystemMessage();
+  message.caption = caption;
+  return message;
+};
+
+export const ProtocolUpdateMessage = ({message}: ProtocolUpdateMessageProps) => {
+  if (message.protocol === ConversationProtocol.MIXED) {
+    const captions = [
+      t('conversationProtocolUpdatedToMixedPart1', {}, replaceLink(Config.getConfig().URL.SUPPORT.MLS_LEARN_MORE)),
+      t('conversationProtocolUpdatedToMixedPart2'),
+    ];
+    const messages = captions.map(createSystemMessage);
+    return (
+      <>
+        {messages.map(message => (
+          <SystemMessageBase key={message.caption} icon={<Icon.Info />} message={message} />
+        ))}
+      </>
+    );
+  }
+
+  const migratedToMLSMessage = createSystemMessage(
+    t('conversationProtocolUpdatedToMLS', {}, replaceLink(Config.getConfig().URL.SUPPORT.MLS_LEARN_MORE)),
+  );
+  return <SystemMessageBase message={migratedToMLSMessage} icon={<Icon.Info />} />;
+};

src/script/components/MessagesList/Message/ProtocolUpdateMessage/index.ts

@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './ProtocolUpdateMessage';

src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx

@@ -20,14 +20,19 @@
 import React from 'react';
 
 import {Icon} from 'Components/Icon';
+import {JoinedAfterMLSMigrationFinalisationMessage} from 'src/script/entity/message/JoinedAfterMLSMigrationFinalisationMessage';
 import {MessageTimerUpdateMessage} from 'src/script/entity/message/MessageTimerUpdateMessage';
 import {MLSConversationRecoveredMessage} from 'src/script/entity/message/MLSConversationRecoveredMessage';
+import {MLSMigrationFinalisationOngoingCallMessage} from 'src/script/entity/message/MLSMigrationFinalisationOngoingCallMessage';
+import {ProtocolUpdateMessage} from 'src/script/entity/message/ProtocolUpdateMessage';
 import {ReceiptModeUpdateMessage} from 'src/script/entity/message/ReceiptModeUpdateMessage';
 import {RenameMessage} from 'src/script/entity/message/RenameMessage';
 import {SystemMessage as SystemMessageEntity} from 'src/script/entity/message/SystemMessage';
 
 import {SystemMessageBase} from './SystemMessageBase';
 
+import {ProtocolUpdateMessage as ProtocolUpdateMessageComponent} from '../ProtocolUpdateMessage';
+
 export interface SystemMessageProps {
   message: SystemMessageEntity;
 }
@@ -54,5 +59,17 @@ export const SystemMessage: React.FC<SystemMessageProps> = ({message}) => {
     return <SystemMessageBase message={message} icon={<Icon.Info />} />;
   }
 
+  if (message instanceof ProtocolUpdateMessage) {
+    return <ProtocolUpdateMessageComponent message={message} />;
+  }
+
+  if (message instanceof JoinedAfterMLSMigrationFinalisationMessage) {
+    return <SystemMessageBase message={message} icon={<Icon.Info />} />;
+  }
+
+  if (message instanceof MLSMigrationFinalisationOngoingCallMessage) {
+    return <SystemMessageBase message={message} icon={<Icon.Info />} />;
+  }
+
   return <SystemMessageBase message={message} />;
 };

src/script/components/MessagesList/Message/SystemMessage/SystemMessageBase.tsx

@@ -39,7 +39,9 @@ export const SystemMessageBase: React.FC<SystemMessageProps> = ({message, isSend
       <p className="message-header-label">
         <span className="message-header-label__multiline">
           {isSenderNameVisible && <span className="message-header-sender-name">{unsafeSenderName}</span>}
-          {message.caption && <span className="ellipsis">{message.caption}</span>}
+          {message.caption && (
+            <span className="system-message-caption ellipsis" dangerouslySetInnerHTML={{__html: message.caption}} />
+          )}
         </span>
       </p>
       <div className="message-body-actions">

src/script/conversation/ConversationFilter.test.ts

@@ -66,6 +66,7 @@ describe('ConversationFilter', () => {
         name: 'Florian@Staging11',
         others: ['71e25be1-5433-4647-964d-03a5d9e7c970'],
         protocol: ConversationProtocol.PROTEUS,
+        initial_protocol: ConversationProtocol.PROTEUS,
         qualified_others: undefined,
         receipt_mode: null,
         roles: {},
@@ -116,6 +117,7 @@ describe('ConversationFilter', () => {
         muted_timestamp: 0,
         name: 'Florian@Staging11',
         others: ['71e25be1-5433-4647-964d-03a5d9e7c970'],
+        initial_protocol: ConversationProtocol.PROTEUS,
         protocol: ConversationProtocol.PROTEUS,
         qualified_others: undefined,
         receipt_mode: null,

src/script/conversation/ConversationMapper.ts

@@ -234,8 +234,20 @@ export class ConversationMapper {
       throw new ConversationError(BASE_ERROR_TYPE.INVALID_PARAMETER, BaseError.MESSAGE.INVALID_PARAMETER);
     }
 
-    const {creator, id, members, name, others, qualified_others, type, group_id, epoch, protocol, cipher_suite} =
-      conversationData;
+    const {
+      creator,
+      id,
+      members,
+      name,
+      others,
+      qualified_others,
+      type,
+      group_id,
+      epoch,
+      protocol,
+      cipher_suite,
+      initial_protocol,
+    } = conversationData;
 
     let conversationEntity = new Conversation(
       id,
@@ -246,6 +258,7 @@ export class ConversationMapper {
 
     conversationEntity.creator = creator;
     conversationEntity.groupId = group_id;
+    conversationEntity.initialProtocol = initial_protocol || protocol;
     conversationEntity.epoch = epoch ?? -1;
     conversationEntity.cipherSuite = cipher_suite;
     conversationEntity.type(type);