diff --git a/packages/base/matrix-event.gts b/packages/base/matrix-event.gts index 9f2b6cca49..8961f0619e 100644 --- a/packages/base/matrix-event.gts +++ b/packages/base/matrix-event.gts @@ -372,9 +372,12 @@ export interface RealmEvent extends BaseMatrixEvent { content: RealmEventContent; } -export type RealmEventContent = +export type RealmEventContent = ( | IndexRealmEventContent - | UpdateRealmEventContent; + | UpdateRealmEventContent +) & { + realmURL?: string; +}; export type IndexRealmEventContent = | IncrementalIndexEventContent diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts index 446da992df..93eaf840ae 100644 --- a/packages/host/app/services/matrix-service.ts +++ b/packages/host/app/services/matrix-service.ts @@ -1846,28 +1846,17 @@ export default class MatrixService extends Service { return; } - let realmResourceForEvent = this.realm.realmForSessionRoomId( - event.room_id!, - ); - if (!realmResourceForEvent) { + const content = event.content as RealmEventContent; + if (!content.realmURL) { realmEventsLogger.debug( - 'Ignoring realm event because no realm found', + 'Ignoring realm event because no realm URL was provided', event, ); - } else { - if (realmResourceForEvent.info?.realmUserId !== event.sender) { - realmEventsLogger.warn( - `Realm event sender ${event.sender} is not the realm user ${realmResourceForEvent.info?.realmUserId}`, - event, - ); - } - - (event.content as any).origin_server_ts = event.origin_server_ts; - this.messageService.relayRealmEvent( - realmResourceForEvent.url, - event.content as RealmEventContent, - ); + return; } + + (content as any).origin_server_ts = event.origin_server_ts; + this.messageService.relayRealmEvent(content); } } diff --git a/packages/host/app/services/message-service.ts b/packages/host/app/services/message-service.ts index 52e41ae8e2..85c2df8168 100644 --- a/packages/host/app/services/message-service.ts +++ b/packages/host/app/services/message-service.ts @@ -44,7 +44,11 @@ export default class MessageService extends Service { } } - relayRealmEvent(realmURL: string, event: RealmEventContent) { + relayRealmEvent(event: RealmEventContent) { + const realmURL = event.realmURL; + if (!realmURL) { + return; + } this.listenerCallbacks.get(realmURL)?.forEach((cb) => { cb(event); }); diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts index 5cc436f624..5694695889 100644 --- a/packages/host/tests/helpers/adapter.ts +++ b/packages/host/tests/helpers/adapter.ts @@ -128,8 +128,13 @@ export class TestRealmAdapter implements RealmAdapter { rid.replace('test-session-room-realm-', '').startsWith(realmUrl), ); + const eventWithRealmURL: RealmEventContent = { + ...event, + realmURL: realmUrl, + }; + for (let roomId of targetRoomIds) { - simulateRemoteMessage(roomId, realmMatrixUsername, event, { + simulateRemoteMessage(roomId, realmMatrixUsername, eventWithRealmURL, { type: APP_BOXEL_REALM_EVENT_TYPE, }); } diff --git a/packages/host/tests/integration/message-service-subscription-test.gts b/packages/host/tests/integration/message-service-subscription-test.gts index c5879533ff..7d60c7783c 100644 --- a/packages/host/tests/integration/message-service-subscription-test.gts +++ b/packages/host/tests/integration/message-service-subscription-test.gts @@ -107,6 +107,7 @@ module('Integration | message service subscription', function (hooks) { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: 'index.json', + realmURL: testRealmURL, }, }); diff --git a/packages/matrix/helpers/index.ts b/packages/matrix/helpers/index.ts index 6338cf08ee..e4ab50f641 100644 --- a/packages/matrix/helpers/index.ts +++ b/packages/matrix/helpers/index.ts @@ -120,36 +120,6 @@ export async function setRealmRedirects(page: Page) { } export async function registerRealmUsers(synapse: SynapseInstance) { - await registerUser( - synapse, - 'base_realm', - await realmPassword('base_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'experiments_realm', - await realmPassword('experiments_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'catalog_realm', - await realmPassword('catalog_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'skills_realm', - await realmPassword('skills_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'test_realm', - await realmPassword('test_realm', realmSecretSeed), - ); - await registerUser( - synapse, - 'node-test_realm', - await realmPassword('node-test_realm', realmSecretSeed), - ); await registerUser( synapse, 'realm_server', diff --git a/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js b/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js new file mode 100644 index 0000000000..f28057745f --- /dev/null +++ b/packages/postgres/migrations/1766509131000_add-realm-user-id-to-session-rooms.js @@ -0,0 +1,9 @@ +exports.up = (pgm) => { + pgm.addColumns('session_rooms', { + realm_user_id: { type: 'varchar' }, + }); +}; + +exports.down = (pgm) => { + pgm.dropColumns('session_rooms', ['realm_user_id']); +}; diff --git a/packages/realm-server/handlers/handle-create-session.ts b/packages/realm-server/handlers/handle-create-session.ts index 8bd1c49d87..1fb6b14706 100644 --- a/packages/realm-server/handlers/handle-create-session.ts +++ b/packages/realm-server/handlers/handle-create-session.ts @@ -1,7 +1,6 @@ import { fetchSessionRoom, logger, - REALM_SERVER_REALM, SupportedMimeType, upsertSessionRoom, } from '@cardstack/runtime-common'; @@ -42,9 +41,15 @@ export default function handleCreateSessionRequest({ createJWT: async (user: string, sessionRoom: string) => createJWT({ user, sessionRoom }, realmSecretSeed), ensureSessionRoom: async (userId: string) => { + const realmServerUserId = matrixClient.getUserId(); + if (!realmServerUserId) { + throw new Error( + 'Realm server Matrix user ID is not available, unable to create session room', + ); + } let sessionRoom = await fetchSessionRoom( dbAdapter, - REALM_SERVER_REALM, + realmServerUserId, userId, ); @@ -52,7 +57,7 @@ export default function handleCreateSessionRequest({ sessionRoom = await matrixClient.createDM(userId); await upsertSessionRoom( dbAdapter, - REALM_SERVER_REALM, + realmServerUserId, userId, sessionRoom, ); diff --git a/packages/realm-server/handlers/handle-publish-realm.ts b/packages/realm-server/handlers/handle-publish-realm.ts index 7e452568ed..c1dfe377f2 100644 --- a/packages/realm-server/handlers/handle-publish-realm.ts +++ b/packages/realm-server/handlers/handle-publish-realm.ts @@ -28,8 +28,6 @@ import { import { createJWT } from '../jwt'; import type { CreateRoutesArgs } from '../routes'; import type { RealmServerTokenClaim } from '../utils/jwt'; -import { registerUser } from '../synapse'; -import { passwordFromSeed } from '@cardstack/runtime-common/matrix-client'; const log = logger('handle-publish'); @@ -99,13 +97,11 @@ function rewriteHostHomeForPublishedRealm( export default function handlePublishRealm({ dbAdapter, - matrixClient, realmSecretSeed, serverURL, virtualNetwork, realms, realmsRootPath, - getMatrixRegistrationSecret, createAndMountRealm, domainsForPublishedRealms, }: CreateRoutesArgs): (ctxt: Koa.Context, next: Koa.Next) => Promise { @@ -246,7 +242,6 @@ export default function handlePublishRealm({ ); let userId; - let realmUsername; let publishedRealmData: PublishedRealmTable | undefined; if (existingPublishedRealm) { let results = (await query(dbAdapter, [ @@ -261,7 +256,6 @@ export default function handlePublishRealm({ | 'last_published_at' >[]; publishedRealmData = results[0]; - realmUsername = `realm/${PUBLISHED_DIRECTORY_NAME}_${publishedRealmData.id}`; let lastPublishedAt = Date.now().toString(); await query(dbAdapter, [ @@ -273,10 +267,9 @@ export default function handlePublishRealm({ publishedRealmData.last_published_at = lastPublishedAt; } else { let publishedRealmId = uuidv4(); - realmUsername = `realm/${PUBLISHED_DIRECTORY_NAME}_${publishedRealmId}`; let { valueExpressions, nameExpressions } = asExpressions({ id: publishedRealmId, - owner_username: realmUsername, + owner_username: 'NONE', source_realm_url: sourceRealmURL, published_realm_url: publishedRealmURL, last_published_at: Date.now().toString(), @@ -294,18 +287,7 @@ export default function handlePublishRealm({ | 'last_published_at' >[]; publishedRealmData = results[0]; - - let { userId: newUserId } = await registerUser({ - matrixURL: matrixClient.matrixURL, - displayname: realmUsername, - username: realmUsername, - password: await passwordFromSeed(realmUsername, realmSecretSeed), - registrationSecret: await getMatrixRegistrationSecret(), - }); - userId = newUserId; - await insertPermissions(dbAdapter, new URL(publishedRealmURL), { - [userId]: ['read', 'realm-owner'], [ownerUserId]: ['read', 'realm-owner'], '*': ['read'], }); @@ -350,7 +332,6 @@ export default function handlePublishRealm({ let realm = createAndMountRealm( publishedRealmPath, publishedRealmURL, - realmUsername, new URL(sourceRealmURL), false, ); diff --git a/packages/realm-server/main.ts b/packages/realm-server/main.ts index e16b4e8413..3657b981a9 100644 --- a/packages/realm-server/main.ts +++ b/packages/realm-server/main.ts @@ -236,11 +236,12 @@ const getIndexHTML = async () => { await waitForWorkerManager(workerManagerPort); } - let realmServerMatrixClient = new MatrixClient({ + let matrixClient = new MatrixClient({ matrixURL: new URL(MATRIX_URL), username: REALM_SERVER_MATRIX_USERNAME, seed: REALM_SECRET_SEED, }); + await matrixClient.login(); let prerenderer = createRemotePrerenderer(prerendererUrl); let createPrerenderAuth = buildCreatePrerenderAuth( REALM_SECRET_SEED, @@ -272,12 +273,11 @@ const getIndexHTML = async () => { { url, adapter: realmAdapter, - matrix: { url: new URL(matrixURL), username }, secretSeed: REALM_SECRET_SEED, virtualNetwork, dbAdapter, queue, - realmServerMatrixClient, + matrixClient, realmServerURL: serverURL, definitionLookup, cardSizeLimitBytes: Number( @@ -319,7 +319,7 @@ const getIndexHTML = async () => { let server = new RealmServer({ realms, virtualNetwork, - matrixClient: realmServerMatrixClient, + matrixClient, realmsRootPath, realmServerSecretSeed: REALM_SERVER_SECRET_SEED, realmSecretSeed: REALM_SECRET_SEED, diff --git a/packages/realm-server/node-realm.ts b/packages/realm-server/node-realm.ts index a83d100aa5..3196b893b3 100644 --- a/packages/realm-server/node-realm.ts +++ b/packages/realm-server/node-realm.ts @@ -238,7 +238,11 @@ export class NodeAdapter implements RealmAdapter { dbAdapter: DBAdapter, ): Promise { realmEventsLog.debug('Broadcasting realm event', event); - + const eventWithRealmURL: RealmEventContent = { + ...event, + realmURL: realmUrl, + }; + let realmUserId; if (dbAdapter.isClosed) { realmEventsLog.warn( `Database adapter is closed, skipping sending realm event`, @@ -247,19 +251,35 @@ export class NodeAdapter implements RealmAdapter { } try { await matrixClient.login(); + realmUserId = matrixClient.getUserId(); + if (!realmUserId) { + realmEventsLog.error( + 'Matrix client has no user ID after login, unable to broadcast realm event', + event, + ); + return; + } } catch (e) { realmEventsLog.error('Error logging into matrix. Skipping broadcast', e); return; } - let dmRooms = await this.waitForSessionRooms(dbAdapter, realmUrl); + let dmRooms = await this.waitForSessionRooms( + dbAdapter, + realmUrl, + realmUserId, + ); realmEventsLog.debug('Sending to dm rooms', Object.values(dmRooms)); for (let userId of Object.keys(dmRooms)) { let roomId = dmRooms[userId]; try { - await matrixClient.sendEvent(roomId, APP_BOXEL_REALM_EVENT_TYPE, event); + await matrixClient.sendEvent( + roomId, + APP_BOXEL_REALM_EVENT_TYPE, + eventWithRealmURL, + ); } catch (e) { realmEventsLog.error( `Unable to send event in room ${roomId} for user ${userId}`, @@ -273,6 +293,7 @@ export class NodeAdapter implements RealmAdapter { private async waitForSessionRooms( dbAdapter: DBAdapter, realmUrl: string, + realmUserId: string, attempts = 3, delayMs = 50, ): Promise> { @@ -282,7 +303,7 @@ export class NodeAdapter implements RealmAdapter { let dmRooms: Record = {}; try { - dmRooms = await fetchAllSessionRooms(dbAdapter, realmUrl); + dmRooms = await fetchAllSessionRooms(dbAdapter, realmUrl, realmUserId); } catch (e) { realmEventsLog.error('Error getting account data', e); return {}; // bail immediately on errors instead of retrying @@ -300,6 +321,7 @@ export class NodeAdapter implements RealmAdapter { return await this.waitForSessionRooms( dbAdapter, realmUrl, + realmUserId, attempts - 1, delayMs, ); diff --git a/packages/realm-server/routes.ts b/packages/realm-server/routes.ts index 4fc5962172..6e4bdd449b 100644 --- a/packages/realm-server/routes.ts +++ b/packages/realm-server/routes.ts @@ -59,7 +59,6 @@ export type CreateRoutesArgs = { createAndMountRealm: ( path: string, url: string, - username: string, copiedFromRealm?: URL, enableFileWatcher?: boolean, fromScratchIndexPriority?: number, diff --git a/packages/realm-server/server.ts b/packages/realm-server/server.ts index db445837d5..cb004d2feb 100644 --- a/packages/realm-server/server.ts +++ b/packages/realm-server/server.ts @@ -36,7 +36,6 @@ import { fetchRequestFromContext, methodOverrideSupport, } from './middleware'; -import { registerUser } from './synapse'; import convertAcceptHeaderQueryParam from './middleware/convert-accept-header-qp'; import convertAuthHeaderQueryParam from './middleware/convert-auth-header-qp'; import { NodeAdapter } from './node-realm'; @@ -51,10 +50,7 @@ import { } from '@cardstack/runtime-common/expression'; import * as Sentry from '@sentry/node'; import type { MatrixClient } from '@cardstack/runtime-common/matrix-client'; -import { - passwordFromSeed, - getMatrixUsername, -} from '@cardstack/runtime-common/matrix-client'; +import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client'; import { createRoutes } from './routes'; import { APP_BOXEL_REALM_SERVER_EVENT_MSGTYPE } from '@cardstack/runtime-common/matrix-constants'; import type { Prerenderer } from '@cardstack/runtime-common'; @@ -673,18 +669,7 @@ export class RealmServer { let realmPath = resolve(join(this.realmsRootPath, ownerUsername, endpoint)); ensureDirSync(realmPath); - let username = `realm/${ownerUsername}_${endpoint}`; - let { userId } = await registerUser({ - matrixURL: this.matrixClient.matrixURL, - displayname: username, - username, - password: await passwordFromSeed(username, this.realmSecretSeed), - registrationSecret: await this.getMatrixRegistrationSecret(), - }); - this.log.debug(`created realm bot user '${userId}' for new realm ${url}`); - await insertPermissions(this.dbAdapter, new URL(url), { - [userId]: DEFAULT_PERMISSIONS, [ownerUserId]: DEFAULT_PERMISSIONS, }); @@ -728,12 +713,10 @@ export class RealmServer { let realm = this.createAndMountRealm( realmPath, url, - username, undefined, undefined, userInitiatedPriority, ); - await realm.ensureSessionRoom(ownerUserId); return { realm, @@ -744,7 +727,6 @@ export class RealmServer { private createAndMountRealm = ( path: string, url: string, - username: string, copiedFromRealm?: URL, enableFileWatcher?: boolean, fromScratchIndexPriority?: number, @@ -771,11 +753,7 @@ export class RealmServer { virtualNetwork: this.virtualNetwork, dbAdapter: this.dbAdapter, queue: this.queue, - matrix: { - url: new URL(this.matrixClient.matrixURL), - username, - }, - realmServerMatrixClient: this.matrixClient, + matrixClient: this.matrixClient, realmServerURL: this.serverURL.href, definitionLookup: this.definitionLookup, cardSizeLimitBytes: this.cardSizeLimitBytes, @@ -833,7 +811,6 @@ export class RealmServer { continue; } let adapter = new NodeAdapter(realmPath, this.enableFileWatcher); - let username = `realm/${owner}_${realmName}`; let realm = new Realm({ url, adapter, @@ -841,11 +818,7 @@ export class RealmServer { virtualNetwork: this.virtualNetwork, dbAdapter: this.dbAdapter, queue: this.queue, - matrix: { - url: this.matrixClient.matrixURL, - username, - }, - realmServerMatrixClient: this.matrixClient, + matrixClient: this.matrixClient, realmServerURL: this.serverURL.href, definitionLookup: this.definitionLookup, cardSizeLimitBytes: this.cardSizeLimitBytes, @@ -963,7 +936,6 @@ export class RealmServer { } let adapter = new NodeAdapter(realmPath, this.enableFileWatcher); - let username = publishedRealmRow.owner_username; let realm = new Realm({ url: publishedRealmUrl, @@ -972,11 +944,7 @@ export class RealmServer { virtualNetwork: this.virtualNetwork, dbAdapter: this.dbAdapter, queue: this.queue, - matrix: { - url: this.matrixClient.matrixURL, - username, - }, - realmServerMatrixClient: this.matrixClient, + matrixClient: this.matrixClient, realmServerURL: this.serverURL.href, definitionLookup: this.definitionLookup, cardSizeLimitBytes: this.cardSizeLimitBytes, diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts index 676863b4eb..3a2a7be898 100644 --- a/packages/realm-server/tests/card-source-endpoints-test.ts +++ b/packages/realm-server/tests/card-source-endpoints-test.ts @@ -918,6 +918,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, + realmURL: testRealmURL, }, }, { @@ -927,6 +928,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`], clientRequestId: null, + realmURL: testRealmURL, }, }, { @@ -935,6 +937,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, + realmURL: testRealmURL, }, }, { @@ -944,6 +947,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`, id], clientRequestId: null, + realmURL: testRealmURL, }, }, { @@ -952,6 +956,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${id}.json`, + realmURL: testRealmURL, }, }, { @@ -961,6 +966,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [id], clientRequestId: null, + realmURL: testRealmURL, }, }, ]; diff --git a/packages/realm-server/tests/helpers/indexing.ts b/packages/realm-server/tests/helpers/indexing.ts index e6a782b612..2b51c22120 100644 --- a/packages/realm-server/tests/helpers/indexing.ts +++ b/packages/realm-server/tests/helpers/indexing.ts @@ -87,12 +87,14 @@ export async function expectIncrementalIndexEvent( eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: targetUrl, + realmURL: realm, }); let expectedIncrementalContent: any = { eventName: 'index', indexType: 'incremental', invalidations: [invalidation], + realmURL: realm, }; let actualContent = { ...incrementalEventContent }; diff --git a/packages/realm-server/tests/realm-endpoints-test.ts b/packages/realm-server/tests/realm-endpoints-test.ts index 4ddfafa7e0..5f8eb57cb0 100644 --- a/packages/realm-server/tests/realm-endpoints-test.ts +++ b/packages/realm-server/tests/realm-endpoints-test.ts @@ -988,6 +988,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${newCardId}.json`, + realmURL: testRealmHref, }); assert.deepEqual(incrementalEvent?.content, { @@ -995,6 +996,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [newCardId], clientRequestId: null, + realmURL: testRealmHref, }); { @@ -1152,12 +1154,14 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmHref}person-1.json`, + realmURL: testRealmHref, }); assert.deepEqual(incrementalEvent?.content, { eventName: 'index', indexType: 'incremental', invalidations: [`${testRealmHref}person-1`], + realmURL: testRealmHref, }); { diff --git a/packages/runtime-common/db-queries/session-room-queries.ts b/packages/runtime-common/db-queries/session-room-queries.ts index 17d9d23efe..b49fc644a9 100644 --- a/packages/runtime-common/db-queries/session-room-queries.ts +++ b/packages/runtime-common/db-queries/session-room-queries.ts @@ -8,12 +8,12 @@ export const REALM_SERVER_REALM = '__realm-server__'; */ export async function fetchSessionRoom( dbAdapter: DBAdapter, - realmURL: string, + realmUserId: string, matrixUserId: string, ) { let rows = await query(dbAdapter, [ - 'SELECT room_id FROM session_rooms WHERE realm_url =', - param(realmURL), + 'SELECT room_id FROM session_rooms WHERE realm_user_id =', + param(realmUserId), 'AND matrix_user_id =', param(matrixUserId), ]); @@ -31,14 +31,16 @@ export async function fetchSessionRoom( */ export async function upsertSessionRoom( dbAdapter: DBAdapter, - realmURL: string, + realmUserId: string, matrixUserId: string, roomId: string, ) { await query(dbAdapter, [ - 'INSERT INTO session_rooms (realm_url, matrix_user_id, room_id, created_at, updated_at)', + 'INSERT INTO session_rooms (realm_url, realm_user_id, matrix_user_id, room_id, created_at, updated_at)', 'VALUES (', - param(realmURL), + param(REALM_SERVER_REALM), + ',', + param(realmUserId), ',', param(matrixUserId), ',', @@ -52,6 +54,9 @@ export async function upsertSessionRoom( 'room_id =', param(roomId), ',', + 'realm_user_id =', + param(realmUserId), + ',', 'updated_at =', dbExpression({ pg: 'NOW()', sqlite: 'CURRENT_TIMESTAMP' }), ]); @@ -63,10 +68,20 @@ export async function upsertSessionRoom( export async function fetchAllSessionRooms( dbAdapter: DBAdapter, realmURL: string, + realmUserId: string, ) { let rows = await query(dbAdapter, [ - 'SELECT matrix_user_id, room_id FROM session_rooms WHERE realm_url =', + 'SELECT sr.matrix_user_id, sr.room_id', + 'FROM session_rooms sr', + 'JOIN realm_user_permissions rup', + 'ON rup.username = sr.matrix_user_id', + 'WHERE rup.realm_url =', param(realmURL), + 'AND (rup.read = true OR rup.write = true)', + 'AND sr.realm_user_id =', + param(realmUserId), + 'AND sr.realm_url =', + param(REALM_SERVER_REALM), ]); let result: Record = {}; diff --git a/packages/runtime-common/realm.ts b/packages/runtime-common/realm.ts index 6bfae93ced..664ee9223b 100644 --- a/packages/runtime-common/realm.ts +++ b/packages/runtime-common/realm.ts @@ -393,7 +393,6 @@ export type RequestContext = { realm: Realm; permissions: RealmPermissions }; export class Realm { #startedUp = new Deferred(); #matrixClient: MatrixClient; - #realmServerMatrixClient: MatrixClient; #realmServerURL: string; #realmIndexUpdater: RealmIndexUpdater; #realmIndexQueryEngine: RealmIndexQueryEngine; @@ -408,7 +407,6 @@ export class Realm { #disableModuleCaching = false; #fullIndexOnStartup = false; #fromScratchIndexPriority = systemInitiatedPriority; - #realmServerMatrixUserId: string; #definitionLookup: DefinitionLookup; #copiedFromRealm: URL | undefined; #sourceCache = new AliasCache(); @@ -456,24 +454,22 @@ export class Realm { { url, adapter, - matrix, secretSeed, dbAdapter, queue, virtualNetwork, - realmServerMatrixClient, + matrixClient, realmServerURL, definitionLookup, cardSizeLimitBytes, }: { url: string; adapter: RealmAdapter; - matrix: MatrixConfig; secretSeed: string; dbAdapter: DBAdapter; queue: QueuePublisher; virtualNetwork: VirtualNetwork; - realmServerMatrixClient: MatrixClient; + matrixClient: MatrixClient; realmServerURL: string; definitionLookup: DefinitionLookup; cardSizeLimitBytes?: number; @@ -481,7 +477,6 @@ export class Realm { opts?: Options, ) { this.paths = new RealmPaths(new URL(url)); - let { username, url: matrixURL } = matrix; this.#realmSecretSeed = secretSeed; this.#dbAdapter = dbAdapter; this.#adapter = adapter; @@ -489,19 +484,10 @@ export class Realm { this.#fullIndexOnStartup = opts?.fullIndexOnStartup ?? false; this.#fromScratchIndexPriority = opts?.fromScratchIndexPriority ?? systemInitiatedPriority; - this.#realmServerMatrixClient = realmServerMatrixClient; + this.#matrixClient = matrixClient; this.#realmServerURL = ensureTrailingSlash(realmServerURL); this.#cardSizeLimitBytes = cardSizeLimitBytes ?? DEFAULT_CARD_SIZE_LIMIT_BYTES; - this.#realmServerMatrixUserId = userIdFromUsername( - realmServerMatrixClient.username, - realmServerMatrixClient.matrixURL.href, - ); - this.#matrixClient = new MatrixClient({ - matrixURL, - username, - seed: secretSeed, - }); this.#disableModuleCaching = Boolean(opts?.disableModuleCaching); this.#copiedFromRealm = opts?.copiedFromRealm; let owner: string | undefined; @@ -531,7 +517,7 @@ export class Realm { // server so that we can assume user that owns this realm. refactor this // back to using the realm's own matrix client after running cards in // headless chrome lands. - new RealmAuthDataSource(this.#realmServerMatrixClient, () => _fetch), + new RealmAuthDataSource(this.#matrixClient, () => _fetch), ), ]); @@ -687,7 +673,7 @@ export class Realm { async ensureSessionRoom(matrixUserId: string): Promise { let sessionRoom = await fetchSessionRoom( this.#dbAdapter, - this.url, + this.#matrixClient.getUserId(), matrixUserId, ); @@ -696,7 +682,7 @@ export class Realm { sessionRoom = await this.#matrixClient.createDM(matrixUserId); await upsertSessionRoom( this.#dbAdapter, - this.url, + this.#matrixClient.getUserId(), matrixUserId, sessionRoom, ); @@ -1435,7 +1421,12 @@ export class Realm { ensureSessionRoom: async (userId: string) => this.ensureSessionRoom(userId), setSessionRoom: (userId: string, roomId: string) => - upsertSessionRoom(this.#dbAdapter, this.url, userId, roomId), + upsertSessionRoom( + this.#dbAdapter, + this.#matrixClient.getUserId(), + userId, + roomId, + ), } as Utils, ); @@ -4327,18 +4318,19 @@ export class Realm { private async createRequestContext( requiredPermission: RealmAction, ): Promise { + let realmServerMatrixUserId = this.#matrixClient.getUserId(); let permissions: RealmPermissions; let shouldUseWorldReadable = requiredPermission === 'read' && (await this.isWorldReadable()); if (shouldUseWorldReadable) { permissions = { - [this.#realmServerMatrixUserId]: ['assume-user'], + [realmServerMatrixUserId]: ['assume-user'], '*': ['read'], }; } else { permissions = { - [this.#realmServerMatrixUserId]: ['assume-user'], + [realmServerMatrixUserId]: ['assume-user'], ...(await fetchRealmPermissions(this.#dbAdapter, new URL(this.url))), }; }