feat: one2one migrated to mls system message [WPB-6195] #16560

PatrykBuniX · 2024-01-19T13:23:41Z

WPB-6195 [Web] Insert a system message after migrating 1:1 conversation

Description

When Proteus 1:1 conversation gets migrated to MLS protocol, we should inform the user about it and inject a system message into the conversation.

Checklist

PR has been self reviewed by the author;
Hard-to-understand areas of the code have been commented;
If it is a core feature, unit tests have been added;

codecov · 2024-01-19T13:27:48Z

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release/q1-2024@e11ff03). Click here to learn what that means.

❗ Current head 8a8d58c differs from pull request most recent head fea1762. Consider uploading reports for the commit fea1762 to get more accurate results

Additional details and impacted files

@@                Coverage Diff                 @@
##             release/q1-2024   #16560   +/-   ##
==================================================
  Coverage                   ?   45.38%           
==================================================
  Files                      ?      743           
  Lines                      ?    24299           
  Branches                   ?     5526           
==================================================
  Hits                       ?    11029           
  Misses                     ?    11858           
  Partials                   ?     1412

przemvs · 2024-01-19T13:37:27Z

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

@@ -27,6 +27,7 @@ import {JoinedAfterMLSMigrationFinalisationMessage} from 'src/script/entity/mess
 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 {One2OneMigratedToMlsMessage} from 'src/script/entity/message/One2OneMigratedToMlsMessage';


Hmm.. I think we have different Event names OneToOne[...], so please rename to OneToOneMigratedToMLSMessage

przemvs · 2024-01-19T13:39:08Z

src/script/conversation/ConversationRepository.ts

+    const wasProteusConnectionIncomingRequest = proteusConversations.some(
+      conversation => conversation.type() === CONVERSATION_TYPE.CONNECT,
+    );


We have ConversationSelectors, so maybe move this to ConversationSelector, isConnectConversation ? WDYT ?

PatrykBuniX · 2024-01-22T09:57:21Z

src/script/conversation/ConversationRepository.ts

-      if (connectionEntity.isConnected()) {
-        conversation.type(CONVERSATION_TYPE.ONE_TO_ONE);
-      }


This part was moved to initProteus1to1Conversation method - no need to run this on mls 1:1 - it's always of type ONE_TO_ONE.

PatrykBuniX · 2024-01-22T09:58:27Z

src/script/conversation/ConversationRepository.ts

-      proteusConversations.some(conversation => this.conversationState.isActiveConversation(conversation));
+    // Because of the current architecture and the fact that we present a connection request as a conversation of connect type,
+    // we don't want to inject conversation migrated even if the only proteus 1:1 conversation we had was a connection request.
+    if (!wasProteusConnectionIncomingRequest) {


We don't want the message to be injected if mls 1:1 was created right after accepting a connection (proteus 1:1 conversation was never used)

src/script/conversation/ConversationRepository.ts

Co-authored-by: Thomas Belin <[email protected]>

* feat: add system message for 1:1 conversation migrated to mls * test: check if message was injected * refactor: improve naming * refactor: add check for connection request to conversation selectors * runfix: change type to 1:1 only in init proteus method * runfix: always blacklist proteus 1:1 if its being migrated to mls * refactor: improve naming * docs: type Co-authored-by: Thomas Belin <[email protected]> --------- Co-authored-by: Thomas Belin <[email protected]>

) * feat: add system message for 1:1 conversation migrated to mls * test: check if message was injected * refactor: improve naming * refactor: add check for connection request to conversation selectors * runfix: change type to 1:1 only in init proteus method * runfix: always blacklist proteus 1:1 if its being migrated to mls * refactor: improve naming * docs: type --------- Co-authored-by: Patryk Górka <[email protected]> Co-authored-by: Thomas Belin <[email protected]>

