@wireapp/core 30.12.0 → 31.0.0

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

@@ -1,18 +1,16 @@
 /// <reference types="node" />
-import type { APIClient } from '@wireapp/api-client';
+import { APIClient } from '@wireapp/api-client';
 import * as Events from '@wireapp/api-client/src/event';
-import type { Notification } from '@wireapp/api-client/src/notification/';
+import { Notification } from '@wireapp/api-client/src/notification/';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { EventEmitter } from 'events';
 import { PayloadBundle, PayloadBundleSource } from '../conversation';
 import { NotificationError } from '../CoreError';
-import type { CryptographyService } from '../cryptography';
+import { 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';
+import { MLSService } from '../mls';
 export declare type HandledEventPayload = {
     event: Events.BackendEvent;
     mappedEvent?: PayloadBundle;
@@ -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/self/SelfService.d.ts

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

package/src/main/team/TeamService.d.ts

@@ -1,5 +1,5 @@
-import type { APIClient } from '@wireapp/api-client';
-import type { MemberData, Members, NewTeamData, TeamChunkData, TeamData, UpdateTeamData } from '@wireapp/api-client/src/team/';
+import { APIClient } from '@wireapp/api-client';
+import { MemberData, Members, NewTeamData, TeamChunkData, TeamData, UpdateTeamData } from '@wireapp/api-client/src/team/';
 export declare class TeamService {
     private readonly apiClient;
     constructor(apiClient: APIClient);

package/src/main/test/CryptographyHelper.d.ts

@@ -1,4 +1,4 @@
 import { keys } from '@wireapp/proteus';
-import type { CryptographyService } from '../cryptography';
+import { CryptographyService } from '../cryptography';
 export declare function createEncodedCipherText(receiver: keys.IdentityKeyPair, preKey: keys.PreKey, text: string): Promise<string>;
 export declare function getPlainText(cryptographyService: CryptographyService, encodedPreKeyMessage: string, sessionId?: string): Promise<string | void>;

package/src/main/user/UserService.d.ts

@@ -1,6 +1,6 @@
-import type { APIClient } from '@wireapp/api-client';
-import type { QualifiedId, User } from '@wireapp/api-client/src/user/';
-import type { AvailabilityType, BroadcastService } from '../broadcast/';
+import { APIClient } from '@wireapp/api-client';
+import { QualifiedId, User } from '@wireapp/api-client/src/user/';
+import { AvailabilityType, BroadcastService } from '../broadcast/';
 import { ConnectionService } from '../connection';
 import { ConversationService } from '../conversation';
 export declare class UserService {

package/src/main/util/TypePredicateUtil.d.ts

@@ -1,5 +1,5 @@
-import type { QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation/';
-import type { QualifiedId } from '@wireapp/api-client/src/user/';
+import { QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation/';
+import { QualifiedId } from '@wireapp/api-client/src/user/';
 export declare function isStringArray(obj: any): obj is string[];
 export declare function isQualifiedId(obj: any): obj is QualifiedId;
 export declare function isQualifiedIdArray(obj: any): obj is QualifiedId[];

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