revert randomization here

apps/meteor/app/e2e/client/rocketchat.e2e.room.js

@@ -1,6 +1,5 @@
 import { Base64 } from '@rocket.chat/base64';
 import { Emitter } from '@rocket.chat/emitter';
-import { Random } from '@rocket.chat/random';
 import EJSON from 'ejson';
 
 import { RoomManager } from '../../../client/lib/RoomManager';
@@ -68,13 +67,12 @@ export class E2ERoom extends Emitter {
 
 	[PAUSED] = undefined;
 
-	constructor(userId, room, t) {
+	constructor(userId, roomId, t) {
 		super();
 
 		this.userId = userId;
-		this.roomId = room._id;
+		this.roomId = roomId;
 		this.typeOfRoom = t;
-		this.roomKeyId = room.e2eKeyId;
 
 		this.once(E2ERoomState.READY, () => this.decryptPendingMessages());
 		this.once(E2ERoomState.READY, () => this.decryptSubscription());
@@ -295,7 +293,7 @@ export class E2ERoom extends Emitter {
 			return false;
 		}
 
-		this.keyID = this.roomKeyId;
+		this.keyID = Base64.encode(this.sessionKeyExportedString).slice(0, 12);
 
 		// Import session key for use.
 		try {
@@ -323,10 +321,8 @@ export class E2ERoom extends Emitter {
 		try {
 			const sessionKeyExported = await exportJWKKey(this.groupSessionKey);
 			this.sessionKeyExportedString = JSON.stringify(sessionKeyExported);
-			console.log(this.groupSessionKey, sessionKeyExported);
-			this.keyID = Random.id(12);
+			this.keyID = Base64.encode(this.sessionKeyExportedString).slice(0, 12);
 
-			this.log(sessionKeyExported, this.sessionKeyExportedString, this.keyID, this.groupSessionKey);
 			await sdk.call('e2e.setRoomKeyID', this.roomId, this.keyID);
 			await this.encryptKeyForOtherParticipants();
 		} catch (error) {

apps/meteor/app/e2e/client/rocketchat.e2e.ts

@@ -262,7 +262,7 @@ class E2E extends Emitter {
 		}
 
 		if (!this.instancesByRoomId[rid]) {
-			this.instancesByRoomId[rid] = new E2ERoom(Meteor.userId(), room, room.t);
+			this.instancesByRoomId[rid] = new E2ERoom(Meteor.userId(), rid, room.t);
 		}
 
 		return this.instancesByRoomId[rid];