* runfix: add e2ei-verification type to expected events (#16554) * runfix: exclude self mls conversation from setting verification state * refactor: simplify if statement * chore: unstuck ci please * chore: Make sure entire repo is fetched when cherry-picking release commits * feat: one2one migrated to mls system message [WPB-6195] (#16560) * feat: add system message for 1:1 conversation migrated to mls * test: check if message was injected * refactor: improve naming * refactor: add check for connection request to conversation selectors * runfix: change type to 1:1 only in init proteus method * runfix: always blacklist proteus 1:1 if its being migrated to mls * refactor: improve naming * docs: type Co-authored-by: Thomas Belin <[email protected]> --------- Co-authored-by: Thomas Belin <[email protected]> * feat: update download path (#16460) * feat: initial code for listening to feature change * feat: catch team dl path event * feat: small updates for type changes and passing event correctly to wrapper * chore: updates for catching download path on restart * feat: add modal for catching feature changes * test: extend/fix tests * fix: Read indicator design improvements (#16591) * fix: Read indicator desing improvements * add padding-left for reactions * fix cursor * fix: don't load self convo's messages into memory [WPB-6166] (#16589) * fix: don't load self convo's messages into memory * [tmp] * test: update tests * refactor: improve naming * test: fix tests * test: simplify generating a convo * refactor: Remove oidcproxy (#16596) * fix: when grace period is over select the enrollment type based on certificate availability (#16599) * chore: upgrade CoreCrypto to rc31 (#16598) * ci: set more fields and retry (#16586) * feat: bump core with new core-crypto (#16603) * fix: read indicator images improvements (#16605) * fix: read indicator images improvements * fixes * fix image asset width * runfix: Fix enrolling to e2ei with non-ascii user name (#16607) * chore: Fix running CI jobs on cherry-picked commits (#16609) * chore: Auto merge cherry picked commits to dev (#16611) * chore: Auto merge cherry picked commits to dev * fix naming * fix target * fix naming * chore: Fix permission for flagging auto cherry picked PR * test: gh ci test * test: revert gh ci test This reverts commit 757aa10. * chore: Fix permission for cherry-pick job * chore: fix tagging auto merge PR * chore: use github token to auto approve PR * chore: Auto merge PR from otto-the-bot and dependabot (#16616) * chore: Auto merge PR from otto-the-bot and dependabot * removeme * fix config * fixup * fix: Enforce download path change if featureStatus is not changed (#16623) * feat: show modal if feature status unchanged * fix: test/functionality * chore: Trigger publish job on release branches (#16624) * chore: Fix docker images tag no slashes are allowed in quay.io image tags * runfix: Deregister the single instance of the app as late as possible (#16627) * runfix: address read indicator design review (WPB-5369) (#16629) * runfix: assign max-width to all assets * remove read indicator from message header * feat: group messages sent within a short timeframe (WPB-6237) (#16631) * feat: group messages sent within a short timeframe (WPB-6237) * use TIME_IN_MILLIS util * chore: Make cherry-pick PR title semantically correct (#16632) * chore: Fix renaming PR job * chore: fix action token * chore: fix renaming job access token * chore: Make sure we have the repo when renaming PR * chore: use PR urls * runfix: position system message timestamps correctly (#16640) * feat: Do not load all team members on app load [WPB-4553 WPB-4548] (#16160) (#16258) * feat: Do not load all team members on app load [WPB-4553 WPB-4548 WPB-1912] (#16160) * fix: bring back subscribing to team members changes * fix e2eiHandler error --------- Co-authored-by: Thomas Belin <[email protected]> * feat(e2ei): link renew certificate action with UI button (#16643) * feat(e2ei): link cert renewal with ui button * chore: remove comment * fix: tests * runfix: make assets use all available width (#16646) * feat: client certificate revocation list [WPB-3232] (#16649) * feat: handle conversation state every time crl changes * feat: show modal if self client's cert is revoked * test: fix tests by updating mocks * runfix: cover validating slef crl with try catch * chore: remove node script * chore: bump core * runfix: bump core with rolled back core-crypto to vrc33 * feat: client certificate revocation list [WPB-3232] (#16649) * feat: handle conversation state every time crl changes * feat: show modal if self client's cert is revoked * test: fix tests by updating mocks * runfix: cover validating slef crl with try catch * chore: remove node script * chore: bump core * runfix: bump core with rolled back core-crypto to vrc33 * runfix: address read indicator design review (WPB-5369) (#16629) * runfix: assign max-width to all assets * remove read indicator from message header * chore: Make cherry-pick PR title semantically correct (#16632) * chore: Fix renaming PR job * chore: fix renaming job access token --------- Co-authored-by: Patryk Górka <[email protected]> Co-authored-by: Timothy LeBon <[email protected]> Co-authored-by: Przemysław Jóźwik <[email protected]> Co-authored-by: Arjita <[email protected]> Co-authored-by: Stefan Matting <[email protected]> Co-authored-by: Virgile <[email protected]> Co-authored-by: Amir Ghezelbash <[email protected]> Co-authored-by: Adrian Weiß <[email protected]>

PatrykBuniX requested review from otto-the-bot and a team as code owners January 19, 2024 13:23

otto-the-bot added type: feature / request ✨ 👕 size: S labels Jan 19, 2024

przemvs reviewed Jan 19, 2024

View reviewed changes

otto-the-bot added 👕 size: M and removed 👕 size: S labels Jan 19, 2024

PatrykBuniX commented Jan 22, 2024

View reviewed changes

PatrykBuniX added 7 commits January 22, 2024 11:04

feat: add system message for 1:1 conversation migrated to mls

0eb7551

test: check if message was injected

ef7ce65

refactor: improve naming

b3c00e8

refactor: add check for connection request to conversation selectors

f99f934

runfix: change type to 1:1 only in init proteus method

6a1ad36

runfix: always blacklist proteus 1:1 if its being migrated to mls

1643edf

refactor: improve naming

8a8d58c

PatrykBuniX force-pushed the feat/one2one-migrated-to-mls-system-message branch from ec7bb00 to 8a8d58c Compare January 22, 2024 10:04

PatrykBuniX changed the base branch from dev to release/q1-2024 January 22, 2024 10:05

PatrykBuniX changed the title ~~feat: one2one migrated to mls system message~~ feat: one2one migrated to mls system message [WPB-6195] Jan 22, 2024

atomrc reviewed Jan 22, 2024

View reviewed changes

src/script/conversation/ConversationRepository.ts Outdated Show resolved Hide resolved

docs: type

e8b1097

Co-authored-by: Thomas Belin <[email protected]>

atomrc approved these changes Jan 22, 2024

View reviewed changes

PatrykBuniX enabled auto-merge (squash) January 22, 2024 10:19

PatrykBuniX added 3 commits January 22, 2024 11:58

chore: unstuck ci please

9e5f95c

chore: unstuck ci please 2

fea1762

chore: unstuck ci please 3

e5782ce

PatrykBuniX merged commit 844b0db into release/q1-2024 Jan 22, 2024
9 checks passed

PatrykBuniX deleted the feat/one2one-migrated-to-mls-system-message branch January 22, 2024 15:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: one2one migrated to mls system message [WPB-6195] #16560

feat: one2one migrated to mls system message [WPB-6195] #16560

PatrykBuniX commented Jan 19, 2024 •

edited by github-actions bot

Loading

codecov bot commented Jan 19, 2024 •

edited

Loading

przemvs Jan 19, 2024

przemvs Jan 19, 2024

PatrykBuniX Jan 22, 2024

PatrykBuniX Jan 22, 2024

feat: one2one migrated to mls system message [WPB-6195] #16560

feat: one2one migrated to mls system message [WPB-6195] #16560

Conversation

PatrykBuniX commented Jan 19, 2024 • edited by github-actions bot Loading

Description

Checklist

codecov bot commented Jan 19, 2024 • edited Loading

Codecov Report

przemvs Jan 19, 2024

Choose a reason for hiding this comment

przemvs Jan 19, 2024

Choose a reason for hiding this comment

PatrykBuniX Jan 22, 2024

Choose a reason for hiding this comment

PatrykBuniX Jan 22, 2024

Choose a reason for hiding this comment

PatrykBuniX commented Jan 19, 2024 •

edited by github-actions bot

Loading

codecov bot commented Jan 19, 2024 •

edited

Loading