@wireapp/core 30.12.0 → 31.0.0

package/src/main/conversation/ConversationService/messageGenerator.js

@@ -0,0 +1,301 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 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.generateGenericMessage = void 0;
+const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+const PayloadBundle_1 = require("../message/PayloadBundle");
+const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
+const GenericMessageType_1 = require("../GenericMessageType");
+const AssetTransferState_1 = require("../AssetTransferState");
+function generateGenericMessage(payload, messageTimer) {
+    const content = payload.content;
+    switch (payload.type) {
+        case PayloadBundle_1.PayloadBundleType.ASSET:
+            return { genericMessage: generateFileDataGenericMessage(payload, messageTimer), content };
+        case PayloadBundle_1.PayloadBundleType.ASSET_ABORT:
+            return { genericMessage: generateFileAbortGenericMessage(payload, messageTimer), content };
+        case PayloadBundle_1.PayloadBundleType.ASSET_META:
+            return { genericMessage: generateFileMetaDataGenericMessage(payload, messageTimer), content };
+        case PayloadBundle_1.PayloadBundleType.ASSET_IMAGE:
+            return generateImageGenericMessage(payload, messageTimer);
+        case PayloadBundle_1.PayloadBundleType.BUTTON_ACTION:
+            return { genericMessage: generateButtonActionGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.BUTTON_ACTION_CONFIRMATION:
+            return { genericMessage: generateButtonActionConfirmationGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.CALL:
+            return { genericMessage: generateCallGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.CLIENT_ACTION:
+            return { genericMessage: generateSessionResetGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.COMPOSITE:
+            return { genericMessage: generateCompositeGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.CONFIRMATION:
+            return { genericMessage: generateConfirmationGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.LOCATION:
+            return { genericMessage: generateLocationGenericMessage(payload, messageTimer), content };
+        case PayloadBundle_1.PayloadBundleType.MESSAGE_EDIT:
+            return { genericMessage: generateEditedTextGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.PING:
+            return { genericMessage: generatePingGenericMessage(payload, messageTimer), content };
+        case PayloadBundle_1.PayloadBundleType.REACTION:
+            return { genericMessage: generateReactionGenericMessage(payload), content };
+        case PayloadBundle_1.PayloadBundleType.TEXT:
+            return { genericMessage: generateTextGenericMessage(payload, messageTimer), content };
+        case PayloadBundle_1.PayloadBundleType.MESSAGE_DELETE:
+            return { genericMessage: generateDeleteMessage(payload), content };
+        /**
+         * ToDo: Create Generic implementation for everything else
+         */
+        default:
+            throw new Error(`No send method implemented for "${payload['type']}".`);
+    }
+}
+exports.generateGenericMessage = generateGenericMessage;
+function generateButtonActionGenericMessage(payloadBundle) {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.BUTTON_ACTION]: protocol_messaging_1.ButtonAction.create(payloadBundle.content),
+        messageId: payloadBundle.id,
+    });
+}
+function generateButtonActionConfirmationGenericMessage(payloadBundle) {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.BUTTON_ACTION_CONFIRMATION]: protocol_messaging_1.ButtonActionConfirmation.create(payloadBundle.content),
+        messageId: payloadBundle.id,
+    });
+}
+function generateCompositeGenericMessage(payloadBundle) {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.COMPOSITE]: protocol_messaging_1.Composite.create(payloadBundle.content),
+        messageId: payloadBundle.id,
+    });
+}
+function generateConfirmationGenericMessage(payloadBundle) {
+    const content = protocol_messaging_1.Confirmation.create(payloadBundle.content);
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CONFIRMATION]: content,
+        messageId: payloadBundle.id,
+    });
+}
+function generateEditedTextGenericMessage(payloadBundle) {
+    const editedMessage = protocol_messaging_1.MessageEdit.create({
+        replacingMessageId: payloadBundle.content.originalMessageId,
+        text: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.EDITED]: editedMessage,
+        messageId: payloadBundle.id,
+    });
+}
+function generateFileDataGenericMessage(payloadBundle, messageTimer) {
+    if (!payloadBundle.content) {
+        throw new Error('No content for sendFileData provided.');
+    }
+    const { asset, expectsReadConfirmation, legalHoldStatus } = payloadBundle.content;
+    const remoteData = protocol_messaging_1.Asset.RemoteData.create({
+        assetId: asset.key,
+        assetToken: asset.token,
+        otrKey: asset.keyBytes,
+        sha256: asset.sha256,
+        assetDomain: asset.domain,
+    });
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        uploaded: remoteData,
+    });
+    assetMessage.status = AssetTransferState_1.AssetTransferState.UPLOADED;
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
+        messageId: payloadBundle.id,
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    return expireAfterMillis > 0 ? createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
+}
+function generateFileMetaDataGenericMessage(payloadBundle, messageTimer) {
+    if (!payloadBundle.content) {
+        throw new Error('No content for sendFileMetaData provided.');
+    }
+    const { expectsReadConfirmation, legalHoldStatus, metaData } = payloadBundle.content;
+    const original = protocol_messaging_1.Asset.Original.create({
+        audio: metaData.audio,
+        mimeType: metaData.type,
+        name: metaData.name,
+        size: metaData.length,
+        video: metaData.video,
+        image: metaData.image,
+    });
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        original,
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
+        messageId: payloadBundle.id,
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    return expireAfterMillis > 0 ? createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
+}
+function generateFileAbortGenericMessage(payloadBundle, messageTimer) {
+    if (!payloadBundle.content) {
+        throw new Error('No content for sendFileAbort provided.');
+    }
+    const { expectsReadConfirmation, legalHoldStatus, reason } = payloadBundle.content;
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        notUploaded: reason,
+    });
+    assetMessage.status = AssetTransferState_1.AssetTransferState.NOT_UPLOADED;
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
+        messageId: payloadBundle.id,
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    return expireAfterMillis > 0 ? createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
+}
+function generateImageGenericMessage(payloadBundle, messageTimer) {
+    const imageAsset = generateAsset(payloadBundle);
+    let genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: imageAsset,
+        messageId: payloadBundle.id,
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    if (expireAfterMillis) {
+        genericMessage = createEphemeral(genericMessage, expireAfterMillis);
+    }
+    return { genericMessage, content: imageAsset };
+}
+function generateLocationGenericMessage(payloadBundle, messageTimer) {
+    const { expectsReadConfirmation, latitude, legalHoldStatus, longitude, name, zoom } = payloadBundle.content;
+    const locationMessage = protocol_messaging_1.Location.create({
+        expectsReadConfirmation,
+        latitude,
+        legalHoldStatus,
+        longitude,
+        name,
+        zoom,
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.LOCATION]: locationMessage,
+        messageId: payloadBundle.id,
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    return expireAfterMillis > 0 ? createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
+}
+function generatePingGenericMessage(payloadBundle, messageTimer) {
+    const content = protocol_messaging_1.Knock.create(payloadBundle.content);
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.KNOCK]: content,
+        messageId: payloadBundle.id,
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    return expireAfterMillis > 0 ? createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
+}
+function generateReactionGenericMessage(payloadBundle) {
+    const { legalHoldStatus, originalMessageId, type } = payloadBundle.content;
+    const reaction = protocol_messaging_1.Reaction.create({
+        emoji: type,
+        legalHoldStatus,
+        messageId: originalMessageId,
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.REACTION]: reaction,
+        messageId: payloadBundle.id,
+    });
+    return genericMessage;
+}
+function generateSessionResetGenericMessage(payload) {
+    if (payload.content.clientAction !== protocol_messaging_1.ClientAction.RESET_SESSION) {
+        throw new Error(`No send method implemented for "${payload.type}" and ClientAction "${payload.content}".`);
+    }
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CLIENT_ACTION]: protocol_messaging_1.ClientAction.RESET_SESSION,
+        messageId: payload.id,
+    });
+}
+function generateCallGenericMessage(payloadBundle) {
+    const callMessage = protocol_messaging_1.Calling.create({
+        content: payloadBundle.content,
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CALLING]: callMessage,
+        messageId: payloadBundle.id,
+    });
+}
+function generateDeleteMessage(payload) {
+    const content = protocol_messaging_1.MessageDelete.create({
+        messageId: payload.content.messageId,
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.DELETED]: content,
+        messageId: payload.id,
+    });
+}
+function generateTextGenericMessage(payloadBundle, messageTimer) {
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        messageId: payloadBundle.id,
+        [GenericMessageType_1.GenericMessageType.TEXT]: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
+    });
+    const expireAfterMillis = messageTimer.getMessageTimer(payloadBundle.conversation);
+    return expireAfterMillis > 0 ? createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
+}
+function generateAsset(payloadBundle) {
+    if (!payloadBundle.content) {
+        throw new Error('No content for sendImage provided.');
+    }
+    const { asset, expectsReadConfirmation, image, legalHoldStatus } = payloadBundle.content;
+    const imageMetadata = protocol_messaging_1.Asset.ImageMetaData.create({
+        height: image.height,
+        width: image.width,
+    });
+    const original = protocol_messaging_1.Asset.Original.create({
+        [GenericMessageType_1.GenericMessageType.IMAGE]: imageMetadata,
+        mimeType: image.type,
+        name: null,
+        size: image.data.length,
+    });
+    const remoteData = protocol_messaging_1.Asset.RemoteData.create({
+        assetId: asset.key,
+        assetToken: asset.token,
+        assetDomain: asset.domain,
+        otrKey: asset.keyBytes,
+        sha256: asset.sha256,
+    });
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        original,
+        uploaded: remoteData,
+    });
+    assetMessage.status = AssetTransferState_1.AssetTransferState.UPLOADED;
+    return assetMessage;
+}
+function createEphemeral(originalGenericMessage, expireAfterMillis) {
+    const ephemeralMessage = protocol_messaging_1.Ephemeral.create({
+        expireAfterMillis,
+        [originalGenericMessage.content]: originalGenericMessage[originalGenericMessage.content],
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.EPHEMERAL]: ephemeralMessage,
+        messageId: originalGenericMessage.messageId,
+    });
+    return genericMessage;
+}
+//# sourceMappingURL=messageGenerator.js.map

