Add team ID to encrypted payloads to support multiple communities writing to QSS (#2901)

Author: islathehut

packages/backend/src/nest/auth/services/crypto/crypto.service.ts

@@ -64,7 +64,8 @@ class CryptoService extends ChainServiceBase {
       },
       ts: Date.now(),
       userId: this.sigChain.user.userId,
-    } as EncryptedAndSignedPayload
+      teamId: this.sigChain.team!.id,
+    }
   }
 
   private symEncrypt(message: any, scope: EncryptionScope): EncryptedPayload {

packages/backend/src/nest/auth/services/crypto/types.ts

@@ -27,6 +27,7 @@ export type EncryptedAndSignedPayload = {
   signature: Signature
   ts: number
   userId: string
+  teamId: string
 }
 
 export type DecryptedPayload<T> = {

packages/backend/src/nest/storage/channels/messages/messages.service.spec.ts

@@ -49,6 +49,7 @@ describe('MessagesService', () => {
       expect(encryptedMessage).toEqual(
         expect.objectContaining({
           id: message.id,
+          teamId: sigChainService.team.id,
           createdAt: message.createdAt,
           channelId: message.channelId,
           contents: expect.objectContaining({

packages/backend/src/nest/storage/channels/messages/messages.service.ts

@@ -61,6 +61,7 @@ export class MessagesService extends EventEmitter {
         id: rawMessage.id,
         channelId: rawMessage.channelId,
         createdAt: rawMessage.createdAt,
+        teamId: encryptedMessage.teamId,
         encSignature: encryptedMessage.signature,
         contents: encryptedMessage.encrypted,
       }

packages/backend/src/nest/storage/channels/messages/messages.types.ts

@@ -17,5 +17,6 @@ export interface EncryptedMessage {
   contents: EncryptedPayload
   createdAt: number
   channelId: string
+  teamId: string
   encSignature: Signature
 }

packages/backend/src/nest/validation/validators.spec.ts

@@ -92,6 +92,7 @@ describe('Validators - Encrypted Messages', () => {
       },
       createdAt: 1710000000000,
       channelId: 'channel-abc',
+      teamId: 'teamId',
       encSignature: {
         author: {
           generation: 0,
@@ -117,6 +118,7 @@ describe('Validators - Encrypted Messages', () => {
       },
       createdAt: 1710000000000,
       channelId: 'channel-abc',
+      teamId: 'teamId',
       encSignature: {
         author: {
           generation: 0,
@@ -142,6 +144,7 @@ describe('Validators - Encrypted Messages', () => {
       },
       createdAt: 1710000000000,
       channelId: 'channel-abc',
+      teamId: 'teamId',
     }
     expect(isEncryptedMessage(invalidEncryptedMessage as unknown as EncryptedMessage)).toBeFalsy()
   })
@@ -159,6 +162,7 @@ describe('Validators - Encrypted Messages', () => {
       },
       createdAt: 1710000000000,
       channelId: 'channel-abc',
+      teamId: 'teamId',
       encSignature: {
         author: {
           generation: 0,

packages/backend/src/nest/validation/validators.ts

@@ -80,6 +80,7 @@ const encryptedMessageSchema = joi.object({
   }),
   createdAt: joi.number().required(),
   channelId: joi.string().required(),
+  teamId: joi.string().required(),
   encSignature: EncryptionSignatureSchema.required(),
 })