@wireapp/core 30.12.0 → 31.0.0

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

@@ -28,12 +28,12 @@ const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
 const TypePredicateUtil_1 = require("../../util/TypePredicateUtil");
 const MessageBuilder_1 = require("../message/MessageBuilder");
 const MessageService_1 = require("../message/MessageService");
-const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
 const ConversationService_types_1 = require("./ConversationService.types");
 const bazinga64_1 = require("bazinga64");
-const mapQualifiedUserClientIdsToFullyQualifiedClientIds_1 = require("../../util/mapQualifiedUserClientIdsToFullyQualifiedClientIds");
+const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const mls_1 = require("../../mls");
 const messageSender_1 = require("../message/messageSender");
+const messageGenerator_1 = require("./messageGenerator");
 class ConversationService {
     constructor(apiClient, cryptographyService, config, notificationService, mlsService) {
         this.apiClient = apiClient;
@@ -43,17 +43,6 @@ class ConversationService {
         this.messageTimer = new conversation_2.MessageTimer();
         this.messageService = new MessageService_1.MessageService(this.apiClient, cryptographyService);
     }
-    createEphemeral(originalGenericMessage, expireAfterMillis) {
-        const ephemeralMessage = protocol_messaging_1.Ephemeral.create({
-            expireAfterMillis,
-            [originalGenericMessage.content]: originalGenericMessage[originalGenericMessage.content],
-        });
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.EPHEMERAL]: ephemeralMessage,
-            messageId: originalGenericMessage.messageId,
-        });
-        return genericMessage;
-    }
     async getConversationQualifiedMembers(conversationId) {
         const conversation = await this.apiClient.api.conversation.getConversation(conversationId);
         /*
@@ -231,214 +220,6 @@ class ConversationService {
         }
         return userIds;
     }
-    generateButtonActionGenericMessage(payloadBundle) {
-        return protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.BUTTON_ACTION]: protocol_messaging_1.ButtonAction.create(payloadBundle.content),
-            messageId: payloadBundle.id,
-        });
-    }
-    generateButtonActionConfirmationGenericMessage(payloadBundle) {
-        return protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.BUTTON_ACTION_CONFIRMATION]: protocol_messaging_1.ButtonActionConfirmation.create(payloadBundle.content),
-            messageId: payloadBundle.id,
-        });
-    }
-    generateCompositeGenericMessage(payloadBundle) {
-        return protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.COMPOSITE]: protocol_messaging_1.Composite.create(payloadBundle.content),
-            messageId: payloadBundle.id,
-        });
-    }
-    generateConfirmationGenericMessage(payloadBundle) {
-        const content = protocol_messaging_1.Confirmation.create(payloadBundle.content);
-        return protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.CONFIRMATION]: content,
-            messageId: payloadBundle.id,
-        });
-    }
-    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({
-            [conversation_2.GenericMessageType.EDITED]: editedMessage,
-            messageId: payloadBundle.id,
-        });
-    }
-    generateFileDataGenericMessage(payloadBundle) {
-        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 = conversation_2.AssetTransferState.UPLOADED;
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.ASSET]: assetMessage,
-            messageId: payloadBundle.id,
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
-    }
-    generateFileMetaDataGenericMessage(payloadBundle) {
-        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({
-            [conversation_2.GenericMessageType.ASSET]: assetMessage,
-            messageId: payloadBundle.id,
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
-    }
-    generateFileAbortGenericMessage(payloadBundle) {
-        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 = conversation_2.AssetTransferState.NOT_UPLOADED;
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.ASSET]: assetMessage,
-            messageId: payloadBundle.id,
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
-    }
-    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({
-            [conversation_2.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 = conversation_2.AssetTransferState.UPLOADED;
-        return assetMessage;
-    }
-    generateImageGenericMessage(payloadBundle) {
-        const imageAsset = this.generateAsset(payloadBundle);
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.ASSET]: imageAsset,
-            messageId: payloadBundle.id,
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        return { genericMessage, content: imageAsset };
-    }
-    generateLocationGenericMessage(payloadBundle) {
-        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({
-            [conversation_2.GenericMessageType.LOCATION]: locationMessage,
-            messageId: payloadBundle.id,
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
-    }
-    generatePingGenericMessage(payloadBundle) {
-        const content = protocol_messaging_1.Knock.create(payloadBundle.content);
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.KNOCK]: content,
-            messageId: payloadBundle.id,
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
-    }
-    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({
-            [conversation_2.GenericMessageType.REACTION]: reaction,
-            messageId: payloadBundle.id,
-        });
-        return genericMessage;
-    }
-    generateSessionResetGenericMessage(payloadBundle) {
-        return protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.CLIENT_ACTION]: protocol_messaging_1.ClientAction.RESET_SESSION,
-            messageId: payloadBundle.id,
-        });
-    }
-    generateCallGenericMessage(payloadBundle) {
-        const callMessage = protocol_messaging_1.Calling.create({
-            content: payloadBundle.content,
-        });
-        return protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.CALLING]: callMessage,
-            messageId: payloadBundle.id,
-        });
-    }
-    generateTextGenericMessage(payloadBundle) {
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            messageId: payloadBundle.id,
-            [conversation_2.GenericMessageType.TEXT]: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
-        });
-        const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
-    }
     async clearConversation(conversationId, timestamp = new Date(), messageId = MessageBuilder_1.MessageBuilder.createId(), sendAsProtobuf) {
         if (timestamp instanceof Date) {
             timestamp = timestamp.getTime();
@@ -588,35 +369,6 @@ class ConversationService {
             type: conversation_2.PayloadBundleType.MESSAGE_HIDE,
         };
     }
-    async deleteMessageEveryone(conversationId, messageIdToDelete, userIds, sendAsProtobuf, conversationDomain, callbacks) {
-        var _a, _b;
-        const messageId = MessageBuilder_1.MessageBuilder.createId();
-        const content = protocol_messaging_1.MessageDelete.create({
-            messageId: messageIdToDelete,
-        });
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [conversation_2.GenericMessageType.DELETED]: content,
-            messageId,
-        });
-        (_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks, genericMessage);
-        const response = await this.sendGenericMessage(this.apiClient.validatedClientId, conversationId, genericMessage, {
-            userIds,
-            sendAsProtobuf,
-            conversationDomain,
-        });
-        (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response === null || response === void 0 ? void 0 : response.time);
-        return {
-            content,
-            conversation: conversationId,
-            from: this.apiClient.context.userId,
-            id: messageId,
-            messageTimer: this.messageTimer.getMessageTimer(conversationId),
-            source: conversation_2.PayloadBundleSource.LOCAL,
-            state: conversation_2.PayloadBundleState.OUTGOING_SENT,
-            timestamp: Date.now(),
-            type: conversation_2.PayloadBundleType.MESSAGE_DELETE,
-        };
-    }
     createProteusConversation(conversationData, otherUserIds) {
         let payload;
         if (typeof conversationData === 'string') {
@@ -689,7 +441,7 @@ class ConversationService {
             return params.protocol === conversation_1.ConversationProtocol.MLS;
         }
         const { payload, onStart } = params;
-        const { genericMessage, content } = this.generateGenericMessage(payload);
+        const { genericMessage, content } = (0, messageGenerator_1.generateGenericMessage)(payload, this.messageTimer);
         if ((await (onStart === null || onStart === void 0 ? void 0 : onStart(genericMessage))) === false) {
             // If the onStart call returns false, it means the consumer wants to cancel the message sending
             return Object.assign(Object.assign({}, payload), { state: conversation_2.PayloadBundleState.CANCELLED });
@@ -736,65 +488,6 @@ class ConversationService {
         const hasFailed = Object.keys(mismatch.failed_to_send || {}).length > 0;
         return !hasMissing && !hasDeleted && !hasRedundant && !hasFailed;
     }
-    generateGenericMessage(payload) {
-        let genericMessage;
-        const content = payload.content;
-        switch (payload.type) {
-            case conversation_2.PayloadBundleType.ASSET:
-                genericMessage = this.generateFileDataGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.ASSET_ABORT:
-                genericMessage = this.generateFileAbortGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.ASSET_META:
-                genericMessage = this.generateFileMetaDataGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.ASSET_IMAGE:
-                return this.generateImageGenericMessage(payload);
-            case conversation_2.PayloadBundleType.BUTTON_ACTION:
-                genericMessage = this.generateButtonActionGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.BUTTON_ACTION_CONFIRMATION:
-                genericMessage = this.generateButtonActionConfirmationGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.CALL:
-                genericMessage = this.generateCallGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.CLIENT_ACTION: {
-                if (payload.content.clientAction !== protocol_messaging_1.ClientAction.RESET_SESSION) {
-                    throw new Error(`No send method implemented for "${payload.type}" and ClientAction "${payload.content}".`);
-                }
-                genericMessage = this.generateSessionResetGenericMessage(payload);
-                return { genericMessage, content };
-            }
-            case conversation_2.PayloadBundleType.COMPOSITE:
-                genericMessage = this.generateCompositeGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.CONFIRMATION:
-                genericMessage = this.generateConfirmationGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.LOCATION:
-                genericMessage = this.generateLocationGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.MESSAGE_EDIT:
-                genericMessage = this.generateEditedTextGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.PING:
-                genericMessage = this.generatePingGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.REACTION:
-                genericMessage = this.generateReactionGenericMessage(payload);
-                return { genericMessage, content };
-            case conversation_2.PayloadBundleType.TEXT:
-                genericMessage = this.generateTextGenericMessage(payload);
-                return { genericMessage, content };
-            /**
-             * ToDo: Create Generic implementation for everything else
-             */
-            default:
-                throw new Error(`No send method implemented for "${payload['type']}".`);
-        }
-    }
     /**
      *   ###############################################
      *   ################ MLS Functions ################
@@ -830,7 +523,6 @@ class ConversationService {
             ...qualifiedUsers,
         ]);
         const response = await this.mlsService.addUsersToExistingConversation(groupIdDecodedFromBase64, coreCryptoKeyPackagesPayload);
-        await this.notificationService.saveConversationGroupId(newConversation);
         //We store the info when conversation (along with key material) was created, so we will know when to renew it
         const groupCreationTimeStamp = new Date().getTime();
         await this.notificationService.storeLastKeyMaterialUpdateDate({
@@ -877,7 +569,7 @@ class ConversationService {
     async removeUsersFromMLSConversation({ groupId, conversationId, qualifiedUserIds, }) {
         const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         const clientsToRemove = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedUserIds });
-        const fullyQualifiedClientIds = (0, mapQualifiedUserClientIdsToFullyQualifiedClientIds_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(clientsToRemove.qualified_user_map);
+        const fullyQualifiedClientIds = (0, fullyQualifiedClientIdUtils_1.mapQualifiedUserClientIdsToFullyQualifiedClientIds)(clientsToRemove.qualified_user_map);
         const messageResponse = await this.mlsService.removeClientsFromConversation(groupIdDecodedFromBase64, fullyQualifiedClientIds);
         //key material gets updated after removing a user from the group, so we can reset last key update time value in the store
         await this.storeLastKeyMaterialUpdateDateWithCurrentTime(groupId);

package/src/main/conversation/ConversationService/ConversationService.types.d.ts

@@ -82,12 +82,14 @@ export declare type SendProteusMessageParams<T> = SendCommonParams<T> & MessageS
      */
     userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
     onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
+    protocol: ConversationProtocol.PROTEUS;
 };
 export declare type SendMlsMessageParams<T> = SendCommonParams<T> & {
     /**
      * The groupId of the conversation to send the message to (Needed only for MLS)
      */
     groupId: string;
+    protocol: ConversationProtocol.MLS;
 };
 export declare type QualifiedUsers = QualifiedId & {
     skipOwn?: string;

package/src/main/conversation/ConversationService/messageGenerator.d.ts

@@ -0,0 +1,9 @@
+import { OtrMessage } from '../message/OtrMessage';
+import { GenericMessage } from '@wireapp/protocol-messaging';
+import { MessageTimer } from '../MessageTimer';
+interface GeneratedMessage<T extends OtrMessage> {
+    genericMessage: GenericMessage;
+    content: T['content'];
+}
+export declare function generateGenericMessage<T extends OtrMessage>(payload: T, messageTimer: MessageTimer): GeneratedMessage<T>;
+export {};