runfix: Correctly check if user has mls device before performing mls operations #17344
Conversation
| @@ -443,7 +443,7 @@ export class App { | |||
| // We load all the users the self user is connected with | |||
| await userRepository.loadUsers(selfUser, connections, conversations, teamMembers); | |||
|
|
|||
| if (supportsMLS()) { | |||
| if (this.core.hasMLSDevice) { | |||
There was a problem hiding this comment.
if we have a MLS device it means that:
- the env supportsMLS (previous check)
- the team has MLS enabled
- the user has a valid mls device
(it a more exhaustive check than the previous supportsMLS check)
| // We need to check if the core service is available and if the e2eIdentity is available | ||
| if (!this.core.service?.mls || !this.core.service?.e2eIdentity) { | ||
| if (!this.core.hasMLSDevice || !this.core.service?.e2eIdentity) { |
There was a problem hiding this comment.
is this correct? If so, it doesn't match the code comment anymore right?
There was a problem hiding this comment.
indeed the comment needs updating, good catch :)
The fix is needed though (we should never check if mls is enabled by checking that the service is there, anymore)
There was a problem hiding this comment.
gotcha, I guess we're just not spying on that hasMLSDevice in the unit test then
| @@ -472,7 +472,7 @@ export class App { | |||
|
|
|||
| await conversationRepository.init1To1Conversations(connections, conversations); | |||
|
|
|||
| if (supportsMLS()) { | |||
| if (this.core.hasMLSDevice) { | |||
There was a problem hiding this comment.
this one is the fix to automation correct?
Seems like the change in MLSConversationVerificationStateHandler isn't necessarry? (that's the one breaking unit tests)
There was a problem hiding this comment.
exactly, I'm working on the fix right now :)
|
Description
see https://github.com/wireapp/wire-web-packages/pull/6185/files
Checklist