@wireapp/core 41.2.0 → 41.2.2

package/lib/conversation/ConversationService/ConversationService.d.ts

@@ -3,16 +3,12 @@ import { ConversationMemberLeaveEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { XOR } from '@wireapp/commons/lib/util/TypeUtil';
 import { APIClient } from '@wireapp/api-client';
-import { AddUsersParams, MLSReturnType, SendMlsMessageParams, SendResult } from './ConversationService.types';
+import { AddUsersParams, MLSCreateConversationResponse, SendMlsMessageParams, SendResult } from './ConversationService.types';
 import { MessageTimer, RemoveUsersParams } from '../../conversation/';
 import { MLSService } from '../../messagingProtocols/mls';
 import { ProteusService } from '../../messagingProtocols/proteus';
 import { AddUsersToProteusConversationParams, SendProteusMessageParams } from '../../messagingProtocols/proteus/ProteusService/ProteusService.types';
 import { RemoteData } from '../content';
-export declare enum AddUsersFailureReasons {
-    NON_FEDERATING_BACKENDS = "NON_FEDERATING_BACKENDS",
-    UNREACHABLE_BACKENDS = "UNREACHABLE_BACKENDS"
-}
 export declare class ConversationService {
     private readonly apiClient;
     private readonly proteusService;
@@ -39,18 +35,12 @@ export declare class ConversationService {
      * @param conversationData Payload object for group creation
      * @returns Resolves when the conversation was created
      */
-    createProteusConversation(conversationData: NewConversation): Promise<Conversation>;
+    createProteusConversation(conversationData: NewConversation): Promise<import("./ConversationService.types").BaseCreateConversationResponse>;
     getConversation(conversationId: QualifiedId): Promise<Conversation>;
     getConversations(conversationIds?: QualifiedId[]): Promise<RemoteConversations>;
     getAsset({ assetId, assetToken, otrKey, sha256 }: RemoteData): Promise<Uint8Array>;
     getUnencryptedAsset(assetId: string, assetToken?: string): Promise<ArrayBuffer>;
-    addUsersToProteusConversation(params: AddUsersToProteusConversationParams): Promise<{
-        event?: import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent | undefined;
-        failedToAdd?: {
-            reason: AddUsersFailureReasons;
-            users: QualifiedId[];
-        } | undefined;
-    }>;
+    addUsersToProteusConversation(params: AddUsersToProteusConversationParams): Promise<import("./ConversationService.types").ProteusAddUsersResponse>;
     removeUserFromConversation(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
     /**
      * Sends a message to a conversation
@@ -75,7 +65,7 @@ export declare class ConversationService {
      * Will create a conversation on backend and register it to CoreCrypto once created
      * @param conversationData
      */
-    createMLSConversation(conversationData: NewConversation, selfUserId: QualifiedId, selfClientId: string): Promise<MLSReturnType>;
+    createMLSConversation(conversationData: NewConversation, selfUserId: QualifiedId, selfClientId: string): Promise<MLSCreateConversationResponse>;
     private sendMLSMessage;
     /**
      * Will add users to existing MLS group by claiming their key packages and passing them to CoreCrypto.addClientsToConversation
@@ -84,8 +74,8 @@ export declare class ConversationService {
      * @param groupId Id of the group to which we want to add users
      * @param conversationId Id of the conversation to which we want to add users
      */
-    addUsersToMLSConversation({ qualifiedUsers, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSReturnType>;
-    removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }: RemoveUsersParams): Promise<MLSReturnType>;
+    addUsersToMLSConversation({ qualifiedUsers, groupId, conversationId, }: Required<AddUsersParams>): Promise<MLSCreateConversationResponse>;
+    removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }: RemoveUsersParams): Promise<MLSCreateConversationResponse>;
     joinByExternalCommit(conversationId: QualifiedId): Promise<PostMlsMessageResponse>;
     /**
      * Will send an external proposal for the current device to join a specific conversation.

package/lib/conversation/ConversationService/ConversationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.js

@@ -21,13 +21,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConversationService = exports.AddUsersFailureReasons = void 0;
+exports.ConversationService = void 0;
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const data_1 = require("@wireapp/api-client/lib/conversation/data");
 const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const core_crypto_1 = require("@wireapp/core-crypto");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+const ConversationService_types_1 = require("./ConversationService.types");
 const conversation_2 = require("../../conversation/");
 const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
 const mls_1 = require("../../messagingProtocols/mls");
@@ -35,11 +36,6 @@ const proteus_1 = require("../../messagingProtocols/proteus");
 const util_1 = require("../../util");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const messageSender_1 = require("../message/messageSender");
-var AddUsersFailureReasons;
-(function (AddUsersFailureReasons) {
-    AddUsersFailureReasons["NON_FEDERATING_BACKENDS"] = "NON_FEDERATING_BACKENDS";
-    AddUsersFailureReasons["UNREACHABLE_BACKENDS"] = "UNREACHABLE_BACKENDS";
-})(AddUsersFailureReasons || (exports.AddUsersFailureReasons = AddUsersFailureReasons = {}));
 class ConversationService {
     constructor(apiClient, proteusService, _mlsService) {
         this.apiClient = apiClient;
@@ -216,13 +212,12 @@ class ConversationService {
         });
         // We fetch the fresh version of the conversation created on backend with the newly added users
         const conversation = await this.apiClient.api.conversation.getConversation(qualifiedId);
-        /**
-         * @note Add users whom we could not fetch their keypackages to list of failed to add users.
-         */
-        conversation.failed_to_add = response.failed || [];
         return {
             events: response.events,
             conversation,
+            failedToAdd: response.failed
+                ? { users: response.failed, reason: ConversationService_types_1.AddUsersFailureReasons.UNREACHABLE_BACKENDS }
+                : undefined,
         };
     }
     async sendMLSMessage({ payload, groupId }) {
@@ -264,12 +259,14 @@ class ConversationService {
         const { coreCryptoKeyPackagesPayload, failedToFetchKeyPackages } = await this.mlsService.getKeyPackagesPayload(qualifiedUsers);
         const response = await this.mlsService.addUsersToExistingConversation(groupId, coreCryptoKeyPackagesPayload);
         const conversation = await this.getConversation(conversationId);
-        conversation.failed_to_add = failedToFetchKeyPackages;
         //We store the info when user was added (and key material was created), so we will know when to renew it
         this.mlsService.resetKeyMaterialRenewal(groupId);
         return {
             events: response.events,
             conversation,
+            failedToAdd: failedToFetchKeyPackages.length > 0
+                ? { users: failedToFetchKeyPackages, reason: ConversationService_types_1.AddUsersFailureReasons.UNREACHABLE_BACKENDS }
+                : undefined,
         };
     }
     async removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }) {

package/lib/conversation/ConversationService/ConversationService.types.d.ts

@@ -1,5 +1,6 @@
 import { QualifiedUserClients, ConversationProtocol, MessageSendingStatus, Conversation } from '@wireapp/api-client/lib/conversation';
 import { ConversationEvent } from '@wireapp/api-client/lib/event';
+import { ConversationMemberJoinEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { MessageSendingState } from '..';
@@ -76,10 +77,36 @@ export type RemoveUsersParams = {
     qualifiedUserIds: QualifiedId[];
     groupId: string;
 };
-export type MLSReturnType = {
-    events: ConversationEvent[];
+export declare enum AddUsersFailureReasons {
+    NON_FEDERATING_BACKENDS = "NON_FEDERATING_BACKENDS",
+    UNREACHABLE_BACKENDS = "UNREACHABLE_BACKENDS"
+}
+/**
+ * List of users that were originaly requested to be in the conversation
+ * but could not be added due to their backend not being available
+ * @note Added since version 4: https://staging-nginz-https.z
+ ra.io/v4/api/swagger-ui/#/default/post_conversations
+ * @note Federation only
+ */
+export type AddUsersFailure = {
+    users: QualifiedId[];
+    reason: AddUsersFailureReasons;
+};
+/**
+ * The backend response of any method that will create (or add users to) a conversation
+ */
+export interface BaseCreateConversationResponse {
     conversation: Conversation;
+    failedToAdd?: AddUsersFailure;
+}
+export type ProteusCreateConversationResponse = BaseCreateConversationResponse;
+export type ProteusAddUsersResponse = {
+    event?: ConversationMemberJoinEvent;
+    failedToAdd?: AddUsersFailure;
 };
+export interface MLSCreateConversationResponse extends BaseCreateConversationResponse {
+    events: ConversationEvent[];
+}
 export type SendResult = {
     /** The id of the message sent */
     id: string;

package/lib/conversation/ConversationService/ConversationService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,IAAI,CAAC;AAEvC,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,aAAa,IAAA;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;IAE/C,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE/D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1G;AAED;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE3E,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC;AAEtF,MAAM,MAAM,UAAU,GAAG;IACvB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,mBAAmB,CAAC;IAC3B,4MAA4M;IAC5M,YAAY,CAAC,EAAE;QACb,gIAAgI;QAChI,MAAM,CAAC,EAAE,oBAAoB,GAAG,WAAW,EAAE,CAAC;QAC9C,oJAAoJ;QACpJ,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;KACxB,CAAC;CACH,CAAC"}
+{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.types.js

@@ -18,10 +18,15 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageTargetMode = void 0;
+exports.AddUsersFailureReasons = exports.MessageTargetMode = void 0;
 var MessageTargetMode;
 (function (MessageTargetMode) {
     MessageTargetMode[MessageTargetMode["NONE"] = 0] = "NONE";
     MessageTargetMode[MessageTargetMode["USERS"] = 1] = "USERS";
     MessageTargetMode[MessageTargetMode["USERS_CLIENTS"] = 2] = "USERS_CLIENTS";
 })(MessageTargetMode || (exports.MessageTargetMode = MessageTargetMode = {}));
+var AddUsersFailureReasons;
+(function (AddUsersFailureReasons) {
+    AddUsersFailureReasons["NON_FEDERATING_BACKENDS"] = "NON_FEDERATING_BACKENDS";
+    AddUsersFailureReasons["UNREACHABLE_BACKENDS"] = "UNREACHABLE_BACKENDS";
+})(AddUsersFailureReasons || (exports.AddUsersFailureReasons = AddUsersFailureReasons = {}));

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.d.ts

@@ -1,12 +1,11 @@
 import type { APIClient } from '@wireapp/api-client/lib/APIClient';
 import type { PreKey, Context } from '@wireapp/api-client/lib/auth';
-import { Conversation, NewConversation, QualifiedOTRRecipients, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
-import type { ConversationMemberJoinEvent } from '@wireapp/api-client/lib/event';
+import { NewConversation, QualifiedOTRRecipients, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
 import type { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { CryptoClient } from './CryptoClient';
 import type { AddUsersToProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
-import { AddUsersFailureReasons, SendResult } from '../../../conversation';
+import { ProteusCreateConversationResponse, SendResult, ProteusAddUsersResponse } from '../../../conversation';
 import type { EventHandlerResult } from '../../common.types';
 import { EventHandlerParams } from '../EventHandler';
 export type EncryptionResult = {
@@ -40,18 +39,12 @@ export declare class ProteusService {
      *   If not provided and the session doesn't exists it will fetch a new prekey from the backend
      */
     getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: PreKey): Promise<string>;
-    createConversation(conversationData: NewConversation): Promise<Conversation>;
+    createConversation(conversationData: NewConversation): Promise<ProteusCreateConversationResponse>;
     /**
      * Tries to add all the given users to the given conversation.
      * If some users are not reachable, it will try to add the remaining users and list them in the `failedToAdd` property of the response.
      */
-    addUsersToConversation({ conversationId, qualifiedUsers }: AddUsersToProteusConversationParams): Promise<{
-        event?: ConversationMemberJoinEvent;
-        failedToAdd?: {
-            reason: AddUsersFailureReasons;
-            users: QualifiedId[];
-        };
-    }>;
+    addUsersToConversation({ conversationId, qualifiedUsers, }: AddUsersToProteusConversationParams): Promise<ProteusAddUsersResponse>;
     sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
     private decrypt;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,YAAY,EAGZ,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAC/E,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAC,sBAAsB,EAA2C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAGlH,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wEAAwE;IACxE,QAAQ,EAAE,sBAAsB,CAAC;IACjC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,sGAAsG;IACtG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA2B1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAiCzF;;;OAGG;IACU,sBAAsB,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,EAAE,mCAAmC,GAAG,OAAO,CAAC;QAClH,KAAK,CAAC,EAAE,2BAA2B,CAAC;QACpC,WAAW,CAAC,EAAE;YAAC,MAAM,EAAE,sBAAsB,CAAC;YAAC,KAAK,EAAE,WAAW,EAAE,CAAA;SAAC,CAAC;KACtE,CAAC;IAqCW,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6CnC,OAAO;IAuBd,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAQ7C,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,4BAA4B,GAAG,oBAAoB,GAC9D,OAAO,CAAC,gBAAgB,CAAC;IAiBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}
+{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAGL,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAEL,iCAAiC,EAGjC,UAAU,EACV,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wEAAwE;IACxE,QAAQ,EAAE,sBAAsB,CAAC;IACjC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,sGAAsG;IACtG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA2B1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAwC9G;;;OAGG;IACU,sBAAsB,CAAC,EAClC,cAAc,EACd,cAAc,GACf,EAAE,mCAAmC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAqC5D,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6CnC,OAAO;IAuBd,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAQ7C,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,4BAA4B,GAAG,oBAAoB,GAC9D,OAAO,CAAC,gBAAgB,CAAC;IAiBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.js

@@ -110,7 +110,8 @@ class ProteusService {
     async createConversation(conversationData) {
         var _a;
         try {
-            return await this.apiClient.api.conversation.postConversation(conversationData);
+            const conversation = await this.apiClient.api.conversation.postConversation(conversationData);
+            return { conversation };
         }
         catch (error) {
             if ((0, conversation_1.isFederatedBackendsError)(error)) {
@@ -126,10 +127,15 @@ class ProteusService {
                         // If conversation creation returns an error because a backend is offline,
                         // we try creating the conversation again with users from available backends
                         const response = await this.apiClient.api.conversation.postConversation(conversationData);
-                        // on a succesfull conversation creation with the available users,
-                        // we append the users from an unreachable backend to the response
-                        response.failed_to_add = unreachableUsers;
-                        return response;
+                        return {
+                            conversation: response,
+                            failedToAdd: 
+                            // on a succesfull conversation creation with the available users,
+                            // we append the users from an unreachable backend to the response
+                            unreachableUsers.length > 0
+                                ? { reason: conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS, users: unreachableUsers }
+                                : undefined,
+                        };
                     }
                 }
             }
@@ -140,7 +146,7 @@ class ProteusService {
      * Tries to add all the given users to the given conversation.
      * If some users are not reachable, it will try to add the remaining users and list them in the `failedToAdd` property of the response.
      */
-    async addUsersToConversation({ conversationId, qualifiedUsers }) {
+    async addUsersToConversation({ conversationId, qualifiedUsers, }) {
         try {
             return { event: await this.apiClient.api.conversation.postMembers(conversationId, qualifiedUsers) };
         }

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.test.js

@@ -52,6 +52,7 @@ const notification_1 = require("../../../notification");
 const event_1 = require("@wireapp/api-client/lib/event");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const errors_1 = require("../../../errors");
+const testUtils_1 = require("../../../testUtils");
 jest.mock('./CryptoClient/CoreCryptoWrapper/PrekeysTracker', () => {
     return {
         PrekeyTracker: jest.fn().mockImplementation(() => {
@@ -123,11 +124,17 @@ const prepareDataForEncryption = async () => {
     };
 };
 describe('ProteusService', () => {
+    const domain1 = 'domain1';
+    const domain2 = 'domain2';
+    const domain3 = 'domain3';
+    const usersDomain1 = (0, testUtils_1.generateQualifiedIds)(3, domain1);
+    const usersDomain2 = (0, testUtils_1.generateQualifiedIds)(3, domain2);
+    const usersDomain3 = (0, testUtils_1.generateQualifiedIds)(3, domain3);
     describe('getRemoteFingerprint', () => {
         it('create a session if session does not exists', async () => {
             const [proteusService, { apiClient, cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const expectedFingerprint = 'fingerprint-client1';
-            const userId = { id: 'user1', domain: 'domain.com' };
+            const userId = (0, testUtils_1.generateQualifiedId)('domain');
             const clientId = 'client1';
             jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
                 qualified_user_client_prekeys: {
@@ -156,7 +163,7 @@ describe('ProteusService', () => {
             const saveSessionSpy = jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
             jest.spyOn(cryptoClient, 'saveSession').mockResolvedValue(undefined);
             jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
-            const userId = { id: 'user1', domain: 'domain.com' };
+            const userId = (0, testUtils_1.generateQualifiedId)('domain');
             const clientId = 'client1';
             const result = await proteusService.getRemoteFingerprint(userId, clientId, {
                 key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
@@ -173,7 +180,7 @@ describe('ProteusService', () => {
             const sessionFromPrekeyMock = jest.spyOn(cryptoClient, 'sessionFromPrekey');
             jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
             jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(true);
-            const userId = { id: 'user1', domain: 'domain.com' };
+            const userId = (0, testUtils_1.generateQualifiedId)('domain');
             const clientId = 'client1';
             const result = await proteusService.getRemoteFingerprint(userId, clientId);
             expect(getPrekeyMock).not.toHaveBeenCalled();
@@ -185,7 +192,7 @@ describe('ProteusService', () => {
         const eventPayload = {
             event: {
                 type: event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD,
-                qualified_from: { id: 'user1', domain: 'domain' },
+                qualified_from: (0, testUtils_1.generateQualifiedId)('domain'),
                 data: { sender: 'client1', text: '' },
             },
             source: notification_1.NotificationSource.WEBSOCKET,
@@ -334,7 +341,7 @@ describe('ProteusService', () => {
                 const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
                 let errorMessage;
                 const params = {
-                    conversationId: { id: 'conv1', domain: '' },
+                    conversationId: (0, testUtils_1.generateQualifiedId)('domain'),
                     payload: message,
                     protocol: conversation_1.ConversationProtocol.PROTEUS,
                     targetMode: conversation_2.MessageTargetMode.USERS,
@@ -465,7 +472,7 @@ describe('ProteusService', () => {
                 });
                 const result = await proteusService.sendMessage({
                     protocol: conversation_1.ConversationProtocol.PROTEUS,
-                    conversationId: { id: 'conv1', domain: 'domain1' },
+                    conversationId: (0, testUtils_1.generateQualifiedId)('domain'),
                     payload: message,
                     targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
                     userIds: recipients,
@@ -485,17 +492,13 @@ describe('ProteusService', () => {
                 type: event_1.CONVERSATION_EVENT.MEMBER_JOIN,
             },
         };
-        const conversationId = { id: 'conv1', domain: 'domain1' };
-        const userDomain1 = { id: 'user-1-1', domain: 'domain1' };
-        const user2Domain1 = { id: 'user-2-1', domain: 'domain1' };
-        const userDomain2 = { id: 'user-1-2', domain: 'domain2' };
-        const userDomain3 = { id: 'user-1-3', domain: 'domain3' };
+        const conversationId = (0, testUtils_1.generateQualifiedId)('domain');
         it('adds all requested users to an existing conversation', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             jest.spyOn(apiClient.api.conversation, 'postMembers').mockResolvedValueOnce(baseResponse.event);
             const event = await proteusService.addUsersToConversation({
                 conversationId,
-                qualifiedUsers: [userDomain1, user2Domain1, userDomain2],
+                qualifiedUsers: [...usersDomain1, ...usersDomain2],
             });
             expect(event).toEqual(baseResponse);
         });
@@ -504,37 +507,34 @@ describe('ProteusService', () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postMembersSpy = jest
                 .spyOn(apiClient.api.conversation, 'postMembers')
-                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [userDomain1.domain]))
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [domain1]))
                 .mockResolvedValueOnce(baseResponse.event);
             const result = await proteusService.addUsersToConversation({
                 conversationId,
-                qualifiedUsers: [userDomain1, user2Domain1, userDomain2],
+                qualifiedUsers: [...usersDomain1, ...usersDomain2],
             });
             expect(postMembersSpy).toHaveBeenCalledTimes(2);
-            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain1, user2Domain1, userDomain2]));
-            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain2]));
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([...usersDomain1, ...usersDomain2]));
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining(usersDomain2));
             expect((_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a.reason).toBe(conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS);
-            expect((_b = result.failedToAdd) === null || _b === void 0 ? void 0 : _b.users).toEqual([userDomain1, user2Domain1]);
+            expect((_b = result.failedToAdd) === null || _b === void 0 ? void 0 : _b.users).toEqual([...usersDomain1]);
         });
         it('partially add users if some users are part of not-connected backends', async () => {
             var _a, _b;
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postMembersSpy = jest
                 .spyOn(apiClient.api.conversation, 'postMembers')
-                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS, [
-                userDomain2.domain,
-                userDomain3.domain,
-            ]))
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS, [domain2, domain3]))
                 .mockResolvedValueOnce(baseResponse.event);
             const result = await proteusService.addUsersToConversation({
                 conversationId,
-                qualifiedUsers: [userDomain1, user2Domain1, userDomain2, userDomain3],
+                qualifiedUsers: [...usersDomain1, ...usersDomain2, ...usersDomain3],
             });
             expect(postMembersSpy).toHaveBeenCalledTimes(2);
-            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain1, user2Domain1, userDomain2]));
-            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain1, user2Domain1]));
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([...usersDomain1, ...usersDomain2]));
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining(usersDomain1));
             expect((_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a.reason).toBe(conversation_2.AddUsersFailureReasons.NON_FEDERATING_BACKENDS);
-            expect((_b = result.failedToAdd) === null || _b === void 0 ? void 0 : _b.users).toEqual([userDomain2, userDomain3]);
+            expect((_b = result.failedToAdd) === null || _b === void 0 ? void 0 : _b.users).toEqual([...usersDomain2, ...usersDomain3]);
         });
     });
     describe('createConversation', () => {
@@ -559,65 +559,62 @@ describe('ProteusService', () => {
                     status_time: '',
                 },
             },
-            failed_to_add: [],
             protocol: conversation_1.ConversationProtocol.PROTEUS,
         };
-        const userDomain1 = { id: 'user-1-1', domain: 'domain1' };
-        const user2Domain1 = { id: 'user-2-1', domain: 'domain1' };
-        const userDomain2 = { id: 'user-2-2', domain: 'domain2' };
         it('adds all requested users to a new conversation', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             jest.spyOn(apiClient.api.conversation, 'postConversation').mockResolvedValueOnce(Object.assign({}, newConversation));
             const result = await proteusService.createConversation({
                 receipt_mode: null,
-                qualified_users: [userDomain1, user2Domain1, userDomain2],
+                qualified_users: [...usersDomain1, ...usersDomain2, ...usersDomain3],
             });
-            expect(result).toEqual(newConversation);
+            expect(result.conversation).toEqual(newConversation);
+            expect(result.failedToAdd).toBeUndefined();
         });
         it('partially add users if some backends are unreachable', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postConversationSpy = jest
                 .spyOn(apiClient.api.conversation, 'postConversation')
-                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [userDomain1.domain]))
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [domain1]))
                 .mockResolvedValueOnce(newConversation);
-            const result = await proteusService.createConversation({
+            const { failedToAdd } = await proteusService.createConversation({
                 receipt_mode: null,
-                qualified_users: [userDomain1, user2Domain1, userDomain2],
+                qualified_users: [...usersDomain1, ...usersDomain2],
             });
             expect(postConversationSpy).toHaveBeenCalledTimes(2);
-            expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [userDomain1, user2Domain1, userDomain2] }));
-            expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [userDomain2] }));
-            expect(result.failed_to_add).toEqual([userDomain1, user2Domain1]);
+            expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [...usersDomain1, ...usersDomain2] }));
+            expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: usersDomain2 }));
+            expect(failedToAdd).toEqual({
+                reason: conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS,
+                users: expect.arrayContaining([...usersDomain1, ...usersDomain1]),
+            });
         });
         it('creates an empty conversation if no backend is reachable', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postConversationSpy = jest
                 .spyOn(apiClient.api.conversation, 'postConversation')
-                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [
-                userDomain1.domain,
-                userDomain2.domain,
-            ]))
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [domain1, domain2]))
                 .mockResolvedValueOnce({});