package/src/main/conversation/message/CompositeContentBuilder.d.ts

@@ -1,6 +1,6 @@
 import { Text } from '@wireapp/protocol-messaging';
 import { LegalHoldStatus } from '../content';
-import type { CompositeMessage } from './OtrMessage';
+import { CompositeMessage } from './OtrMessage';
 export declare class CompositeContentBuilder {
     private readonly content;
     private readonly payloadBundle;

package/src/main/conversation/message/Message.d.ts

@@ -1,4 +1,4 @@
-import type { OtrMessage } from './OtrMessage';
-import type { TeamMessage } from './TeamMessage';
-import type { UserMessage } from './UserMessage';
+import { OtrMessage } from './OtrMessage';
+import { TeamMessage } from './TeamMessage';
+import { UserMessage } from './UserMessage';
 export declare type Message = OtrMessage | TeamMessage | UserMessage;

package/src/main/conversation/message/MessageBuilder.d.ts

@@ -1,15 +1,18 @@
 import { Confirmation } from '@wireapp/protocol-messaging';
 import { AbortReason } from '..';
 import { EncryptedAssetUploaded } from '../../cryptography';
-import type { ButtonActionConfirmationContent, ButtonActionContent, CallingContent, FileContent, FileMetaDataContent, ImageContent, KnockContent, LegalHoldStatus, LocationContent, ReactionContent } from '../content';
+import { ButtonActionConfirmationContent, ButtonActionContent, CallingContent, FileContent, FileMetaDataContent, ImageContent, KnockContent, LegalHoldStatus, LocationContent, ReactionContent } from '../content';
 import { CompositeContentBuilder } from './CompositeContentBuilder';
-import type { ButtonActionConfirmationMessage, ButtonActionMessage, CallMessage, ConfirmationMessage, FileAssetAbortMessage, FileAssetMessage, FileAssetMetaDataMessage, ImageAssetMessageOutgoing, LocationMessage, PingMessage, ReactionMessage, ResetSessionMessage } from './OtrMessage';
+import { ButtonActionConfirmationMessage, ButtonActionMessage, CallMessage, ConfirmationMessage, DeleteMessage, FileAssetAbortMessage, FileAssetMessage, FileAssetMetaDataMessage, ImageAssetMessageOutgoing, LocationMessage, PingMessage, ReactionMessage, ResetSessionMessage } from './OtrMessage';
 import { TextContentBuilder } from './TextContentBuilder';
 interface BaseOptions {
     conversationId: string;
     from: string;
     messageId?: string;
 }
+interface CreateDeleteOption extends BaseOptions {
+    messageIdToDelete: string;
+}
 interface CreateImageOptions extends BaseOptions {
     expectsReadConfirmation?: boolean;
     asset: EncryptedAssetUploaded;
@@ -69,6 +72,7 @@ interface CreateActionMessageOptions extends BaseOptions {
 export declare class MessageBuilder {
     static createEditedText(payload: CreateEditedTextOptions): TextContentBuilder;
     static createFileData(payload: CreateFileOptions): FileAssetMessage;
+    static createDelete(payload: CreateDeleteOption): DeleteMessage;
     static createFileMetadata(payload: CreateFileMetadataOptions): FileAssetMetaDataMessage;
     static createFileAbort(payload: CreateFileAbortOptions): FileAssetAbortMessage;
     static createImage(payload: CreateImageOptions): ImageAssetMessageOutgoing;

package/src/main/conversation/message/MessageBuilder.js

@@ -53,6 +53,9 @@ class MessageBuilder {
                 legalHoldStatus,
             }, id: originalMessageId, type: __1.PayloadBundleType.ASSET });
     }
+    static createDelete(payload) {
+        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { messageId: payload.messageIdToDelete }, type: __1.PayloadBundleType.MESSAGE_DELETE });
+    }
     static createFileMetadata(payload) {
         const { expectsReadConfirmation, legalHoldStatus, metaData } = payload;
         return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {

package/src/main/conversation/message/MessageToProtoMapper.d.ts

@@ -1,6 +1,6 @@
 import { LinkPreview, Text } from '@wireapp/protocol-messaging';
-import type { LinkPreviewUploadedContent } from '../content';
-import type { EditedTextMessage, TextMessage } from './OtrMessage';
+import { LinkPreviewUploadedContent } from '../content';
+import { EditedTextMessage, TextMessage } from './OtrMessage';
 export declare class MessageToProtoMapper {
     static mapLinkPreviews(linkPreviews: LinkPreviewUploadedContent[]): LinkPreview[];
     static mapText(payloadBundle: TextMessage | EditedTextMessage): Text;

package/src/main/conversation/message/OtrMessage.d.ts

@@ -1,5 +1,5 @@
-import type { AssetContent, ButtonActionContent, ButtonActionConfirmationContent, CallingContent, ClearedContent, ClientActionContent, CompositeContent, ConfirmationContent, DeletedContent, EditedTextContent, FileAssetAbortContent, FileAssetContent, FileAssetMetaDataContent, HiddenContent, ImageAssetContent, KnockContent, LocationContent, ReactionContent, TextContent } from '../content';
-import type { BasePayloadBundle, PayloadBundleType } from './PayloadBundle';
+import { AssetContent, ButtonActionContent, ButtonActionConfirmationContent, CallingContent, ClearedContent, ClientActionContent, CompositeContent, ConfirmationContent, DeletedContent, EditedTextContent, FileAssetAbortContent, FileAssetContent, FileAssetMetaDataContent, HiddenContent, ImageAssetContent, KnockContent, LocationContent, ReactionContent, TextContent } from '../content';
+import { BasePayloadBundle, PayloadBundleType } from './PayloadBundle';
 export interface TextMessage extends BasePayloadBundle {
     content: TextContent;
     type: PayloadBundleType.TEXT;

package/src/main/conversation/message/PayloadBundle.d.ts

@@ -1,7 +1,7 @@
-import type { ConversationEventData, TeamEventData, UserEventData } from '@wireapp/api-client/src/event/';
+import { ConversationEventData, TeamEventData, UserEventData } from '@wireapp/api-client/src/event/';
 import { QualifiedId } from '@wireapp/api-client/src/user';
-import type { ConversationContent } from '../content';
-import type { Message } from './Message';
+import { ConversationContent } from '../content';
+import { Message } from './Message';
 export declare type PayloadBundleContent = ConversationContent | ConversationEventData | TeamEventData | UserEventData;
 export declare enum PayloadBundleSource {
     LOCAL = "PayloadBundleSource.LOCAL",

package/src/main/conversation/message/TeamMessage.d.ts

@@ -1,5 +1,5 @@
-import type { TeamConversationCreateData, TeamConversationDeleteData, TeamMemberJoinData, TeamMemberLeaveData, TeamUpdateData } from '@wireapp/api-client/src/team/data';
-import type { BasePayloadBundle, PayloadBundleType } from './PayloadBundle';
+import { TeamConversationCreateData, TeamConversationDeleteData, TeamMemberJoinData, TeamMemberLeaveData, TeamUpdateData } from '@wireapp/api-client/src/team/data';
+import { BasePayloadBundle, PayloadBundleType } from './PayloadBundle';
 export interface TeamConversationCreateMessage extends BasePayloadBundle {
     content: TeamConversationCreateData;
     type: PayloadBundleType.TEAM_CONVERSATION_CREATE;

package/src/main/conversation/message/TextContentBuilder.d.ts

@@ -1,5 +1,5 @@
 import { LegalHoldStatus, LinkPreviewUploadedContent, MentionContent, QuoteContent } from '../content';
-import type { EditedTextMessage, TextMessage, QuotableMessage } from './OtrMessage';
+import { EditedTextMessage, TextMessage, QuotableMessage } from './OtrMessage';
 export declare class TextContentBuilder {
     private readonly content;
     private readonly payloadBundle;

package/src/main/conversation/message/UserMessage.d.ts

@@ -1,5 +1,5 @@
-import type { UserActivateData, UserClientAddData, UserClientRemoveData, UserConnectionData, UserDeleteData, UserLegalHoldDisableData, UserLegalHoldEnableData, UserLegalHoldRequestData, UserPropertiesSetData, UserUpdateData } from '@wireapp/api-client/src/user/data';
-import type { BasePayloadBundle, PayloadBundleType } from './PayloadBundle';
+import { UserActivateData, UserClientAddData, UserClientRemoveData, UserConnectionData, UserDeleteData, UserLegalHoldDisableData, UserLegalHoldEnableData, UserLegalHoldRequestData, UserPropertiesSetData, UserUpdateData } from '@wireapp/api-client/src/user/data';
+import { BasePayloadBundle, PayloadBundleType } from './PayloadBundle';
 export interface UserActivateMessage extends BasePayloadBundle {
     content: UserActivateData;
     type: PayloadBundleType.USER_ACTIVATE;

package/src/main/cryptography/AssetCryptography/index.d.ts

@@ -1,5 +1,5 @@
 import { CipherOptions } from '@wireapp/api-client/src/asset';
-import type { EncryptedAsset } from './EncryptedAsset';
+import { EncryptedAsset } from './EncryptedAsset';
 interface EncryptOptions extends CipherOptions {
     plainText: Uint8Array;
 }

package/src/main/cryptography/CryptographyDatabaseRepository.d.ts

@@ -1,4 +1,4 @@
-import type { CRUDEngine } from '@wireapp/store-engine';
+import { CRUDEngine } from '@wireapp/store-engine';
 export declare enum DatabaseStores {
     AMPLIFY = "amplify",
     CLIENTS = "clients",

package/src/main/cryptography/CryptographyService.d.ts

@@ -1,12 +1,12 @@
-import type { APIClient } from '@wireapp/api-client';
-import type { PreKey as SerializedPreKey } from '@wireapp/api-client/src/auth/';
-import type { RegisteredClient } from '@wireapp/api-client/src/client/';
-import type { OTRRecipients, QualifiedOTRRecipients, QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation/';
-import type { ConversationOtrMessageAddEvent } from '@wireapp/api-client/src/event';
-import type { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/src/user/';
+import { APIClient } from '@wireapp/api-client';
+import { PreKey as SerializedPreKey } from '@wireapp/api-client/src/auth/';
+import { RegisteredClient } from '@wireapp/api-client/src/client/';
+import { OTRRecipients, QualifiedOTRRecipients, QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation/';
+import { ConversationOtrMessageAddEvent } from '@wireapp/api-client/src/event';
+import { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/src/user/';
 import { Cryptobox } from '@wireapp/cryptobox';
 import { GenericMessage } from '@wireapp/protocol-messaging';
-import type { CRUDEngine } from '@wireapp/store-engine';
+import { CRUDEngine } from '@wireapp/store-engine';
 import { PayloadBundle, PayloadBundleSource } from '../conversation';
 export declare type DecryptionError = {
     code: number;

package/src/main/cryptography/GenericMessageMapper.d.ts

@@ -1,4 +1,4 @@
-import type { ConversationOtrMessageAddEvent } from '@wireapp/api-client/src/event/';
+import { ConversationOtrMessageAddEvent } from '@wireapp/api-client/src/event/';
 import { PayloadBundle, PayloadBundleSource } from '../conversation';
 export declare class GenericMessageMapper {
     private static readonly logger;

package/src/main/giphy/GiphyService.d.ts

@@ -1,5 +1,5 @@
-import type { APIClient } from '@wireapp/api-client';
-import type { GiphySearchOptions, GiphyMultipleResult, GiphyResult, GIPHY_RATING } from '@wireapp/api-client/src/giphy/';
+import { APIClient } from '@wireapp/api-client';
+import { GiphySearchOptions, GiphyMultipleResult, GiphyResult, GIPHY_RATING } from '@wireapp/api-client/src/giphy/';
 export declare class GiphyService {
     private readonly apiClient;
     constructor(apiClient: APIClient);

package/src/main/mls/MLSService/MLSService.d.ts

@@ -1,17 +1,19 @@
-import { AddProposalArgs, CommitBundle, ConversationConfiguration, ConversationId, CoreCrypto, DecryptedMessage, ExternalProposalArgs, ExternalProposalType, ExternalRemoveProposalArgs, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
+import { AddProposalArgs, ConversationConfiguration, ConversationId, CoreCrypto, DecryptedMessage, ExternalProposalArgs, ExternalProposalType, ExternalRemoveProposalArgs, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
 import { APIClient } from '@wireapp/api-client';
 import { QualifiedUsers } from '../../conversation';
-import type { MLSConfig } from '../types';
+import { MLSCallbacks, MLSConfig } from '../types';
 import { PostMlsMessageResponse } from '@wireapp/api-client/src/conversation';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 export declare class MLSService {
     readonly config: MLSConfig | undefined;
     private readonly apiClient;
     private readonly coreCryptoClientProvider;
+    groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
     constructor(config: MLSConfig | undefined, apiClient: APIClient, coreCryptoClientProvider: () => CoreCrypto | undefined);
     private getCoreCryptoClient;
     private uploadCommitBundle;
     addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null>;
+    configureMLSCallbacks({ groupIdFromConversationId, ...coreCryptoCallbacks }: MLSCallbacks): void;
     getKeyPackagesPayload(qualifiedUsers: QualifiedUsers[]): Promise<Invitee[]>;
     newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
     newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalProposalArgs | ExternalRemoveProposalArgs): Promise<Uint8Array>;
@@ -21,7 +23,7 @@ export declare class MLSService {
     updateKeyingMaterial(conversationId: ConversationId): Promise<PostMlsMessageResponse | null>;
     createConversation(conversationId: ConversationId, configuration?: ConversationConfiguration): Promise<any>;
     removeClientsFromConversation(conversationId: ConversationId, clientIds: Uint8Array[]): Promise<PostMlsMessageResponse | null>;
-    commitPendingProposals(conversationId: ConversationId): Promise<CommitBundle | undefined>;
+    commitPendingProposals(groupId: ConversationId): Promise<void>;
     conversationExists(conversationId: ConversationId): Promise<boolean>;
     clientValidKeypackagesCount(): Promise<number>;
     clientKeypackages(amountRequested: number): Promise<Uint8Array[]>;

package/src/main/mls/MLSService/MLSService.js

@@ -17,10 +17,22 @@
  * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  */
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MLSService = exports.optionalToUint8Array = void 0;
 const bazinga64_1 = require("bazinga64");
 const messageSender_1 = require("../../conversation/message/messageSender");
+const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 //@todo: this function is temporary, we wait for the update from core-crypto side
 //they are returning regular array instead of Uint8Array for commit and welcome messages
 const optionalToUint8Array = (array) => {
@@ -40,23 +52,23 @@ class MLSService {
         }
         return client;
     }
-    async uploadCommitBundle(groupId, commitBundle) {
+    async uploadCommitBundle(groupId, { commit, welcome }) {
         const coreCryptoClient = this.getCoreCryptoClient();
-        if (commitBundle.welcome) {
-            //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
-            await this.apiClient.api.conversation.postMlsWelcomeMessage((0, exports.optionalToUint8Array)(commitBundle.welcome));
-        }
-        if (commitBundle.commit) {
+        if (commit) {
             try {
                 const messageResponse = await this.apiClient.api.conversation.postMlsMessage(
                 //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
-                (0, exports.optionalToUint8Array)(commitBundle.commit));
+                (0, exports.optionalToUint8Array)(commit));
                 await coreCryptoClient.commitAccepted(groupId);
+                if (welcome) {
+                    // If the commit went well, we can send the Welcome
+                    //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
+                    await this.apiClient.api.conversation.postMlsWelcomeMessage((0, exports.optionalToUint8Array)(welcome));
+                }
                 return messageResponse;
             }
             catch (error) {
                 await coreCryptoClient.clearPendingCommit(groupId);
-                return null;
             }
         }
         return null;
@@ -68,6 +80,18 @@ class MLSService {
             return this.uploadCommitBundle(groupId, memberAddedMessages);
         });
     }
+    configureMLSCallbacks(_a) {
+        var { groupIdFromConversationId } = _a, coreCryptoCallbacks = __rest(_a, ["groupIdFromConversationId"]);
+        this.getCoreCryptoClient().registerCallbacks(Object.assign(Object.assign({}, coreCryptoCallbacks), { clientIdBelongsToOneOf: (client, otherClients) => {
+                const decoder = new TextDecoder();
+                const { user } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(client));
+                return otherClients.some(client => {
+                    const { user: otherUser } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(client));
+                    return otherUser === user;
+                });
+            } }));
+        this.groupIdFromConversationId = groupIdFromConversationId;
+    }
     async getKeyPackagesPayload(qualifiedUsers) {
         /**
          * @note We need to fetch key packages for all the users
@@ -122,8 +146,9 @@ class MLSService {
             return this.uploadCommitBundle(conversationId, commitBundle);
         });
     }
-    async commitPendingProposals(conversationId) {
-        return this.getCoreCryptoClient().commitPendingProposals(conversationId);
+    async commitPendingProposals(groupId) {
+        const commitBundle = await this.getCoreCryptoClient().commitPendingProposals(groupId);
+        return commitBundle ? void this.uploadCommitBundle(groupId, commitBundle) : undefined;
     }
     async conversationExists(conversationId) {
         return this.getCoreCryptoClient().conversationExists(conversationId);

package/src/main/mls/types.d.ts

@@ -1,7 +1,18 @@
+import { QualifiedId } from '@wireapp/api-client/src/user';
+import { CoreCryptoCallbacks } from '@wireapp/core-crypto';
 declare type SecretCrypto<T> = {
     encrypt: (value: Uint8Array) => Promise<T>;
     decrypt: (payload: T) => Promise<Uint8Array>;
 };
+export interface MLSCallbacks extends Pick<CoreCryptoCallbacks, 'authorize'> {
+    /**
+     * Should return a groupId corresponding to the conversation ID given
+     * Used for the core to know what core-crypto conversation we are dealing with when receiving events
+     * @param conversationId
+     * @returns the bytes of the groupId corresponding to the conversation ID
+     */
+    groupIdFromConversationId: (conversationId: QualifiedId) => Promise<string | undefined>;
+}
 export interface MLSConfig<T = any> {
     /**
      * encrypt/decrypt function pair that will be called before storing/fetching secrets in the secrets database.

package/src/main/notification/NotificationBackendRepository.d.ts

@@ -1,5 +1,5 @@
-import type { APIClient } from '@wireapp/api-client';
-import type { Notification } from '@wireapp/api-client/src/notification/';
+import { APIClient } from '@wireapp/api-client';
+import { Notification } from '@wireapp/api-client/src/notification/';
 export declare class NotificationBackendRepository {
     private readonly apiClient;
     constructor(apiClient: APIClient);

package/src/main/notification/NotificationDatabaseRepository.d.ts

@@ -1,7 +1,7 @@
-import type { BackendEvent } from '@wireapp/api-client/src/event';
-import type { Notification } from '@wireapp/api-client/src/notification/';
-import type { CRUDEngine } from '@wireapp/store-engine';
-import { CommonMLS, CompoundGroupIdParams, StorePendingProposalsParams } from './types';
+import { BackendEvent } from '@wireapp/api-client/src/event';
+import { Notification } from '@wireapp/api-client/src/notification/';
+import { CRUDEngine } from '@wireapp/store-engine';
+import { CommonMLS, StorePendingProposalsParams } from './types';
 export declare enum DatabaseStores {
     EVENTS = "events"
 }
@@ -18,9 +18,6 @@ export declare class NotificationDatabaseRepository {
     createLastEventDate(eventDate: Date): Promise<Date>;
     getLastNotificationId(): Promise<string>;
     updateLastNotificationId(lastNotification: Notification): Promise<string>;
-    private generateCompoundGroupIdPrimaryKey;
-    addCompoundGroupId(params: CompoundGroupIdParams): Promise<CompoundGroupIdParams>;
-    getCompoundGroupId(params: Omit<CompoundGroupIdParams, 'groupId'>): Promise<string>;
     /**
      * ## MLS only ##
      * Store groupIds with pending proposals and a delay in the DB until the proposals get committed.