@wireapp/core 42.19.2 → 42.20.1

package/lib/self/SelfService.d.ts

@@ -1,7 +1,9 @@
+import { ConversationProtocol } from '@wireapp/api-client/lib/conversation';
 import { Self } from '@wireapp/api-client/lib/self/';
 import { APIClient } from '@wireapp/api-client';
 export declare class SelfService {
     private readonly apiClient;
+    private readonly logger;
     constructor(apiClient: APIClient);
     checkUsername(username: string): Promise<boolean>;
     checkUsernames(usernames: string[]): Promise<string[]>;
@@ -10,5 +12,10 @@ export declare class SelfService {
     getUsername(): Promise<string | undefined>;
     setName(name: string): Promise<void>;
     setUsername(username: string): Promise<void>;
+    /**
+     * Update self user's list of supported-protocols
+     * @param supportedProtocols The list of supported protocols
+     */
+    putSupportedProtocols(supportedProtocols: ConversationProtocol[]): Promise<void>;
 }
 //# sourceMappingURL=SelfService.d.ts.map

package/lib/self/SelfService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SelfService.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEnD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEpC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGpD"}
+{"version":3,"file":"SelfService.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAGnD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IAGV,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;gBAElC,SAAS,EAAE,SAAS;IAEpC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;OAGG;IACU,qBAAqB,CAAC,kBAAkB,EAAE,oBAAoB,EAAE;CAY9E"}

package/lib/self/SelfService.js

@@ -17,11 +17,16 @@
  * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelfService = void 0;
+const logdown_1 = __importDefault(require("logdown"));
 class SelfService {
     constructor(apiClient) {
         this.apiClient = apiClient;
+        this.logger = (0, logdown_1.default)('@wireapp/core/SelfService');
     }
     async checkUsername(username) {
         const [availableUsername] = await this.checkUsernames([username]);
@@ -50,5 +55,19 @@ class SelfService {
     setUsername(username) {
         return this.apiClient.api.self.putHandle({ handle: username });
     }
+    /**
+     * Update self user's list of supported-protocols
+     * @param supportedProtocols The list of supported protocols
+     */
+    async putSupportedProtocols(supportedProtocols) {
+        if (!this.apiClient.backendFeatures.supportsMLS) {
+            this.logger.warn('Self supported protocols were not updated, because endpoint is not supported by backend');
+            return;
+        }
+        if (!supportedProtocols || supportedProtocols.length === 0) {
+            throw new Error('Supported protocols must be a non-empty protocols list');
+        }
+        return this.apiClient.api.self.putSupportedProtocols(supportedProtocols);
+    }
 }
 exports.SelfService = SelfService;

package/lib/self/SelfService.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SelfService.test.d.ts.map

package/lib/self/SelfService.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SelfService.test.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.test.ts"],"names":[],"mappings":""}

package/lib/self/SelfService.test.js

@@ -0,0 +1,54 @@
+"use strict";
+/*
+ * 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/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const api_client_1 = require("@wireapp/api-client");
+const SelfService_1 = require("./SelfService");
+const BASE_URL = 'mock-backend.wire.com';
+const MOCK_BACKEND = {
+    name: 'mock',
+    rest: `https://${BASE_URL}`,
+    ws: `wss://${BASE_URL}`,
+};
+describe('SelfService', () => {
+    describe('putSupportedProtocols', () => {
+        const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
+        apiClient.backendFeatures.supportsMLS = true;
+        it('updates the list of self supported protocols', async () => {
+            const selfService = new SelfService_1.SelfService(apiClient);
+            const supportedProtocols = [conversation_1.ConversationProtocol.PROTEUS, conversation_1.ConversationProtocol.MLS];
+            jest.spyOn(apiClient.api.self, 'putSupportedProtocols').mockImplementation(jest.fn());
+            await selfService.putSupportedProtocols(supportedProtocols);
+            expect(apiClient.api.self.putSupportedProtocols).toHaveBeenCalledWith(supportedProtocols);
+        });
+        it('throws if supported protocols list is not provided', async () => {
+            const selfService = new SelfService_1.SelfService(apiClient);
+            const supportedProtocols = undefined;
+            jest.spyOn(apiClient.api.self, 'putSupportedProtocols').mockImplementation(jest.fn());
+            await expect(() => selfService.putSupportedProtocols(supportedProtocols)).rejects.toThrow('Supported protocols must be a non-empty protocols list');
+        });
+        it('throws if supported protocols list is empty', async () => {
+            const selfService = new SelfService_1.SelfService(apiClient);
+            const supportedProtocols = [];
+            jest.spyOn(apiClient.api.self, 'putSupportedProtocols').mockImplementation(jest.fn());
+            await expect(() => selfService.putSupportedProtocols(supportedProtocols)).rejects.toThrow('Supported protocols must be a non-empty protocols list');
+        });
+    });
+});

package/lib/user/UserService.d.ts

@@ -1,3 +1,4 @@
+import { ConversationProtocol } from '@wireapp/api-client/lib/conversation';
 import { QualifiedId, User } from '@wireapp/api-client/lib/user/';
 import { APIClient } from '@wireapp/api-client';
 export declare class UserService {
@@ -9,5 +10,9 @@ export declare class UserService {
         failed?: QualifiedId[] | undefined;
         not_found?: QualifiedId[] | undefined;
     } | never[]>;
+    /**
+     * Get the list of other user's supported protocols.
+     */
+    getUserSupportedProtocols(userId: QualifiedId): Promise<ConversationProtocol[]>;
 }
 //# sourceMappingURL=UserService.d.ts.map

package/lib/user/UserService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserService.d.ts","sourceRoot":"","sources":["../../src/user/UserService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,SAAS,EAAE,SAAS;IAIzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE;;;;;CAM7C"}
+{"version":3,"file":"UserService.d.ts","sourceRoot":"","sources":["../../src/user/UserService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,SAAS,EAAE,SAAS;IAIzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE;;;;;IAO5C;;OAEG;IACU,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAS7F"}

package/lib/user/UserService.js

@@ -19,6 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserService = void 0;
+const conversation_1 = require("@wireapp/api-client/lib/conversation");
 class UserService {
     constructor(apiClient) {
         this.apiClient = apiClient;
@@ -32,5 +33,16 @@ class UserService {
         }
         return this.apiClient.api.user.postListUsers({ qualified_ids: userIds });
     }
+    /**
+     * Get the list of other user's supported protocols.
+     */
+    async getUserSupportedProtocols(userId) {
+        // Clients that uses version below the one supporting MLS, are not aware of user's supported protocols, we default to Proteus in this case.
+        if (!this.apiClient.backendFeatures.supportsMLS) {
+            return [conversation_1.ConversationProtocol.PROTEUS];
+        }
+        const supportedProtocols = await this.apiClient.api.user.getUserSupportedProtocols(userId);
+        return supportedProtocols.length > 0 ? supportedProtocols : [conversation_1.ConversationProtocol.PROTEUS];
+    }
 }
 exports.UserService = UserService;

package/package.json

@@ -11,16 +11,16 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.5.1",
-    "@wireapp/commons": "^5.2.2",
+    "@wireapp/api-client": "^26.5.3",
+    "@wireapp/commons": "^5.2.3",
     "@wireapp/core-crypto": "1.0.0-rc.16",
     "@wireapp/cryptobox": "12.8.0",
-    "@wireapp/promise-queue": "^2.2.7",
+    "@wireapp/promise-queue": "^2.2.8",
     "@wireapp/protocol-messaging": "1.44.0",
     "@wireapp/store-engine": "5.1.4",
     "@wireapp/store-engine-dexie": "^2.1.6",
-    "axios": "1.5.1",
-    "bazinga64": "^6.3.2",
+    "axios": "1.6.2",
+    "bazinga64": "^6.3.3",
     "deepmerge-ts": "5.1.0",
     "hash.js": "1.1.7",
     "http-status-codes": "2.3.0",
@@ -37,14 +37,14 @@
     "@types/jest": "^29.2.0",
     "@types/long": "^5.0.0",
     "@types/rimraf": "^3.0.2",
-    "@types/tough-cookie": "4.0.4",
+    "@types/tough-cookie": "4.0.5",
     "commander": "11.1.0",
     "cross-env": "7.0.3",
     "dotenv-defaults": "5.0.2",
     "fake-indexeddb": "^4.0.0",
     "jest": "^29.2.1",
     "jest-websocket-mock": "2.5.0",
-    "nock": "13.3.6",
+    "nock": "13.3.8",
     "rimraf": "^3.0.2",
     "typescript": "^5.0.4"
   },
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.19.2",
-  "gitHead": "96506c0e52f08f30c956c8b6a067d1e9e3e1abd2"
+  "version": "42.20.1",
+  "gitHead": "7013cb299e2b41827ded167f8996c236719d7b72"
 }