runfix: prevent user from setting invalid supported protocols list

package.json

@@ -8,9 +8,10 @@
     "@peculiar/x509": "1.9.6",
     "@wireapp/avs": "9.5.2",
     "@wireapp/commons": "5.2.3",
-    "@wireapp/core": "43.2.0",
+    "@wireapp/core": "42.20.0",
     "@wireapp/react-ui-kit": "9.12.3",
     "@wireapp/store-engine-dexie": "2.1.7",
+    "@wireapp/store-engine-sqleet": "1.8.9",
     "@wireapp/webapp-events": "0.18.3",
     "amplify": "https://github.com/wireapp/amplify#head=master",
     "beautiful-react-hooks": "^5.0.1",

src/__mocks__/@wireapp/core.ts

@@ -89,6 +89,12 @@ export class Account extends EventEmitter {
     client: {
       deleteClient: jest.fn(),
     },
+    self: {
+      putSupportedProtocols: jest.fn(),
+    },
+    user: {
+      getUserSupportedProtocols: jest.fn(),
+    },
   };
 }
 

src/script/self/SelfService.ts

@@ -23,14 +23,24 @@ import type {Consent, Self} from '@wireapp/api-client/lib/self/';
 import type {UserUpdate} from '@wireapp/api-client/lib/user/';
 import {container} from 'tsyringe';
 
-import {getLogger} from 'Util/Logger';
-
 import {APIClient} from '../service/APIClientSingleton';
+import {Core} from '../service/CoreSingleton';
 
 export class SelfService {
-  private readonly logger = getLogger('ConversationService');
+  constructor(
+    private readonly apiClient = container.resolve(APIClient),
+    private readonly core = container.resolve(Core),
+  ) {}
+
+  private get coreSelfService() {
+    const selfService = this.core.service?.self;
 
-  constructor(private readonly apiClient = container.resolve(APIClient)) {}
+    if (!selfService) {
+      throw new Error('Self service not available');
+    }
+
+    return selfService;
+  }
 
   deleteSelf(password?: string): Promise<void> {
     return this.apiClient.api.self.deleteSelf({password});
@@ -74,11 +84,6 @@ export class SelfService {
   }
 
   public async putSupportedProtocols(supportedProtocols: ConversationProtocol[]): Promise<void> {
-    if (!this.apiClient.backendFeatures.supportsMLS) {
-      this.logger.warn('Self supported protocols were not updated, because MLS is not supported by the backend');
-      return;
-    }
-
-    return this.apiClient.api.self.putSupportedProtocols(supportedProtocols);
+    return this.coreSelfService.putSupportedProtocols(supportedProtocols);
   }
 }

src/script/user/UserService.ts

@@ -22,6 +22,7 @@ import type {User as APIClientUser, QualifiedHandle, QualifiedId} from '@wireapp
 import {container} from 'tsyringe';
 
 import {APIClient} from '../service/APIClientSingleton';
+import {Core} from '../service/CoreSingleton';
 import {UserRecord} from '../storage';
 import {StorageSchemata} from '../storage/StorageSchemata';
 import {StorageService} from '../storage/StorageService';
@@ -33,10 +34,21 @@ export class UserService {
   constructor(
     private readonly storageService = container.resolve(StorageService),
     private readonly apiClient = container.resolve(APIClient),
+    private readonly core = container.resolve(Core),
   ) {
     this.USER_STORE_NAME = StorageSchemata.OBJECT_STORE.USERS;
   }
 
+  private get coreUserService() {
+    const userService = this.core.service?.user;
+
+    if (!userService) {
+      throw new Error('User service not available');
+    }
+
+    return userService;
+  }
+
   //##############################################################################
   // Database interactions
   //##############################################################################
@@ -154,10 +166,6 @@ export class UserService {
    * Get the list of user's supported protocols.
    */
   public async getUserSupportedProtocols(userId: QualifiedId): Promise<ConversationProtocol[]> {
-    // Clients that uses version below the one supporting MLS, are not aware of MLS, we default to Proteus in this case.
-    if (!this.apiClient.backendFeatures.supportsMLS) {
-      return [ConversationProtocol.PROTEUS];
-    }
-    return this.apiClient.api.user.getUserSupportedProtocols(userId);
+    return this.coreUserService.getUserSupportedProtocols(userId);
   }
 }