@wireapp/core 30.11.2 → 30.13.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [30.13.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.12.0...@wireapp/core@30.13.0) (2022-09-20)
+
+
+### Features
+
+* Handle external proposals ([#4397](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4397)) ([54c5f97](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/54c5f979eb5e5bd4e864dad1b9acb3c330ddac75))
+
+
+
+
+
+# [30.12.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.11.2...@wireapp/core@30.12.0) (2022-09-20)
+
+
+### Features
+
+* leave mls convo - refactor (FS-683) ([#4401](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4401)) ([909e142](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/909e142753035fb54c8b4f19076a1dec646f6b97))
+
+
+
+
+
 ## [30.11.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.11.1...@wireapp/core@30.11.2) (2022-09-19)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -75,6 +75,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "30.11.2",
-  "gitHead": "4e82d31760bc2f55bc345027b3e01d3ecbd2ee07"
+  "version": "30.13.0",
+  "gitHead": "b88023577debb092f6bb4a0125f0cd64ce14d200"
 }

package/src/main/Account.d.ts

@@ -23,7 +23,7 @@ import { AccountService } from './account/';
 import { LinkPreviewService } from './linkPreview';
 import { WEBSOCKET_STATE } from '@wireapp/api-client/src/tcp/ReconnectingWebsocket';
 import { MLSService } from './mls';
-import type { MLSConfig } from './mls/types';
+import type { MLSCallbacks, MLSConfig } from './mls/types';
 export declare type ProcessedEventPayload = HandledEventPayload;
 declare enum TOPIC {
     ERROR = "Account.TOPIC.ERROR"
@@ -147,6 +147,14 @@ export declare class Account<T = any> extends EventEmitter {
         isNewClient: boolean;
         localClient: RegisteredClient;
     }>;
+    /**
+     * In order to be able to send MLS messages, the core needs a few information from the consumer.
+     * Namely:
+     * - is the current user allowed to administrate a specific conversation
+     * - what is the groupId of a conversation
+     * @param mlsCallbacks
+     */
+    configureMLSCallbacks(mlsCallbacks: MLSCallbacks): void;
     initServices(context: Context): Promise<void>;
     loadAndValidateLocalClient(entropyData?: Uint8Array): Promise<RegisteredClient>;
     private createMLSClient;

package/src/main/Account.js

@@ -232,6 +232,17 @@ class Account extends events_1.EventEmitter {
             throw error;
         }
     }
+    /**
+     * In order to be able to send MLS messages, the core needs a few information from the consumer.
+     * Namely:
+     * - is the current user allowed to administrate a specific conversation
+     * - what is the groupId of a conversation
+     * @param mlsCallbacks
+     */
+    configureMLSCallbacks(mlsCallbacks) {
+        var _a;
+        (_a = this.service) === null || _a === void 0 ? void 0 : _a.mls.configureMLSCallbacks(mlsCallbacks);
+    }
     async initServices(context) {
         this.storeEngine = await this.initEngine(context);
         const accountService = new account_1.AccountService(this.apiClient);

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

@@ -110,11 +110,6 @@ export declare class ConversationService {
     fetchAllParticipantsClients(conversationId: string, conversationDomain?: string): Promise<UserClients | QualifiedUserClients>;
     deleteMessageLocal(conversationId: string, messageIdToHide: string, sendAsProtobuf?: boolean, conversationDomain?: string): Promise<HideMessage>;
     deleteMessageEveryone(conversationId: string, messageIdToDelete: string, userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients, sendAsProtobuf?: boolean, conversationDomain?: string, callbacks?: MessageSendingCallbacks): Promise<DeleteMessage>;
-    leaveConversation(conversationId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
-    /**
-     * @depricated seems not to be used and is outdated. use leaveConversation instead
-     */
-    leaveConversations(conversationIds?: string[]): Promise<ConversationMemberLeaveEvent[]>;
     /**
      * Create a group conversation.
      * @param  {string} name
@@ -138,7 +133,7 @@ export declare class ConversationService {
     getAsset({ assetId, assetToken, otrKey, sha256 }: RemoteData): Promise<Uint8Array>;
     getUnencryptedAsset(assetId: string, assetToken?: string): Promise<ArrayBuffer>;
     addUsersToProteusConversation({ conversationId, qualifiedUserIds }: Omit<AddUsersParams, 'groupId'>): Promise<import("@wireapp/api-client/src/event").ConversationMemberJoinEvent>;
-    removeUserFromProteusConversation(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
+    removeUserFromConversation(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
     private sendProteusMessage;
     /**
      * Sends a message to a conversation

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

@@ -31,7 +31,7 @@ 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");
 class ConversationService {
@@ -617,27 +617,6 @@ class ConversationService {
             type: conversation_2.PayloadBundleType.MESSAGE_DELETE,
         };
     }
-    leaveConversation(conversationId) {
-        if (!this.apiClient.context || !this.apiClient.context.userId || !this.apiClient.context.domain) {
-            throw new Error('Cannot leave conversation without a userId and domain');
-        }
-        return this.apiClient.api.conversation.deleteMember(conversationId, {
-            domain: this.apiClient.context.domain,
-            id: this.apiClient.context.userId,
-        });
-    }
-    /**
-     * @depricated seems not to be used and is outdated. use leaveConversation instead
-     */
-    async leaveConversations(conversationIds) {
-        if (!conversationIds) {
-            const conversation = await this.getConversations();
-            conversationIds = conversation
-                .filter(conversation => conversation.type === conversation_1.CONVERSATION_TYPE.REGULAR)
-                .map(conversation => conversation.id);
-        }
-        return Promise.all(conversationIds.map(conversationId => { var _a, _b; return this.leaveConversation({ id: conversationId, domain: (_b = (_a = this.apiClient.context) === null || _a === void 0 ? void 0 : _a.domain) !== null && _b !== void 0 ? _b : '' }); }));
-    }
     createProteusConversation(conversationData, otherUserIds) {
         let payload;
         if (typeof conversationData === 'string') {
@@ -678,7 +657,7 @@ class ConversationService {
     async addUsersToProteusConversation({ conversationId, qualifiedUserIds }) {
         return this.apiClient.api.conversation.postMembers(conversationId, qualifiedUserIds);
     }
-    async removeUserFromProteusConversation(conversationId, userId) {
+    async removeUserFromConversation(conversationId, userId) {
         return this.apiClient.api.conversation.deleteMember(conversationId, userId);
     }
     async sendProteusMessage(params, genericMessage, content) {
@@ -851,7 +830,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({
@@ -898,7 +876,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/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 type { 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/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 { 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.

package/src/main/notification/NotificationDatabaseRepository.js

@@ -63,16 +63,6 @@ class NotificationDatabaseRepository {
         });
         return lastNotification.id;
     }
-    generateCompoundGroupIdPrimaryKey({ conversationId, conversationDomain, }) {
-        return `${conversationId}@${conversationDomain}`;
-    }
-    async addCompoundGroupId(params) {
-        await this.storeEngine.updateOrCreate(STORES.GROUP_IDS, this.generateCompoundGroupIdPrimaryKey(params), params.groupId);
-        return params;
-    }
-    async getCompoundGroupId(params) {
-        return this.storeEngine.read(STORES.GROUP_IDS, this.generateCompoundGroupIdPrimaryKey(params));
-    }
     /**
      * ## MLS only ##
      * Store groupIds with pending proposals and a delay in the DB until the proposals get committed.

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

@@ -9,8 +9,6 @@ import { NotificationError } from '../CoreError';
 import type { CryptographyService } from '../cryptography';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { AbortHandler } from '@wireapp/api-client/src/tcp';
-import { QualifiedId } from '@wireapp/api-client/src/user';
-import { Conversation } from '@wireapp/api-client/src/conversation';
 import { CommitPendingProposalsParams, LastKeyMaterialUpdateParams } from './types';
 import type { MLSService } from '../mls';
 export declare type HandledEventPayload = {
@@ -61,23 +59,14 @@ export declare class NotificationService extends EventEmitter {
     handleNotification(notification: Notification, source: PayloadBundleSource, dryRun?: boolean): AsyncGenerator<HandledEventPayload>;
     private cleanupPayloadBundle;
     private handleEvent;
-    /**
-     * ## MLS only ##
-     * If there is a groupId in the conversation, we need to store the conversationId => groupId pair
-     * in order to find the groupId when decrypting messages
-     * This is a bit hacky but since mls messages do not embed the groupId we need to keep a mapping of those
-     *
-     * @param conversation conversation with group_id
-     */
-    saveConversationGroupId(conversation: Conversation): Promise<void>;
     /**
      * ## MLS only ##
      * If there is a matching conversationId => groupId pair in the database,
-     * we can find the groupId and return it as a Uint8Array
+     * we can find the groupId and return it as a string
      *
      * @param conversationQualifiedId
      */
-    getUint8ArrayFromConversationGroupId(conversationQualifiedId: QualifiedId): Promise<Uint8Array>;
+    private getGroupIdFromConversationId;
     /**
      * ## MLS only ##
      * If there are pending proposals, we need to either process them,

package/src/main/notification/NotificationService.js

@@ -229,20 +229,25 @@ class NotificationService extends events_1.EventEmitter {
                 const groupIdStr = bazinga64_1.Encoder.toBase64(newGroupId).asString;
                 // The groupId can then be sent back to the consumer
                 return {
-                    event,
+                    event: Object.assign(Object.assign({}, event), { data: groupIdStr }),
                     mappedEvent: ConversationMapper_1.ConversationMapper.mapConversationEvent(Object.assign(Object.assign({}, event), { data: groupIdStr }), source),
                 };
             case Events.CONVERSATION_EVENT.MLS_MESSAGE_ADD:
                 const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
-                const groupId = await this.getUint8ArrayFromConversationGroupId((_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' });
+                const groupId = await this.getGroupIdFromConversationId((_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' });
+                const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
                 // Check if the message includes proposals
-                const { proposals, commitDelay, message } = await this.mlsService.decryptMessage(groupId, encryptedData);
-                if (proposals.length > 0) {
+                const { proposals, commitDelay, message } = await this.mlsService.decryptMessage(groupIdBytes, encryptedData);
+                if (typeof commitDelay === 'number' || proposals.length > 0) {
+                    // we are dealing with a proposal, add a task to process this proposal later on
+                    // Those proposals are stored inside of coreCrypto and will be handled after a timeout
                     await this.handlePendingProposals({
-                        groupId: groupId.toString(),
+                        groupId,
                         delayInMs: commitDelay !== null && commitDelay !== void 0 ? commitDelay : 0,
                         eventTime: event.time,
                     });
+                    // This is not a text message, there is nothing more to do
+                    return { event };
                 }
                 if (!message) {
                     throw new Error(`MLS message received from ${source} was empty`);
@@ -280,7 +285,6 @@ class NotificationService extends events_1.EventEmitter {
                 if (!conversation) {
                     throw new Error('no conv');
                 }
-                await this.saveConversationGroupId(conversation);
             case Events.CONVERSATION_EVENT.MESSAGE_TIMER_UPDATE:
             case Events.CONVERSATION_EVENT.RENAME:
             case Events.CONVERSATION_EVENT.TYPING: {
@@ -298,37 +302,21 @@ class NotificationService extends events_1.EventEmitter {
         }
         return { event };
     }
-    /**
-     * ## MLS only ##
-     * If there is a groupId in the conversation, we need to store the conversationId => groupId pair
-     * in order to find the groupId when decrypting messages
-     * This is a bit hacky but since mls messages do not embed the groupId we need to keep a mapping of those
-     *
-     * @param conversation conversation with group_id
-     */
-    async saveConversationGroupId(conversation) {
-        if (conversation.group_id) {
-            const { group_id: groupId, qualified_id: { id: conversationId, domain: conversationDomain }, } = conversation;
-            await this.database.addCompoundGroupId({ conversationDomain, conversationId, groupId });
-        }
-    }
     /**
      * ## MLS only ##
      * If there is a matching conversationId => groupId pair in the database,
-     * we can find the groupId and return it as a Uint8Array
+     * we can find the groupId and return it as a string
      *
      * @param conversationQualifiedId
      */
-    async getUint8ArrayFromConversationGroupId(conversationQualifiedId) {
+    async getGroupIdFromConversationId(conversationQualifiedId) {
+        var _a, _b;
         const { id: conversationId, domain: conversationDomain } = conversationQualifiedId;
-        const groupId = await this.database.getCompoundGroupId({
-            conversationId,
-            conversationDomain,
-        });
+        const groupId = await ((_b = (_a = this.mlsService).groupIdFromConversationId) === null || _b === void 0 ? void 0 : _b.call(_a, conversationQualifiedId));
         if (!groupId) {
             throw new Error(`Could not find a group_id for conversation ${conversationId}@${conversationDomain}`);
         }
-        return bazinga64_1.Decoder.fromBase64(groupId).asBytes;
+        return groupId;
     }
     /**
      * ## MLS only ##

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

@@ -1,10 +1,6 @@
 export declare type CommonMLS = {
     groupId: string;
 };
-export declare type CompoundGroupIdParams = {
-    conversationId: string;
-    conversationDomain: string;
-} & CommonMLS;
 export declare type HandlePendingProposalsParams = {
     delayInMs: number;
     eventTime: string;

package/src/main/util/{mapQualifiedUserClientIdsToFullyQualifiedClientIds.d.ts → fullyQualifiedClientIdUtils.d.ts}

@@ -4,5 +4,10 @@ declare type ClientId = string;
 declare type Domain = string;
 export declare type ClientIdStringType = `${UserId}:${ClientId}@${Domain}`;
 export declare const constructFullyQualifiedClientId: (userId: UserId, clientId: ClientId, domain: Domain) => ClientIdStringType;
+export declare const parseFullQualifiedClientId: (qualifiedId: string) => {
+    user: UserId;
+    client: ClientId;
+    domain: Domain;
+};
 export declare const mapQualifiedUserClientIdsToFullyQualifiedClientIds: (qualifiedUserMap: QualifiedUserClientMap) => Uint8Array[];
 export {};

package/src/main/util/{mapQualifiedUserClientIdsToFullyQualifiedClientIds.js → fullyQualifiedClientIdUtils.js}

@@ -18,9 +18,19 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapQualifiedUserClientIdsToFullyQualifiedClientIds = exports.constructFullyQualifiedClientId = void 0;
+exports.mapQualifiedUserClientIdsToFullyQualifiedClientIds = exports.parseFullQualifiedClientId = exports.constructFullyQualifiedClientId = void 0;
 const constructFullyQualifiedClientId = (userId, clientId, domain) => `${userId}:${clientId}@${domain}`;
 exports.constructFullyQualifiedClientId = constructFullyQualifiedClientId;
+const parseFullQualifiedClientId = (qualifiedId) => {
+    var _a;
+    const regexp = /([a-zA-Z0-9\-]+):([a-zA-Z0-9\-]+)@([a-zA-Z0-9\-.]+)/;
+    const [, user, client, domain] = (_a = qualifiedId.match(regexp)) !== null && _a !== void 0 ? _a : [];
+    if (!user || !client || !domain) {
+        throw new Error(`given client fully qualified ID is corrupted (${qualifiedId})`);
+    }
+    return { user, client, domain };
+};
+exports.parseFullQualifiedClientId = parseFullQualifiedClientId;
 const mapQualifiedUserClientIdsToFullyQualifiedClientIds = (qualifiedUserMap) => {
     const encoder = new TextEncoder();
     return Object.entries(qualifiedUserMap).flatMap(([domain, users]) => {
@@ -29,4 +39,4 @@ const mapQualifiedUserClientIdsToFullyQualifiedClientIds = (qualifiedUserMap) =>
     });
 };
 exports.mapQualifiedUserClientIdsToFullyQualifiedClientIds = mapQualifiedUserClientIdsToFullyQualifiedClientIds;
-//# sourceMappingURL=mapQualifiedUserClientIdsToFullyQualifiedClientIds.js.map
+//# sourceMappingURL=fullyQualifiedClientIdUtils.js.map