cr

RocketChat · Oct 10, 2024 · 1b6c68e · 1b6c68e
1 parent 301ce5c
commit 1b6c68e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
@@ -246,7 +246,9 @@ export class E2ERoom extends Emitter {
  }
 
  async exportOldRoomKeys(oldKeys) {
+ this.log('exportOldRoomKeys starting');
  if (!oldKeys || oldKeys.length === 0) {
+ this.log('exportOldRoomKeys nothing to do');
  return;
  }
 
@@ -269,6 +271,7 @@ export class E2ERoom extends Emitter {
  }
  }
 
+ this.log(`exportOldRoomKeys Done: ${keys.length} keys exported`);
  return keys;
  }
 
@@ -424,6 +427,7 @@ export class E2ERoom extends Emitter {
  this.groupSessionKey = undefined;
  this.sessionKeyExportedString = undefined;
  this.sessionKeyExported = undefined;
+ this.oldKeys = undefined;
  }
 
  async encryptKeyForOtherParticipants() {

diff --git a/apps/meteor/app/e2e/server/functions/resetRoomKey.ts b/apps/meteor/app/e2e/server/functions/resetRoomKey.ts
@@ -111,8 +111,8 @@ function replicateMongoSlice(keyId: string, sub: ISubscription) {
  return [{ e2eKeyId: keyId, ts: new Date(), E2EKey: sub.E2EKey }];
  }
 
- const keys = sub.oldRoomKeys;
- keys.sort((a, b) => b.ts.getTime() - a.ts.getTime());
- keys.unshift({ e2eKeyId: keyId, ts: new Date(), E2EKey: sub.E2EKey });
- return keys.slice(0, 10);
+ const sortedKeys = sub.oldRoomKeys.toSorted((a, b) => b.ts.getTime() - a.ts.getTime());
+ sortedKeys.unshift({ e2eKeyId: keyId, ts: new Date(), E2EKey: sub.E2EKey });
+
+ return sortedKeys.slice(0, 10);
 }
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
@@ -1139,20 +1139,6 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
  return this.updateOne(query, update, options);
  }
 
- unsetE2eKeyId(_id: IRoom['_id'], options: UpdateOptions = {}): Promise<UpdateResult> {
- const query: Filter<IRoom> = {
- _id,
- };
-
- const update: UpdateFilter<IRoom> = {
- $unset: {
- e2eKeyId: 1,
- },
- };
-
- return this.updateOne(query, update, options);
- }
-
  findOneByImportId(_id: IRoom['_id'], options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
  const query: Filter<IRoom> = { importIds: _id };
 

diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
@@ -199,7 +199,6 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
  unsetAvatarData(roomId: string): Promise<UpdateResult>;
  setSystemMessagesById(roomId: string, systemMessages: IRoom['sysMes']): Promise<UpdateResult>;
  setE2eKeyId(roomId: string, e2eKeyId: string, options?: FindOptions<IRoom>): Promise<UpdateResult>;
- unsetE2eKeyId(_id: IRoom['_id'], options?: UpdateOptions): Promise<UpdateResult>;
  findOneByImportId(importId: string, options?: FindOptions<IRoom>): Promise<IRoom | null>;
  findOneByNameAndNotId(name: string, rid: string): Promise<IRoom | null>;
  findOneByIdAndType(roomId: IRoom['_id'], type: IRoom['t'], options?: FindOptions<IRoom>): Promise<IRoom | null>;