diff --git a/packages/base/matrix-event.gts b/packages/base/matrix-event.gts index dcc8a5ae0f2..90c415b687a 100644 --- a/packages/base/matrix-event.gts +++ b/packages/base/matrix-event.gts @@ -401,23 +401,27 @@ export interface IncrementalIndexEventContent { indexType: 'incremental'; invalidations: string[]; clientRequestId?: string | null; + realmURL: string; } interface FullIndexEventContent { eventName: 'index'; indexType: 'full'; + realmURL: string; } interface CopiedIndexEventContent { eventName: 'index'; indexType: 'copy'; sourceRealmURL: string; + realmURL: string; } export interface IncrementalIndexInitiationContent { eventName: 'index'; indexType: 'incremental-index-initiation'; updatedFile: string; + realmURL: string; } export type UpdateRealmEventContent = @@ -428,18 +432,27 @@ export type UpdateRealmEventContent = export interface FileAddedEventContent { eventName: 'update'; added: string; + realmURL: string; } export interface FileUpdatedEventContent { eventName: 'update'; updated: string; + realmURL: string; } export interface FileRemovedEventContent { eventName: 'update'; removed: string; + realmURL: string; } +// File watcher events don't include realmURL - it gets added by the Realm +export type FileWatcherEventContent = + | Omit + | Omit + | Omit; + export interface StopGeneratingEvent extends BaseMatrixEvent { type: typeof APP_BOXEL_STOP_GENERATING_EVENT_TYPE; } diff --git a/packages/billing/billing-queries.ts b/packages/billing/billing-queries.ts index bc768264b4f..baf7fe71ab1 100644 --- a/packages/billing/billing-queries.ts +++ b/packages/billing/billing-queries.ts @@ -138,6 +138,7 @@ export async function getUserById( stripeCustomerId: results[0].stripe_customer_id, stripeCustomerEmail: results[0].stripe_customer_email, matrixRegistrationToken: results[0].matrix_registration_token, + sessionRoomId: results[0].session_room_id ?? null, } as User; } @@ -159,6 +160,7 @@ export async function getUserByStripeId( matrixUserId: results[0].matrix_user_id, stripeCustomerId: results[0].stripe_customer_id, matrixRegistrationToken: results[0].matrix_registration_token, + sessionRoomId: results[0].session_room_id ?? null, } as User; } @@ -181,6 +183,7 @@ export async function getUserByMatrixUserId( stripeCustomerId: results[0].stripe_customer_id, stripeCustomerEmail: results[0].stripe_customer_email, matrixRegistrationToken: results[0].matrix_registration_token, + sessionRoomId: results[0].session_room_id ?? null, } as User; } diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts index 7545d24b562..0757f48218e 100644 --- a/packages/host/app/services/matrix-service.ts +++ b/packages/host/app/services/matrix-service.ts @@ -1895,28 +1895,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 52e41ae8e21..85c2df81683 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/config/schema/1770623937158_schema.sql b/packages/host/config/schema/1771264925000_schema.sql similarity index 100% rename from packages/host/config/schema/1770623937158_schema.sql rename to packages/host/config/schema/1771264925000_schema.sql diff --git a/packages/host/tests/acceptance/query-fields-test.gts b/packages/host/tests/acceptance/query-fields-test.gts index 7a8c5bd7784..bc017b544b1 100644 --- a/packages/host/tests/acceptance/query-fields-test.gts +++ b/packages/host/tests/acceptance/query-fields-test.gts @@ -14,7 +14,7 @@ import { module, test } from 'qunit'; import type { Loader } from '@cardstack/runtime-common'; import { SupportedMimeType } from '@cardstack/runtime-common'; -import { testRealmURLToUsername } from '@cardstack/runtime-common/helpers/const'; +import { testRealmInfo } from '@cardstack/runtime-common/helpers/const'; import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants'; import type NetworkService from '@cardstack/host/services/network'; @@ -361,7 +361,7 @@ module( 'no query runs while hydrating server-provided results', ); - let realmMatrixUsername = testRealmURLToUsername(testRealmURL); + let realmMatrixUsername = testRealmInfo.realmUserId!; let realmRoomId = mockMatrixUtils.getRoomIdForRealmAndUser( testRealmURL, '@testuser:localhost', @@ -379,6 +379,7 @@ module( eventName: 'index', indexType: 'incremental', invalidations: [`${testRealmURL}Person/new-match`], + realmURL: testRealmURL, }, { type: APP_BOXEL_REALM_EVENT_TYPE }, ); @@ -476,7 +477,7 @@ module( (store as any).store.sweep(cardAPI); await settled(); - let realmMatrixUsername = testRealmURLToUsername(testRealmURL); + let realmMatrixUsername = testRealmInfo.realmUserId!; let realmRoomId = mockMatrixUtils.getRoomIdForRealmAndUser( testRealmURL, '@testuser:localhost', @@ -494,6 +495,7 @@ module( eventName: 'index', indexType: 'incremental', invalidations: [`${testRealmURL}Person/new-match`], + realmURL: testRealmURL, }, { type: APP_BOXEL_REALM_EVENT_TYPE }, ); diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts index 303738359d2..5a45814004a 100644 --- a/packages/host/tests/helpers/adapter.ts +++ b/packages/host/tests/helpers/adapter.ts @@ -28,10 +28,8 @@ import type { } from '@cardstack/runtime-common/realm'; import type { - FileAddedEventContent, - FileUpdatedEventContent, + FileWatcherEventContent, RealmEventContent, - UpdateRealmEventContent, } from 'https://cardstack.com/base/matrix-event'; import { WebMessageStream, messageCloseHandler } from './stream'; @@ -66,7 +64,7 @@ export class TestRealmAdapter implements RealmAdapter { #files: Dir = { kind: 'directory', contents: {} }; #lastModified: Map = new Map(); #paths: RealmPaths; - #subscriber: ((message: UpdateRealmEventContent) => void) | undefined; + #subscriber: ((message: FileWatcherEventContent) => void) | undefined; #loader: Loader | undefined; // Will be set in the realm's constructor - needed for openFile for shimming purposes #ready = new Deferred(); #potentialModulesAndInstances: { content: any; url: URL }[] = []; @@ -128,8 +126,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, }); } @@ -308,7 +311,7 @@ export class TestRealmAdapter implements RealmAdapter { ); } - let updateEvent: FileAddedEventContent | FileUpdatedEventContent; + let updateEvent: FileWatcherEventContent; let lastModified = unixTime(Date.now()); this.#lastModified.set(this.#paths.fileURL(path).href, lastModified); @@ -343,7 +346,7 @@ export class TestRealmAdapter implements RealmAdapter { }; } - postUpdateEvent(data: UpdateRealmEventContent) { + postUpdateEvent(data: FileWatcherEventContent) { this.#subscriber?.(data); } @@ -439,7 +442,7 @@ export class TestRealmAdapter implements RealmAdapter { } async subscribe( - cb: (message: UpdateRealmEventContent) => void, + cb: (message: FileWatcherEventContent) => void, ): Promise { this.#subscriber = cb; } diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts index 7555bfc21bd..3fd21f624f5 100644 --- a/packages/host/tests/helpers/index.gts +++ b/packages/host/tests/helpers/index.gts @@ -27,7 +27,6 @@ import { testHostModeRealmURL, testRealmInfo, testRealmURL, - testRealmURLToUsername, Worker, DEFAULT_CARD_SIZE_LIMIT_BYTES, type DefinitionLookup, @@ -788,15 +787,11 @@ async function setupTestRealm({ realm = new Realm({ url: realmURL, adapter, - matrix: { - ...baseTestMatrix, - username: testRealmURLToUsername(realmURL), - }, secretSeed: testRealmSecretSeed, virtualNetwork, dbAdapter, queue, - realmServerMatrixClient: new MatrixClient({ + matrixClient: new MatrixClient({ matrixURL: baseTestMatrix.url, username: testRealmServerMatrixUsername, seed: testRealmSecretSeed, diff --git a/packages/host/tests/integration/message-service-subscription-test.gts b/packages/host/tests/integration/message-service-subscription-test.gts index c5879533ff8..41875b9283d 100644 --- a/packages/host/tests/integration/message-service-subscription-test.gts +++ b/packages/host/tests/integration/message-service-subscription-test.gts @@ -10,7 +10,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { baseRealm } from '@cardstack/runtime-common'; -import { testRealmURLToUsername } from '@cardstack/runtime-common/helpers/const'; +import { testRealmInfo } from '@cardstack/runtime-common/helpers/const'; import type { Loader } from '@cardstack/runtime-common/loader'; import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants'; @@ -45,7 +45,7 @@ module('Integration | message service subscription', function (hooks) { autostart: true, }); - let realmMatrixUsername = testRealmURLToUsername(testRealmURL); + let realmMatrixUsername = testRealmInfo.realmUserId!; let realmRoomId = mockMatrixUtils.getRoomIdForRealmAndUser( testRealmURL, @@ -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/host/tests/integration/realm-test.gts b/packages/host/tests/integration/realm-test.gts index d59fe452868..f2794734e71 100644 --- a/packages/host/tests/integration/realm-test.gts +++ b/packages/host/tests/integration/realm-test.gts @@ -385,7 +385,7 @@ module('Integration | realm', function (hooks) { backgroundURL: 'https://i.postimg.cc/tgRHRV8C/pawel-czerwinski-h-Nrd99q5pe-I-unsplash.jpg', iconURL: 'https://boxel-images.boxel.ai/icons/cardstack.png', - realmUserId: '@test_realm:localhost', + realmUserId: '@realm_server:localhost', showAsCatalog: null, visibility: 'public', publishable: null, @@ -3288,7 +3288,7 @@ module('Integration | realm', function (hooks) { backgroundURL: 'https://i.postimg.cc/tgRHRV8C/pawel-czerwinski-h-Nrd99q5pe-I-unsplash.jpg', iconURL: 'https://boxel-images.boxel.ai/icons/cardstack.png', - realmUserId: '@test_realm:localhost', + realmUserId: '@realm_server:localhost', showAsCatalog: null, visibility: 'public', publishable: null, @@ -3575,7 +3575,7 @@ posts/ignore-me.gts name: 'Example Workspace', backgroundURL: 'https://example-background-url.com', iconURL: 'https://example-icon-url.com', - realmUserId: '@realm/test-realm-test:localhost', + realmUserId: '@realm_server:localhost', showAsCatalog: null, visibility: 'public', publishable: null, diff --git a/packages/matrix/helpers/index.ts b/packages/matrix/helpers/index.ts index 72f11ccd183..967188fa952 100644 --- a/packages/matrix/helpers/index.ts +++ b/packages/matrix/helpers/index.ts @@ -120,31 +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', diff --git a/packages/matrix/tests/messages.spec.ts b/packages/matrix/tests/messages.spec.ts index 84ca57e62fa..87a69cc655d 100644 --- a/packages/matrix/tests/messages.spec.ts +++ b/packages/matrix/tests/messages.spec.ts @@ -359,7 +359,7 @@ test.describe('Room messages', () => { await expect( page.locator(`[data-test-attached-card="${appURL}/hassan"]`), ).toHaveCount(1); - await expect(page.locator(`[data-test-attached-file]`)).toHaveCount(1); + await expect(page.locator(`[data-test-attached-file]`)).toHaveCount(2); await expect( page.locator(`[data-test-attached-file="${appURL}/person.gts"]`), ).toHaveCount(1); diff --git a/packages/postgres/migrations/1771264925000_move-session-room-to-users.js b/packages/postgres/migrations/1771264925000_move-session-room-to-users.js new file mode 100644 index 00000000000..e902c78d019 --- /dev/null +++ b/packages/postgres/migrations/1771264925000_move-session-room-to-users.js @@ -0,0 +1,19 @@ +exports.up = (pgm) => { + pgm.addColumns('users', { + session_room_id: { type: 'varchar' }, + }); + + pgm.sql(` + UPDATE users + SET session_room_id = sr.room_id + FROM session_rooms sr + WHERE users.matrix_user_id = sr.matrix_user_id + AND sr.realm_url = '__realm-server__' + `); + + pgm.dropTable('session_rooms'); +}; + +exports.down = (pgm) => { + pgm.dropColumns('users', ['session_room_id']); +}; diff --git a/packages/realm-server/handlers/handle-create-session.ts b/packages/realm-server/handlers/handle-create-session.ts index 8bd1c49d879..7b5589fcf12 100644 --- a/packages/realm-server/handlers/handle-create-session.ts +++ b/packages/realm-server/handlers/handle-create-session.ts @@ -1,9 +1,9 @@ import { fetchSessionRoom, logger, - REALM_SERVER_REALM, SupportedMimeType, upsertSessionRoom, + userExists, } from '@cardstack/runtime-common'; import type { Utils } from '@cardstack/runtime-common/matrix-backend-authentication'; import { MatrixBackendAuthentication } from '@cardstack/runtime-common/matrix-backend-authentication'; @@ -42,20 +42,16 @@ export default function handleCreateSessionRequest({ createJWT: async (user: string, sessionRoom: string) => createJWT({ user, sessionRoom }, realmSecretSeed), ensureSessionRoom: async (userId: string) => { - let sessionRoom = await fetchSessionRoom( - dbAdapter, - REALM_SERVER_REALM, - userId, - ); + let sessionRoom = await fetchSessionRoom(dbAdapter, userId); if (!sessionRoom) { + let userExistsInDB = await userExists(dbAdapter, userId); + if (!userExistsInDB) { + // TODO: should we create it if it doesn't exist? + return undefined; + } sessionRoom = await matrixClient.createDM(userId); - await upsertSessionRoom( - dbAdapter, - REALM_SERVER_REALM, - userId, - sessionRoom, - ); + await upsertSessionRoom(dbAdapter, userId, sessionRoom); } return sessionRoom; }, diff --git a/packages/realm-server/handlers/handle-publish-realm.ts b/packages/realm-server/handlers/handle-publish-realm.ts index f7467c58527..710932a9ea5 100644 --- a/packages/realm-server/handlers/handle-publish-realm.ts +++ b/packages/realm-server/handlers/handle-publish-realm.ts @@ -388,7 +388,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 e16b4e8413d..2e0b2744f77 100644 --- a/packages/realm-server/main.ts +++ b/packages/realm-server/main.ts @@ -236,7 +236,7 @@ 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, @@ -272,12 +272,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 +318,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 825f69da4c3..b4bdab161ab 100644 --- a/packages/realm-server/node-realm.ts +++ b/packages/realm-server/node-realm.ts @@ -10,7 +10,7 @@ import { unixTime, type ResponseWithNodeStream, type TokenClaims, - fetchAllSessionRooms, + fetchRealmSessionRooms, } from '@cardstack/runtime-common'; import type { MatrixClient } from '@cardstack/runtime-common/matrix-client'; import type { LocalPath } from '@cardstack/runtime-common/paths'; @@ -35,8 +35,8 @@ import type { AdapterWriteResult, } from '@cardstack/runtime-common/realm'; import type { + FileWatcherEventContent, RealmEventContent, - UpdateRealmEventContent, } from 'https://cardstack.com/base/matrix-event'; import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants'; import { createJWT, verifyJWT } from './jwt'; @@ -80,7 +80,7 @@ export class NodeAdapter implements RealmAdapter { private watcher: Watcher | undefined = undefined; async subscribe( - cb: (message: UpdateRealmEventContent) => void, + cb: (message: FileWatcherEventContent) => void, ): Promise { if (this.watcher) { throw new Error(`tried to subscribe to watcher twice`); @@ -241,7 +241,10 @@ export class NodeAdapter implements RealmAdapter { dbAdapter: DBAdapter, ): Promise { realmEventsLog.debug('Broadcasting realm event', event); - + const eventWithRealmURL: RealmEventContent = { + ...event, + realmURL: realmUrl, + }; if (dbAdapter.isClosed) { realmEventsLog.warn( `Database adapter is closed, skipping sending realm event`, @@ -250,6 +253,13 @@ export class NodeAdapter implements RealmAdapter { } try { await matrixClient.login(); + if (!matrixClient.getUserId()) { + 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; @@ -262,7 +272,11 @@ export class NodeAdapter implements RealmAdapter { 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}`, @@ -285,7 +299,7 @@ export class NodeAdapter implements RealmAdapter { let dmRooms: Record = {}; try { - dmRooms = await fetchAllSessionRooms(dbAdapter, realmUrl); + dmRooms = await fetchRealmSessionRooms(dbAdapter, realmUrl); } catch (e) { realmEventsLog.error('Error getting account data', e); return {}; // bail immediately on errors instead of retrying diff --git a/packages/realm-server/routes.ts b/packages/realm-server/routes.ts index 62023b611be..a2703857726 100644 --- a/packages/realm-server/routes.ts +++ b/packages/realm-server/routes.ts @@ -70,7 +70,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 aac85c9c488..e51b96a761e 100644 --- a/packages/realm-server/server.ts +++ b/packages/realm-server/server.ts @@ -19,7 +19,6 @@ import { PUBLISHED_DIRECTORY_NAME, RealmPaths, fetchSessionRoom, - REALM_SERVER_REALM, userInitiatedPriority, hasExtension, } from '@cardstack/runtime-common'; @@ -37,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'; @@ -47,10 +45,7 @@ import merge from 'lodash/merge'; import { extractSupportedMimeType } from '@cardstack/runtime-common/router'; 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'; @@ -694,18 +689,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, }); @@ -749,12 +733,10 @@ export class RealmServer { let realm = this.createAndMountRealm( realmPath, url, - username, undefined, undefined, userInitiatedPriority, ); - await realm.ensureSessionRoom(ownerUserId); return { realm, @@ -765,7 +747,6 @@ export class RealmServer { private createAndMountRealm = ( path: string, url: string, - username: string, copiedFromRealm?: URL, enableFileWatcher?: boolean, fromScratchIndexPriority?: number, @@ -792,11 +773,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, @@ -854,7 +831,6 @@ export class RealmServer { continue; } let adapter = new NodeAdapter(realmPath, this.enableFileWatcher); - let username = `realm/${owner}_${realmName}`; let realm = new Realm({ url, adapter, @@ -862,11 +838,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, @@ -984,7 +956,6 @@ export class RealmServer { } let adapter = new NodeAdapter(realmPath, this.enableFileWatcher); - let username = publishedRealmRow.owner_username; let realm = new Realm({ url: publishedRealmUrl, @@ -993,11 +964,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, @@ -1042,11 +1009,10 @@ export class RealmServer { eventType: string, data?: Record, ) => { - let roomId = await fetchSessionRoom( - this.dbAdapter, - REALM_SERVER_REALM, - user, - ); + if (!this.matrixClient.isLoggedIn()) { + await this.matrixClient.login(); + } + let roomId = await fetchSessionRoom(this.dbAdapter, user); if (!roomId) { console.error( `Failed to send event: ${eventType}, cannot find session room for user: ${user}`, diff --git a/packages/realm-server/tests/card-dependencies-endpoint-test.ts b/packages/realm-server/tests/card-dependencies-endpoint-test.ts index 8650a5fcc58..abd11ab2c8d 100644 --- a/packages/realm-server/tests/card-dependencies-endpoint-test.ts +++ b/packages/realm-server/tests/card-dependencies-endpoint-test.ts @@ -90,6 +90,7 @@ module(basename(__filename), function () { setupPermissionedRealm(hooks, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/card-endpoints-test.ts b/packages/realm-server/tests/card-endpoints-test.ts index 6853873a194..7dcd22730b4 100644 --- a/packages/realm-server/tests/card-endpoints-test.ts +++ b/packages/realm-server/tests/card-endpoints-test.ts @@ -140,6 +140,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -191,11 +192,7 @@ module(basename(__filename), function () { module: `./person`, name: 'Person', }, - // FIXME see elsewhere… global fix? - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -732,6 +729,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, published: true, @@ -781,10 +779,7 @@ module(basename(__filename), function () { module: `./person`, name: 'Person', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, relationships: { @@ -807,6 +802,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -881,7 +877,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read'], - '@node-test_realm:localhost': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -987,6 +983,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -1354,10 +1351,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1544,10 +1538,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1670,10 +1661,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1725,10 +1713,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1942,10 +1927,7 @@ module(basename(__filename), function () { name: 'Friend', module: 'http://localhost:4202/node-test/friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1960,7 +1942,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], - '@node-test_realm:localhost': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -2038,6 +2020,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -2626,10 +2609,7 @@ module(basename(__filename), function () { name: 'Friend', module: './friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -2816,10 +2796,7 @@ module(basename(__filename), function () { name: 'Friend', module: '../friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -2942,10 +2919,7 @@ module(basename(__filename), function () { name: 'Friend', module: '../friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -2997,10 +2971,7 @@ module(basename(__filename), function () { name: 'Friend', module: '../friend', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -3202,10 +3173,7 @@ module(basename(__filename), function () { module: 'http://localhost:4202/node-test/friend-with-used-link', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -3300,10 +3268,7 @@ module(basename(__filename), function () { module: 'http://localhost:4202/node-test/friend-with-used-link', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -3458,6 +3423,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, cardSizeLimitBytes: 512, onRealmSetup, @@ -3505,7 +3471,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], - '@node-test_realm:localhost': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -3576,6 +3542,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -3686,7 +3653,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], - '@node-test_realm:localhost': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -3728,6 +3695,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, fileSystem: { 'greeting.txt': 'hello', @@ -3794,6 +3762,7 @@ module(basename(__filename), function () { realmURL: providerRealmURL, permissions: { '*': ['read', 'write', 'realm-owner'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, fileSystem: { 'person.gts': ` @@ -3823,6 +3792,7 @@ module(basename(__filename), function () { realmURL: consumerRealmURL, permissions: { '*': ['read', 'write', 'realm-owner'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, fileSystem: { 'favorite-finder.gts': ` diff --git a/packages/realm-server/tests/card-source-endpoints-test.ts b/packages/realm-server/tests/card-source-endpoints-test.ts index 5450943b722..bf9598edfe7 100644 --- a/packages/realm-server/tests/card-source-endpoints-test.ts +++ b/packages/realm-server/tests/card-source-endpoints-test.ts @@ -73,6 +73,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -353,6 +354,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -402,6 +404,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -475,6 +478,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -547,6 +551,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -588,6 +593,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -918,6 +924,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, + realmURL: testRealmURL.href, }, }, { @@ -927,6 +934,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`], clientRequestId: null, + realmURL: testRealmURL.href, }, }, { @@ -935,6 +943,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${testRealmURL}test-card.gts`, + realmURL: testRealmURL.href, }, }, { @@ -944,6 +953,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [`${testRealmURL}test-card.gts`, id], clientRequestId: null, + realmURL: testRealmURL.href, }, }, { @@ -952,6 +962,7 @@ module(basename(__filename), function () { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile: `${id}.json`, + realmURL: testRealmURL.href, }, }, { @@ -961,6 +972,7 @@ module(basename(__filename), function () { indexType: 'incremental', invalidations: [id], clientRequestId: null, + realmURL: testRealmURL.href, }, }, ]; @@ -982,6 +994,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, cardSizeLimitBytes: 512, onRealmSetup, @@ -1016,6 +1029,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -1069,6 +1083,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -1182,6 +1197,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, cardSizeLimitBytes: 512, onRealmSetup, @@ -1208,6 +1224,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/file-watcher-events-test.ts b/packages/realm-server/tests/file-watcher-events-test.ts index 5057b1b6aeb..2917748af3b 100644 --- a/packages/realm-server/tests/file-watcher-events-test.ts +++ b/packages/realm-server/tests/file-watcher-events-test.ts @@ -59,6 +59,7 @@ module(basename(__filename), function () { setupPermissionedRealmAtURL(hooks, realmURL, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, subscribeToRealmEvents: true, onRealmSetup, @@ -186,6 +187,7 @@ module(basename(__filename), function () { assert.deepEqual(updateEvent.content, { eventName: 'update', added: basename(newFilePath), + realmURL: realmURL.href, }); }); @@ -221,6 +223,7 @@ module(basename(__filename), function () { assert.deepEqual(updateEvent.content, { eventName: 'update', updated: basename(updatedFilePath), + realmURL: realmURL.href, }); }); @@ -244,6 +247,7 @@ module(basename(__filename), function () { assert.deepEqual(updateEvent.content, { eventName: 'update', removed: basename(deletedFilePath), + realmURL: realmURL.href, }); }); diff --git a/packages/realm-server/tests/helpers/index.ts b/packages/realm-server/tests/helpers/index.ts index 16b8903826d..ca7f763d942 100644 --- a/packages/realm-server/tests/helpers/index.ts +++ b/packages/realm-server/tests/helpers/index.ts @@ -33,8 +33,6 @@ import { RealmPaths, PUBLISHED_DIRECTORY_NAME, DEFAULT_CARD_SIZE_LIMIT_BYTES, - clearSessionRooms, - upsertSessionRoom, type MatrixConfig, type QueuePublisher, type QueueRunner, @@ -149,10 +147,7 @@ export const matrixURL = new URL('http://localhost:8008'); const testPrerenderHost = '127.0.0.1'; const testPrerenderPort = 4460; const testPrerenderURL = `http://${testPrerenderHost}:${testPrerenderPort}`; -const testMatrix: MatrixConfig = { - url: matrixURL, - username: 'node-test_realm', -}; + export const testRealmInfo = { name: 'Test Realm', backgroundURL: null, @@ -161,7 +156,7 @@ export const testRealmInfo = { interactHome: null, hostHome: null, visibility: 'public', - realmUserId: testMatrix.username, + realmUserId: testRealmServerMatrixUserId, publishable: null, lastPublishedAt: null, }; @@ -293,6 +288,7 @@ async function startTestPrerenderServer(): Promise { } let server = createPrerenderHttpServer({ silent: Boolean(process.env.SILENT_PRERENDERER), + maxPages: 1, }); prerenderServer = server; trackServer(server); @@ -384,9 +380,6 @@ export function setupDB( if (runner) { trackedQueueRunners.delete(runner); } - if (dbAdapter) { - await clearSessionRooms(dbAdapter); - } await dbAdapter?.close(); if (dbAdapter) { trackedDbAdapters.delete(dbAdapter); @@ -449,7 +442,6 @@ export async function createRealm({ runner, publisher, dbAdapter, - matrixConfig = testMatrix, withWorker, enableFileWatcher = false, cardSizeLimitBytes, @@ -473,6 +465,12 @@ export async function createRealm({ }): Promise<{ realm: Realm; adapter: RealmAdapter }> { await insertPermissions(dbAdapter, new URL(realmURL), permissions); + for (let username of Object.keys(permissions)) { + if (username !== '*') { + await ensureTestUser(dbAdapter, username); + } + } + for (let [filename, contents] of Object.entries(fileSystem)) { if (typeof contents === 'string') { writeFileSync(join(dir, filename), contents); @@ -494,14 +492,14 @@ export async function createRealm({ dbAdapter, queuePublisher: publisher, virtualNetwork, - matrixURL: matrixConfig.url, + matrixURL: realmServerTestMatrix.url, secretSeed: realmSecretSeed, realmServerMatrixUsername: testRealmServerMatrixUsername, prerenderer, createPrerenderAuth: testCreatePrerenderAuth, }); } - let realmServerMatrixClient = new MatrixClient({ + let matrixClient = new MatrixClient({ matrixURL: realmServerTestMatrix.url, username: realmServerTestMatrix.username, seed: realmSecretSeed, @@ -509,12 +507,11 @@ export async function createRealm({ let realm = new Realm({ url: realmURL, adapter, - matrix: matrixConfig, secretSeed: realmSecretSeed, virtualNetwork, dbAdapter, queue: publisher, - realmServerMatrixClient, + matrixClient, realmServerURL: new URL(new URL(realmURL).origin).href, definitionLookup, cardSizeLimitBytes: @@ -677,6 +674,7 @@ export async function runTestRealmServerWithRealms({ }; }) { ensureDirSync(realmsRootPath); + let prerenderer = await getTestPrerenderer(); let definitionLookup = new CachingDefinitionLookup( dbAdapter, @@ -793,7 +791,6 @@ export function setupPermissionedRealms( // We want 2 different realm users to test authorization between them - these // names are selected because they are already available in the test // environment (via register-realm-users.ts) - let matrixUsers = ['test_realm', 'node-test_realm']; let realms: { realm: Realm; realmPath: string; @@ -808,7 +805,7 @@ export function setupPermissionedRealms( runner: QueueRunner, ) => { _dbAdapter = dbAdapter; - for (let [i, realmArg] of realmsArg.entries()) { + for (let realmArg of realmsArg.values()) { let { testRealmDir: realmPath, testRealm: realm, @@ -822,10 +819,6 @@ export function setupPermissionedRealms( fileSystem: realmArg.fileSystem, permissions: realmArg.permissions, matrixURL, - matrixConfig: { - url: matrixURL, - username: matrixUsers[i] ?? matrixUsers[0], - }, dbAdapter, publisher, runner, @@ -874,9 +867,20 @@ export async function insertUser( matrixUserId: result[0].matrix_user_id, stripeCustomerId: result[0].stripe_customer_id, stripeCustomerEmail: result[0].stripe_customer_email, + sessionRoomId: result[0].session_room_id ?? null, } as User; } +export async function ensureTestUser( + dbAdapter: PgAdapter, + matrixUserId: string, +) { + await dbAdapter.execute( + `INSERT INTO users (matrix_user_id) VALUES ($1) ON CONFLICT (matrix_user_id) DO NOTHING`, + { bind: [matrixUserId] }, + ); +} + export async function insertPlan( dbAdapter: PgAdapter, name: string, @@ -1017,7 +1021,6 @@ export function setupMatrixRoom( hooks.beforeEach(async function () { await matrixClient.login(); - let userId = matrixClient.getUserId()!; let realmSetup = getRealmSetup(); let openIdToken = await matrixClient.getOpenIdToken(); @@ -1039,6 +1042,7 @@ export function setupMatrixRoom( let payload = JSON.parse( Buffer.from(jwt.split('.')[1], 'base64').toString('utf8'), ) as { sessionRoom: string }; + console.log('Session room', payload.sessionRoom); let { joined_rooms: rooms } = await matrixClient.getJoinedRooms(); @@ -1047,13 +1051,6 @@ export function setupMatrixRoom( } testAuthRoomId = payload.sessionRoom; - - await upsertSessionRoom( - realmSetup.dbAdapter, - realmSetup.testRealm.url, - userId, - payload.sessionRoom, - ); }); return { diff --git a/packages/realm-server/tests/helpers/indexing.ts b/packages/realm-server/tests/helpers/indexing.ts index 972b2be34ca..26648c881f8 100644 --- a/packages/realm-server/tests/helpers/indexing.ts +++ b/packages/realm-server/tests/helpers/indexing.ts @@ -88,12 +88,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/indexing-test.ts b/packages/realm-server/tests/indexing-test.ts index 8f192208234..637b39da161 100644 --- a/packages/realm-server/tests/indexing-test.ts +++ b/packages/realm-server/tests/indexing-test.ts @@ -2073,6 +2073,7 @@ module(basename(__filename), function () { }, consumer: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, }); diff --git a/packages/realm-server/tests/realm-auth-test.ts b/packages/realm-server/tests/realm-auth-test.ts index 94a6629558d..4bccbe75954 100644 --- a/packages/realm-server/tests/realm-auth-test.ts +++ b/packages/realm-server/tests/realm-auth-test.ts @@ -9,7 +9,6 @@ import { fetchSessionRoom } from '@cardstack/runtime-common/db-queries/session-r import { setupPermissionedRealm, - insertUser, realmSecretSeed, testRealmHref, } from './helpers'; @@ -25,6 +24,7 @@ module(basename(__filename), function () { permissions: { '*': ['read'], [matrixUserId]: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup: ({ dbAdapter: adapter, request: req }) => { dbAdapter = adapter; @@ -32,10 +32,6 @@ module(basename(__filename), function () { }, }); - hooks.beforeEach(async function () { - await insertUser(dbAdapter, matrixUserId, 'cus_test', null); - }); - hooks.afterEach(function () { sinon.restore(); }); @@ -51,11 +47,7 @@ module(basename(__filename), function () { }); sinon.stub(MatrixClient.prototype, 'joinRoom').resolves(); - let existingRoom = await fetchSessionRoom( - dbAdapter, - testRealmHref, - matrixUserId, - ); + let existingRoom = await fetchSessionRoom(dbAdapter, matrixUserId); assert.strictEqual( existingRoom, null, @@ -86,11 +78,7 @@ module(basename(__filename), function () { 'realm created the DM room for the requesting user', ); - let sessionRoom = await fetchSessionRoom( - dbAdapter, - testRealmHref, - matrixUserId, - ); + let sessionRoom = await fetchSessionRoom(dbAdapter, matrixUserId); assert.strictEqual( sessionRoom, expectedRoomId, diff --git a/packages/realm-server/tests/realm-endpoints-test.ts b/packages/realm-server/tests/realm-endpoints-test.ts index ec261bf94f8..df2a1286525 100644 --- a/packages/realm-server/tests/realm-endpoints-test.ts +++ b/packages/realm-server/tests/realm-endpoints-test.ts @@ -113,6 +113,7 @@ module(basename(__filename), function () { '*': ['read', 'write'], user: ['read', 'write', 'realm-owner'], carol: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, realmURL, onRealmSetup, @@ -337,7 +338,6 @@ module(basename(__filename), function () { type: 'realm-config', attributes: { ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', backgroundURL: 'new-bg', }, }, @@ -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, }); { @@ -1032,10 +1034,7 @@ module(basename(__filename), function () { module: '../person', name: 'Person', }, - realmInfo: { - ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', - }, + realmInfo: testRealmInfo, realmURL: testRealmHref, }, links: { @@ -1152,12 +1151,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/realm-server/tests/realm-endpoints/directory-test.ts b/packages/realm-server/tests/realm-endpoints/directory-test.ts index 5c146758bc7..790488bed5b 100644 --- a/packages/realm-server/tests/realm-endpoints/directory-test.ts +++ b/packages/realm-server/tests/realm-endpoints/directory-test.ts @@ -100,6 +100,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/info-test.ts b/packages/realm-server/tests/realm-endpoints/info-test.ts index 94fffd24a75..ef28bc60f3a 100644 --- a/packages/realm-server/tests/realm-endpoints/info-test.ts +++ b/packages/realm-server/tests/realm-endpoints/info-test.ts @@ -80,7 +80,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { type: 'realm-info', attributes: { ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', }, }, }, @@ -92,7 +91,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { module('permissioned realm', function (hooks) { setupPermissionedRealm(hooks, { permissions: { - john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, realmURL, onRealmSetup, @@ -124,7 +123,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { .post(infoPath) .set('X-HTTP-Method-Override', 'QUERY') .set('Accept', 'application/vnd.api+json') - .set('Authorization', `Bearer ${createJWT(testRealm, 'not-john')}`); + .set('Authorization', `Bearer ${createJWT(testRealm, 'not-a-user')}`); assert.strictEqual(response.status, 403, 'HTTP 403 status'); }); @@ -137,7 +136,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { .set('Accept', 'application/vnd.api+json') .set( 'Authorization', - `Bearer ${createJWT(testRealm, 'john', ['read', 'write'])}`, + `Bearer ${createJWT(testRealm, '@node-test_realm:localhost', ['read', 'realm-owner'])}`, ); assert.strictEqual(response.status, 200, 'HTTP 200 status'); @@ -151,7 +150,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { attributes: { ...testRealmInfo, visibility: 'private', - realmUserId: '@node-test_realm:localhost', }, }, }, @@ -166,6 +164,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { users: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, realmURL, onRealmSetup, @@ -193,7 +192,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { attributes: { ...testRealmInfo, visibility: 'shared', - realmUserId: '@node-test_realm:localhost', }, }, }, @@ -209,6 +207,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { bob: ['read'], jane: ['read'], john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, realmURL, onRealmSetup, @@ -236,7 +235,6 @@ module(`realm-endpoints/${basename(__filename)}`, function () { attributes: { ...testRealmInfo, visibility: 'shared', - realmUserId: '@node-test_realm:localhost', }, }, }, diff --git a/packages/realm-server/tests/realm-endpoints/lint-test.ts b/packages/realm-server/tests/realm-endpoints/lint-test.ts index f7e42bbefda..6c4ae5d7959 100644 --- a/packages/realm-server/tests/realm-endpoints/lint-test.ts +++ b/packages/realm-server/tests/realm-endpoints/lint-test.ts @@ -28,6 +28,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/mtimes-test.ts b/packages/realm-server/tests/realm-endpoints/mtimes-test.ts index 0ef403c5a07..ad3bf180469 100644 --- a/packages/realm-server/tests/realm-endpoints/mtimes-test.ts +++ b/packages/realm-server/tests/realm-endpoints/mtimes-test.ts @@ -30,6 +30,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { mary: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/realm-endpoints/permissions-test.ts b/packages/realm-server/tests/realm-endpoints/permissions-test.ts index eac68d6d56c..75d7a34a5ce 100644 --- a/packages/realm-server/tests/realm-endpoints/permissions-test.ts +++ b/packages/realm-server/tests/realm-endpoints/permissions-test.ts @@ -40,6 +40,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { module('permissions requests', function (hooks) { setupPermissionedRealm(hooks, { + fileSystem: {}, permissions: { mary: ['read', 'write', 'realm-owner'], bob: ['read', 'write'], diff --git a/packages/realm-server/tests/realm-endpoints/search-test.ts b/packages/realm-server/tests/realm-endpoints/search-test.ts index f8f125d4424..83a6a7d87fb 100644 --- a/packages/realm-server/tests/realm-endpoints/search-test.ts +++ b/packages/realm-server/tests/realm-endpoints/search-test.ts @@ -600,6 +600,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, realmURL: new URL('http://127.0.0.1:4444/test/'), onRealmSetup, @@ -656,6 +657,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { '*': ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, realmURL: new URL('http://127.0.0.1:4444/test/'), onRealmSetup, diff --git a/packages/realm-server/tests/realm-endpoints/user-test.ts b/packages/realm-server/tests/realm-endpoints/user-test.ts index 066d7a2d768..2a9cb7975bc 100644 --- a/packages/realm-server/tests/realm-endpoints/user-test.ts +++ b/packages/realm-server/tests/realm-endpoints/user-test.ts @@ -66,6 +66,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); @@ -475,6 +476,7 @@ module(`realm-endpoints/${basename(__filename)}`, function () { setupPermissionedRealm(hooks, { permissions: { john: ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/search-prerendered-test.ts b/packages/realm-server/tests/search-prerendered-test.ts index b0881e80994..e58f0654775 100644 --- a/packages/realm-server/tests/search-prerendered-test.ts +++ b/packages/realm-server/tests/search-prerendered-test.ts @@ -978,6 +978,7 @@ module(basename(__filename), function () { realmURL, permissions: { john: ['read'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, fileSystem: { 'person.gts': ` diff --git a/packages/realm-server/tests/server-endpoints/authentication-test.ts b/packages/realm-server/tests/server-endpoints/authentication-test.ts index 9b883336cb9..69e0d03b9c6 100644 --- a/packages/realm-server/tests/server-endpoints/authentication-test.ts +++ b/packages/realm-server/tests/server-endpoints/authentication-test.ts @@ -42,6 +42,9 @@ module(`server-endpoints/${basename(__filename)}`, function () { testRealmDir, realmsRootPath: join(dir.name, 'realm_server_5'), realmURL: testRealmURL, + permissions: { + '@test_realm:localhost': ['read', 'realm-owner'], + }, dbAdapter, publisher, runner, diff --git a/packages/realm-server/tests/server-endpoints/helpers.ts b/packages/realm-server/tests/server-endpoints/helpers.ts index 832ddfbd02c..f213c6e348a 100644 --- a/packages/realm-server/tests/server-endpoints/helpers.ts +++ b/packages/realm-server/tests/server-endpoints/helpers.ts @@ -73,6 +73,7 @@ export function setupServerEndpointsTest( setupPermissionedRealm(hooks, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'realm-owner'], }, onRealmSetup, }); diff --git a/packages/realm-server/tests/server-endpoints/info-test.ts b/packages/realm-server/tests/server-endpoints/info-test.ts index 6c4975b0cf5..61cf7c57877 100644 --- a/packages/realm-server/tests/server-endpoints/info-test.ts +++ b/packages/realm-server/tests/server-endpoints/info-test.ts @@ -14,7 +14,6 @@ import { closeServer, createVirtualNetwork, setupDB, - insertUser, matrixURL, realmSecretSeed, runTestRealmServerWithRealms, @@ -103,8 +102,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('QUERY /_info federates info across realms and includes public list header', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); - let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, diff --git a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts index 1a964718e1e..9f834661198 100644 --- a/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts +++ b/packages/realm-server/tests/server-endpoints/realm-lifecycle-test.ts @@ -11,7 +11,6 @@ import { import type { SingleCardDocument } from '@cardstack/runtime-common'; import type { CardCollectionDocument } from '@cardstack/runtime-common/document-types'; import { cardSrc } from '@cardstack/runtime-common/etc/test-fixtures'; -import { fetchSessionRoom } from '@cardstack/runtime-common/db-queries/session-room-queries'; import { closeServer, createJWT, @@ -116,24 +115,9 @@ module(`server-endpoints/${basename(__filename)}`, function () { new URL(json.data.id), ); assert.deepEqual(permissions, { - [`@realm/mango_${endpoint}:localhost`]: [ - 'read', - 'write', - 'realm-owner', - ], [ownerUserId]: ['read', 'write', 'realm-owner'], }); - let sessionRoom = await fetchSessionRoom( - context.dbAdapter, - json.data.id, - ownerUserId, - ); - assert.ok( - sessionRoom, - 'session room record was created for the owner after realm creation', - ); - let id: string; let realm = context.testRealmServer2.testingOnlyRealms.find( (r) => r.url === json.data.id, diff --git a/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts b/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts index 476457323f0..9ad241f0174 100644 --- a/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts +++ b/packages/realm-server/tests/server-endpoints/search-prerendered-test.ts @@ -17,7 +17,6 @@ import { closeServer, createVirtualNetwork, setupDB, - insertUser, matrixURL, realmSecretSeed, runTestRealmServerWithRealms, @@ -140,8 +139,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('QUERY /_search-prerendered federates results across realms', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); - let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, @@ -194,8 +191,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('GET /_search-prerendered returns 400 for unsupported method', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); - let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, @@ -294,7 +289,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('QUERY /_search-prerendered returns 400 for invalid query', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, diff --git a/packages/realm-server/tests/server-endpoints/search-test.ts b/packages/realm-server/tests/server-endpoints/search-test.ts index af9f8dcaa24..53f87fc74a5 100644 --- a/packages/realm-server/tests/server-endpoints/search-test.ts +++ b/packages/realm-server/tests/server-endpoints/search-test.ts @@ -18,7 +18,6 @@ import { closeServer, createVirtualNetwork, setupDB, - insertUser, matrixURL, realmSecretSeed, runTestRealmServerWithRealms, @@ -141,8 +140,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('QUERY /_search federates results across realms', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); - let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, @@ -184,8 +181,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('QUERY /_search supports query body', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); - let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, @@ -214,8 +209,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('GET /_search returns 400 for unsupported method', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); - let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, @@ -305,7 +298,6 @@ module(`server-endpoints/${basename(__filename)}`, function (_hooks) { }); test('QUERY /_search returns 400 for invalid query', async function (assert) { - await insertUser(dbAdapter, ownerUserId, 'stripe-test-user', null); let realmServerToken = createRealmServerJWT( { user: ownerUserId, sessionRoom: 'session-room-test' }, realmSecretSeed, diff --git a/packages/realm-server/tests/server-endpoints/stripe-session-test.ts b/packages/realm-server/tests/server-endpoints/stripe-session-test.ts index 2c59ba8c5f1..b63132a3d95 100644 --- a/packages/realm-server/tests/server-endpoints/stripe-session-test.ts +++ b/packages/realm-server/tests/server-endpoints/stripe-session-test.ts @@ -1,20 +1,18 @@ import { module, test } from 'qunit'; import { basename } from 'path'; import type { Test, SuperTest } from 'supertest'; -import { MatrixClient } from '@cardstack/runtime-common/matrix-client'; import sinon from 'sinon'; import { getStripe } from '@cardstack/billing/stripe-webhook-handlers/stripe'; import type { PgAdapter } from '@cardstack/postgres'; import { getUserByMatrixUserId } from '@cardstack/billing/billing-queries'; import { + createJWT, insertPlan, insertUser, - realmSecretSeed, - realmServerTestMatrix, setupPermissionedRealm, } from '../helpers'; -import { createRealmServerSession } from './helpers'; import '@cardstack/runtime-common/helpers/code-equality-assertion'; +import type { Realm } from '@cardstack/runtime-common'; module(`server-endpoints/${basename(__filename)}`, function () { module('Realm Server Endpoints (not specific to one realm)', function () { @@ -24,7 +22,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { let listSubscriptionsStub: sinon.SinonStub; let retrieveProductStub: sinon.SinonStub; let createBillingPortalSessionStub: sinon.SinonStub; - let matrixClient: MatrixClient; let userId = '@test_realm:localhost'; let jwtToken: string; let request: SuperTest; @@ -33,9 +30,11 @@ module(`server-endpoints/${basename(__filename)}`, function () { function onRealmSetup(args: { request: SuperTest; dbAdapter: PgAdapter; + testRealm: Realm; }) { request = args.request; dbAdapter = args.dbAdapter; + jwtToken = createJWT(args.testRealm, userId); } setupPermissionedRealm(hooks, { @@ -58,25 +57,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { stripe.billingPortal.sessions, 'create', ); - - matrixClient = new MatrixClient({ - matrixURL: realmServerTestMatrix.url, - username: 'test_realm', - seed: realmSecretSeed, - }); - await matrixClient.login(); - let { sessionRoom, jwt } = await createRealmServerSession( - matrixClient, - request, - ); - - let { joined_rooms: rooms } = await matrixClient.getJoinedRooms(); - - if (!rooms.includes(sessionRoom)) { - await matrixClient.joinRoom(sessionRoom); - } - - jwtToken = jwt; }); hooks.afterEach(async function () { diff --git a/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts b/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts index e731aceceb3..423330186be 100644 --- a/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts +++ b/packages/realm-server/tests/server-endpoints/stripe-webhook-test.ts @@ -1,7 +1,7 @@ import { module, test } from 'qunit'; import { basename } from 'path'; import type { Test, SuperTest } from 'supertest'; -import type { Realm } from '@cardstack/runtime-common'; +import type { Realm, User } from '@cardstack/runtime-common'; import { Deferred } from '@cardstack/runtime-common'; import { MatrixClient } from '@cardstack/runtime-common/matrix-client'; import Stripe from 'stripe'; @@ -36,6 +36,7 @@ module(`server-endpoints/${basename(__filename)}`, function () { let matrixClient: MatrixClient; let roomId: string; let userId = '@test_realm:localhost'; + let user: User; let originalLowCreditThreshold: string | undefined; let waitForBillingNotification = async function ( assert: Assert, @@ -78,6 +79,7 @@ module(`server-endpoints/${basename(__filename)}`, function () { let stripe = getStripe(); createSubscriptionStub = sinon.stub(stripe.subscriptions, 'create'); fetchPriceListStub = sinon.stub(stripe.prices, 'list'); + user = await insertUser(dbAdapter, userId!, 'cus_123', 'user@test.com'); matrixClient = new MatrixClient({ matrixURL: realmServerTestMatrix.url, @@ -111,12 +113,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { test('subscribes user back to free plan when the current subscription is expired', async function (assert) { const secret = process.env.STRIPE_WEBHOOK_SECRET; - let user = await insertUser( - dbAdapter, - userId, - 'cus_123', - 'user@test.com', - ); let freePlan = await insertPlan( dbAdapter, 'Free plan', @@ -347,12 +343,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { test('ensures the current subscription expires when free plan subscription fails', async function (assert) { const secret = process.env.STRIPE_WEBHOOK_SECRET; - let user = await insertUser( - dbAdapter, - userId, - 'cus_123', - 'user@test.com', - ); await insertPlan(dbAdapter, 'Free plan', 0, 100, 'prod_free'); let creatorPlan = await insertPlan( dbAdapter, @@ -547,7 +537,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { test('sends billing notification on invoice payment succeeded event', async function (assert) { const secret = process.env.STRIPE_WEBHOOK_SECRET; - await insertUser(dbAdapter, userId!, 'cus_123', 'user@test.com'); await insertPlan(dbAdapter, 'Free plan', 0, 100, 'prod_free'); if (!secret) { throw new Error('STRIPE_WEBHOOK_SECRET is not set'); @@ -600,12 +589,7 @@ module(`server-endpoints/${basename(__filename)}`, function () { test('sends billing notification on checkout session completed event', async function (assert) { const secret = process.env.STRIPE_WEBHOOK_SECRET; - let user = await insertUser( - dbAdapter, - userId!, - 'cus_123', - 'user@test.com', - ); + await insertPlan(dbAdapter, 'Free plan', 0, 100, 'prod_free'); if (!secret) { throw new Error('STRIPE_WEBHOOK_SECRET is not set'); diff --git a/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts b/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts index 1aebb19061a..605944e36ec 100644 --- a/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts +++ b/packages/realm-server/tests/server-endpoints/user-and-catalog-test.ts @@ -27,7 +27,7 @@ module(`server-endpoints/${basename(__filename)}`, function () { }); test('can create a user', async function (assert) { - let ownerUserId = '@mango:localhost'; + let ownerUserId = '@mango-new:localhost'; let response = await context.request2 .post('/_user') .set('Accept', 'application/json') @@ -85,7 +85,6 @@ module(`server-endpoints/${basename(__filename)}`, function () { id: `${testRealm2URL}`, attributes: { ...testRealmInfo, - realmUserId: '@node-test_realm:localhost', }, }, ], diff --git a/packages/realm-server/tests/types-endpoint-test.ts b/packages/realm-server/tests/types-endpoint-test.ts index e0e339d13ba..b8d56aa7213 100644 --- a/packages/realm-server/tests/types-endpoint-test.ts +++ b/packages/realm-server/tests/types-endpoint-test.ts @@ -73,6 +73,7 @@ module(basename(__filename), function () { setupPermissionedRealm(hooks, { permissions: { '*': ['read', 'write'], + '@node-test_realm:localhost': ['read', 'write', 'realm-owner'], }, realmURL, onRealmSetup, diff --git a/packages/runtime-common/db-queries/db-types.ts b/packages/runtime-common/db-queries/db-types.ts index 37396c1cb26..6cce00cdf7b 100644 --- a/packages/runtime-common/db-queries/db-types.ts +++ b/packages/runtime-common/db-queries/db-types.ts @@ -4,6 +4,7 @@ export interface User { stripeCustomerId: string; stripeCustomerEmail: string | null; matrixRegistrationToken: string | null; + sessionRoomId: string | null; } export interface Plan { diff --git a/packages/runtime-common/db-queries/session-room-queries.ts b/packages/runtime-common/db-queries/session-room-queries.ts index 17d9d23efe4..7b03afe84bd 100644 --- a/packages/runtime-common/db-queries/session-room-queries.ts +++ b/packages/runtime-common/db-queries/session-room-queries.ts @@ -1,20 +1,15 @@ import type { DBAdapter } from '../db'; -import { query, param, dbExpression } from '../expression'; - -export const REALM_SERVER_REALM = '__realm-server__'; +import { query, param } from '../expression'; /** * Returns the stored session room id for the given matrix user or null when none exists. */ export async function fetchSessionRoom( dbAdapter: DBAdapter, - realmURL: string, matrixUserId: string, ) { let rows = await query(dbAdapter, [ - 'SELECT room_id FROM session_rooms WHERE realm_url =', - param(realmURL), - 'AND matrix_user_id =', + 'SELECT session_room_id FROM users WHERE matrix_user_id =', param(matrixUserId), ]); @@ -23,61 +18,56 @@ export async function fetchSessionRoom( } let [row] = rows; - return (row.room_id as string) ?? null; + return (row.session_room_id as string) ?? null; } /** - * Upserts the session room id for the given matrix user and updates the timestamp. + * Updates the session room id for the given matrix user. + * Throws if the user does not exist in the users table. */ export async function upsertSessionRoom( dbAdapter: DBAdapter, - realmURL: string, matrixUserId: string, roomId: string, ) { - await query(dbAdapter, [ - 'INSERT INTO session_rooms (realm_url, matrix_user_id, room_id, created_at, updated_at)', - 'VALUES (', - param(realmURL), - ',', - param(matrixUserId), - ',', - param(roomId), - ',', - dbExpression({ pg: 'NOW()', sqlite: 'CURRENT_TIMESTAMP' }), - ',', - dbExpression({ pg: 'NOW()', sqlite: 'CURRENT_TIMESTAMP' }), - ')', - 'ON CONFLICT (realm_url, matrix_user_id) DO UPDATE SET', - 'room_id =', + let rows = await query(dbAdapter, [ + 'UPDATE users SET session_room_id =', param(roomId), - ',', - 'updated_at =', - dbExpression({ pg: 'NOW()', sqlite: 'CURRENT_TIMESTAMP' }), + 'WHERE matrix_user_id =', + param(matrixUserId), + 'RETURNING id', ]); + + if (rows.length === 0) { + throw new Error( + `Cannot set session room for user ${matrixUserId}: user does not exist in the users table`, + ); + } } /** * Returns a mapping of matrix user id to session room id for all known sessions. */ -export async function fetchAllSessionRooms( +export async function fetchRealmSessionRooms( dbAdapter: DBAdapter, realmURL: string, ) { let rows = await query(dbAdapter, [ - 'SELECT matrix_user_id, room_id FROM session_rooms WHERE realm_url =', + 'SELECT u.matrix_user_id, u.session_room_id', + 'FROM users u', + 'JOIN realm_user_permissions rup', + 'ON rup.username = u.matrix_user_id', + 'WHERE rup.realm_url =', param(realmURL), + 'AND (rup.read = true OR rup.write = true)', + 'AND u.session_room_id IS NOT NULL', ]); let result: Record = {}; for (let row of rows) { - if (row.matrix_user_id && row.room_id) { - result[row.matrix_user_id as string] = row.room_id as string; + if (row.matrix_user_id && row.session_room_id) { + result[row.matrix_user_id as string] = row.session_room_id as string; } } return result; } - -export async function clearSessionRooms(dbAdapter: DBAdapter) { - await query(dbAdapter, ['DELETE FROM session_rooms']); -} diff --git a/packages/runtime-common/db-queries/user-queries.ts b/packages/runtime-common/db-queries/user-queries.ts index b31d56e434d..8ea1ab74b5e 100644 --- a/packages/runtime-common/db-queries/user-queries.ts +++ b/packages/runtime-common/db-queries/user-queries.ts @@ -1,6 +1,6 @@ import type { DBAdapter } from '../db'; -import { query, asExpressions, insert } from '../expression'; +import { query, asExpressions, insert, param } from '../expression'; import type { User } from './db-types'; export async function insertUser( @@ -20,3 +20,16 @@ export async function insertUser( return result[0] as unknown as User; } + +export async function userExists( + dbAdapter: DBAdapter, + matrixUserId: string, +): Promise { + let [row] = await query(dbAdapter, [ + 'SELECT EXISTS (SELECT 1 FROM users WHERE matrix_user_id =', + param(matrixUserId), + ') AS user_exists', + ]); + + return Boolean(row.user_exists); +} diff --git a/packages/runtime-common/helpers/const.ts b/packages/runtime-common/helpers/const.ts index f7b7b38fb1e..1ae04ac4b79 100644 --- a/packages/runtime-common/helpers/const.ts +++ b/packages/runtime-common/helpers/const.ts @@ -2,15 +2,6 @@ import type { RealmInfo } from '../index'; export const testRealmURL = `http://test-realm/test/`; export const testHostModeRealmURL = 'http://test-realm/user/test/'; -export function testRealmURLToUsername(realmURLString: string) { - let realmURL = new URL(realmURLString); - let realmUsername = `@realm/${realmURL.host}${realmURL.pathname - .replace('/', '-') - .replace(/\/$/, '')}:localhost`; - - return realmUsername; -} - export const testRealmInfo: RealmInfo = { name: 'Unnamed Workspace', backgroundURL: null, @@ -19,7 +10,7 @@ export const testRealmInfo: RealmInfo = { interactHome: null, hostHome: null, visibility: 'public', - realmUserId: testRealmURLToUsername(testRealmURL), + realmUserId: '@realm_server:localhost', publishable: null, lastPublishedAt: null, }; diff --git a/packages/runtime-common/realm.ts b/packages/runtime-common/realm.ts index a093bf1ea74..716a180a1c7 100644 --- a/packages/runtime-common/realm.ts +++ b/packages/runtime-common/realm.ts @@ -108,7 +108,7 @@ import { createResponse } from './create-response'; import { mergeRelationships } from './merge-relationships'; import { getCardDirectoryName } from './helpers/card-directory-name'; import { - MatrixClient, + type MatrixClient, ensureFullMatrixUserId, getMatrixUsername, } from './matrix-client'; @@ -131,6 +131,7 @@ import type { Utils } from './matrix-backend-authentication'; import { MatrixBackendAuthentication } from './matrix-backend-authentication'; import type { + FileWatcherEventContent, RealmEventContent, UpdateRealmEventContent, } from 'https://cardstack.com/base/matrix-event'; @@ -148,6 +149,7 @@ import { fetchSessionRoom, upsertSessionRoom, } from './db-queries/session-room-queries'; +import { userExists } from './db-queries/user-queries'; import { analyzeRealmPublishability, type PublishabilityViolation, @@ -288,7 +290,7 @@ async function computeContentHashFromRef( export interface TokenClaims { user: string; realm: string; - sessionRoom: string; + sessionRoom: string | undefined; // TODO: remove when we create users on demand in ensureSessionRoom permissions: RealmPermissions['user']; realmServerURL: string; } @@ -356,7 +358,7 @@ export interface RealmAdapter { fileWatcherEnabled: boolean; - subscribe(cb: (message: UpdateRealmEventContent) => void): Promise; + subscribe(cb: (message: FileWatcherEventContent) => void): Promise; unsubscribe(): void; @@ -396,7 +398,7 @@ export type RequestContext = { realm: Realm; permissions: RealmPermissions }; export class Realm { #startedUp = new Deferred(); #matrixClient: MatrixClient; - #realmServerMatrixClient: MatrixClient; + #matrixClientUserId: string; #realmServerURL: string; #realmIndexUpdater: RealmIndexUpdater; #realmIndexQueryEngine: RealmIndexQueryEngine; @@ -411,7 +413,6 @@ export class Realm { #disableModuleCaching = false; #fullIndexOnStartup = false; #fromScratchIndexPriority = systemInitiatedPriority; - #realmServerMatrixUserId: string; #definitionLookup: DefinitionLookup; #copiedFromRealm: URL | undefined; #sourceCache = new AliasCache(); @@ -459,24 +460,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; @@ -484,7 +483,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; @@ -492,19 +490,14 @@ export class Realm { this.#fullIndexOnStartup = opts?.fullIndexOnStartup ?? false; this.#fromScratchIndexPriority = opts?.fromScratchIndexPriority ?? systemInitiatedPriority; - this.#realmServerMatrixClient = realmServerMatrixClient; + this.#matrixClient = matrixClient; + this.#matrixClientUserId = userIdFromUsername( + this.#matrixClient.username, + this.#matrixClient.matrixURL.href, + ); 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; @@ -534,7 +527,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), ), ]); @@ -688,22 +681,18 @@ export class Realm { await this.#matrixClient.login(); } - async ensureSessionRoom(matrixUserId: string): Promise { - let sessionRoom = await fetchSessionRoom( - this.#dbAdapter, - this.url, - matrixUserId, - ); + async ensureSessionRoom(matrixUserId: string): Promise { + let sessionRoom = await fetchSessionRoom(this.#dbAdapter, matrixUserId); if (!sessionRoom) { await this.#matrixClient.login(); + let userExistsInDB = await userExists(this.#dbAdapter, matrixUserId); + if (!userExistsInDB) { + // TODO: should we create it if it doesn't exist? + return undefined; + } sessionRoom = await this.#matrixClient.createDM(matrixUserId); - await upsertSessionRoom( - this.#dbAdapter, - this.url, - matrixUserId, - sessionRoom, - ); + await upsertSessionRoom(this.#dbAdapter, matrixUserId, sessionRoom); } return sessionRoom; @@ -878,6 +867,7 @@ export class Realm { indexType: 'incremental', invalidations: [...invalidations], clientRequestId, + realmURL: this.url, }); return results.map(({ path, lastModified }) => ({ path, @@ -1199,7 +1189,7 @@ export class Realm { } private getTrackedWrite( - data: UpdateRealmEventContent, + data: FileWatcherEventContent, ): { isTracked: boolean; url: URL } | undefined { let file: string; let type: string | undefined; @@ -1247,6 +1237,7 @@ export class Realm { eventName: 'index', indexType: 'incremental', invalidations: invalidatedURLs.map((u) => u.href), + realmURL: this.url, }); }, }); @@ -1281,6 +1272,7 @@ export class Realm { eventName: 'index', indexType: 'incremental', invalidations: invalidatedURLs.map((u) => u.href), + realmURL: this.url, }); }, }); @@ -1301,6 +1293,7 @@ export class Realm { this.broadcastRealmEvent({ eventName: 'index', indexType: 'full', + realmURL: this.url, }); } @@ -1313,6 +1306,7 @@ export class Realm { eventName: 'index', indexType: 'copy', sourceRealmURL: this.#copiedFromRealm.href, + realmURL: this.url, }); } else { let isNewIndex = await this.#realmIndexUpdater.isNewIndex(); @@ -1329,6 +1323,7 @@ export class Realm { this.broadcastRealmEvent({ eventName: 'index', indexType: 'full', + realmURL: this.url, }); } } @@ -1377,6 +1372,8 @@ export class Realm { return userId; } // hard coded test URLs + + // TODO::`( this should be removed. if ((globalThis as any).__environment === 'test') { let url = new URL(this.url); if (url.hostname === '127.0.0.1') { @@ -1446,8 +1443,6 @@ export class Realm { }, ensureSessionRoom: async (userId: string) => this.ensureSessionRoom(userId), - setSessionRoom: (userId: string, roomId: string) => - upsertSessionRoom(this.#dbAdapter, this.url, userId, roomId), } as Utils, ); @@ -1885,7 +1880,7 @@ export class Realm { } // if the client is the realm matrix user then we permit all actions - if (user === this.#matrixClient.getUserId()) { + if (user === this.#matrixClientUserId) { return; } @@ -4294,7 +4289,10 @@ export class Realm { await this.#definitionLookup.invalidate(tracked.url.href); } - this.broadcastRealmEvent(data); + this.broadcastRealmEvent({ + ...data, + realmURL: this.url, + } as UpdateRealmEventContent); this.#updateItems.push({ operation: ('added' in data ? 'add' @@ -4326,6 +4324,7 @@ export class Realm { eventName: 'index', indexType: 'incremental', invalidations: invalidatedURLs.map((u) => u.href), + realmURL: this.url, }); }, ...(operation === 'removed' ? { delete: true } : {}), @@ -4339,6 +4338,7 @@ export class Realm { eventName: 'index', indexType: 'incremental-index-initiation', updatedFile, + realmURL: this.url, }); } @@ -4381,12 +4381,12 @@ export class Realm { if (shouldUseWorldReadable) { permissions = { - [this.#realmServerMatrixUserId]: ['assume-user'], + [this.#matrixClientUserId]: ['assume-user'], '*': ['read'], }; } else { permissions = { - [this.#realmServerMatrixUserId]: ['assume-user'], + [this.#matrixClientUserId]: ['assume-user'], ...(await fetchRealmPermissions(this.#dbAdapter, new URL(this.url))), }; } diff --git a/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts b/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts index e019b43cf19..36a8ebd25e5 100644 --- a/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts +++ b/packages/workspace-sync-cli/tests/helpers/start-test-realm.ts @@ -9,6 +9,7 @@ export interface TestRealmServer { realmProcess: ChildProcess; workerProcess: ChildProcess; stop: () => Promise; + executeSQL: (sql: string) => Promise[]>; } export async function startTestRealmServer( @@ -81,7 +82,6 @@ export async function startTestRealmServer( } }); }); - // Start worker manager first const workerArgs = [ '--transpileOnly', @@ -214,6 +214,30 @@ export async function startTestRealmServer( }); }); + let sqlResults: ((results: string) => void) | undefined; + let sqlError: ((error: string) => void) | undefined; + + realmProcess.on('message', (message) => { + if (typeof message === 'string' && message.startsWith('sql-results:')) { + let results = message.substring('sql-results:'.length); + if (!sqlResults) { + console.error(`received unprompted SQL: ${results}`); + return; + } + sqlResults(results); + } else if ( + typeof message === 'string' && + message.startsWith('sql-error:') + ) { + let error = message.substring('sql-error:'.length); + if (!sqlError) { + console.error(`received unprompted SQL error: ${error}`); + return; + } + sqlError(error); + } + }); + // Create stop function const stop = async () => { const realmServerStopped = new Promise((resolve) => { @@ -244,8 +268,22 @@ export async function startTestRealmServer( prerenderServer.close(() => resolve()), ); }; + const executeSQL = async (sql: string): Promise[]> => { + let execute = new Promise( + (resolve, reject: (reason: string) => void) => { + sqlResults = resolve; + sqlError = reject; + }, + ); + console.log('Executing SQL in realm server:', sql); + realmProcess.send(`execute-sql:${sql}`); + let resultsStr = await execute; + sqlResults = undefined; + sqlError = undefined; + return JSON.parse(resultsStr); + }; - return { realmProcess, workerProcess, stop }; + return { realmProcess, workerProcess, stop, executeSQL }; } export async function waitForServer( diff --git a/packages/workspace-sync-cli/tests/integration-test.ts b/packages/workspace-sync-cli/tests/integration-test.ts index 08d18ad826c..a61d2c7a3a8 100644 --- a/packages/workspace-sync-cli/tests/integration-test.ts +++ b/packages/workspace-sync-cli/tests/integration-test.ts @@ -172,6 +172,9 @@ module('Workspace Sync CLI Integration Tests', function (hooks) { console.error('❌ Failed to start shared realm server:', error); throw error; } + await sharedRealmServer.executeSQL( + `INSERT INTO users (matrix_user_id) VALUES ('@test_realm:localhost') ON CONFLICT (matrix_user_id) DO NOTHING`, + ); }); hooks.after(async function () { @@ -203,6 +206,7 @@ module('Workspace Sync CLI Integration Tests', function (hooks) { // Reset realm content between tests (safely) await clearRealmContent(sharedRealmDir); await createRealmContent(sharedRealmDir); + console.log('✅ Test environment is ready!\n'); }); hooks.afterEach(async function () {