-            const result = await proteusService.createConversation({
+            const { failedToAdd } = await proteusService.createConversation({
                 receipt_mode: null,
-                qualified_users: [userDomain1, user2Domain1, userDomain2],
+                qualified_users: [...usersDomain1, ...usersDomain2],
             });
             expect(postConversationSpy).toHaveBeenCalledTimes(2);
-            expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [userDomain1, user2Domain1, userDomain2] }));
+            expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [...usersDomain1, ...usersDomain2] }));
             expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [] }));
-            expect(result.failed_to_add).toEqual([userDomain1, user2Domain1, userDomain2]);
+            expect(failedToAdd).toEqual({
+                reason: conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS,
+                users: expect.arrayContaining([...usersDomain1, ...usersDomain1]),
+            });
         });
         it('fails to create a conversation if there are users from non-connected backends', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             jest
                 .spyOn(apiClient.api.conversation, 'postConversation')
-                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS, [
-                userDomain1.domain,
-                userDomain2.domain,
-            ]));
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS, [domain1, domain2]));
             await expect(() => proteusService.createConversation({
                 receipt_mode: null,
-                qualified_users: [userDomain1, user2Domain1, userDomain2],
+                qualified_users: [...usersDomain1, ...usersDomain2],
             })).rejects.toThrow(errors_1.NonFederatingBackendsError);
         });
     });

package/lib/messagingProtocols/proteus/ProteusService/WithMockedGenerics.test.js

@@ -103,13 +103,13 @@ describe('createConversation', () => {
             const proteusService = await prepareProteusService();
             const conversationData = createConversationResult;
             const returnData = await proteusService.createConversation(conversationData);
-            expect(returnData).toStrictEqual(createConversationResult);
+            expect(returnData.conversation).toStrictEqual(createConversationResult);
         });
         it('create a new conversation with no name', async () => {
             const proteusService = await prepareProteusService();
             const conversationData = { users: ['user1', 'user2'], receipt_mode: null };
             const returnData = await proteusService.createConversation(conversationData);
-            expect(returnData).toStrictEqual(conversationData);
+            expect(returnData.conversation).toStrictEqual(conversationData);
         });
     });
 });

package/lib/testUtils/index.d.ts

@@ -0,0 +1,7 @@
+import { QualifiedId } from '@wireapp/api-client/lib/user';
+export declare function generateQualifiedId(domain: string): {
+    id: `${string}-${string}-${string}-${string}-${string}`;
+    domain: string;
+};
+export declare function generateQualifiedIds(nbUsers: number, domain: string): QualifiedId[];
+//# sourceMappingURL=index.d.ts.map

package/lib/testUtils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testUtils/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM;;;EAEjD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAMnE"}

package/lib/testUtils/index.js

@@ -0,0 +1,34 @@
+"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 });
+exports.generateQualifiedIds = exports.generateQualifiedId = void 0;
+const crypto_1 = require("crypto");
+function generateQualifiedId(domain) {
+    return { id: (0, crypto_1.randomUUID)(), domain };
+}
+exports.generateQualifiedId = generateQualifiedId;
+function generateQualifiedIds(nbUsers, domain) {
+    const users = [];
+    for (let i = 0; i < nbUsers; i++) {
+        users.push(generateQualifiedId(domain));
+    }
+    return users;
+}
+exports.generateQualifiedIds = generateQualifiedIds;

package/package.json

@@ -11,11 +11,11 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^25.2.0",
+    "@wireapp/api-client": "^25.2.2",
     "@wireapp/commons": "^5.1.0",
     "@wireapp/core-crypto": "1.0.0-rc.6",
     "@wireapp/cryptobox": "12.8.0",
-    "@wireapp/promise-queue": "^2.2.0",
+    "@wireapp/promise-queue": "^2.2.1",
     "@wireapp/protocol-messaging": "1.44.0",
     "@wireapp/store-engine": "5.1.1",
     "@wireapp/store-engine-dexie": "^2.1.3",
@@ -43,7 +43,7 @@
     "fake-indexeddb": "^4.0.0",
     "jest": "^29.2.1",
     "jest-websocket-mock": "2.4.1",
-    "nock": "13.3.2",
+    "nock": "13.3.3",
     "rimraf": "^3.0.2",
     "typescript": "^5.0.4"
   },
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "41.2.0",
-  "gitHead": "139c43189700e34d69f734596cfd6e3f12732ff3"
+  "version": "41.2.2",
+  "gitHead": "3697cef010797726548c209abc6a0376245b7d7a"
 }