Merge remote-tracking branch 'origin/develop' into release-v2.1.0

changelog.d/233.bugfix

@@ -0,0 +1 @@
+Ensure that the bridge bot uses the real homeserver URL when encryption is enabled

src/bridge.ts

@@ -556,7 +556,7 @@ export class Bridge {
         }
 
         this.clientFactory = this.opts.clientFactory || new ClientFactory({
-            url: this.opts.bridgeEncryption?.homeserverUrl || this.opts.homeserverUrl,
+            url: this.opts.homeserverUrl,
             token: asToken,
             appServiceUserId: this.botUserId,
             clientSchedulerBuilder: function() {
@@ -983,7 +983,14 @@ export class Bridge {
                 throw Error('Cannot call getIntent before calling .run()');
             }
             return this.botIntent;
+        } else if (userId === this.botUserId) {
+            if (!this.botIntent) {
+                // This will be defined when .run is called.
+                throw Error('Cannot call getIntent before calling .run()');
+            }
+            return this.botIntent;
         }
+
         if (this.opts.escapeUserIds === undefined || this.opts.escapeUserIds) {
             userId = new MatrixUser(userId).getId(); // Escape the ID
         }
@@ -995,7 +1002,12 @@ export class Bridge {
             return existingIntent.intent;
         }
 
-        const client = this.clientFactory.getClientAs(userId, request, !!this.opts.bridgeEncryption);
+        const client = this.clientFactory.getClientAs(
+            userId,
+            request,
+            this.opts.bridgeEncryption?.homeserverUrl,
+            !!this.opts.bridgeEncryption,
+        );
         const clientIntentOpts: IntentOpts = {
             backingStore: this.intentBackingStore,
             ...this.opts.intentOptions?.clients,
@@ -1009,7 +1021,6 @@ export class Bridge {
                 ensureClientSyncingCallback: async () => {
                     return this.eeEventBroker?.startSyncingUser(userId!);
                 },
-                homeserverUrl: encryptionOpts.homeserverUrl,
             };
         }
         const intent = new Intent(client, this.botClient, clientIntentOpts);

src/components/client-factory.ts

@@ -120,7 +120,7 @@ export class ClientFactory {
      * resolved.
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    public getClientAs(userId?: string, request?: any, usingE2E = false) {
+    public getClientAs(userId?: string, request?: any, urlOverride?: string, usingE2E = false) {
         const reqId = request ? request.getId() : "-";
         const userIdKey = userId || "bot";
 
@@ -144,7 +144,7 @@ export class ClientFactory {
         queryParams.access_token = this.token;
         const clientOpts = {
             accessToken: this.token,
-            baseUrl: this.url,
+            baseUrl: urlOverride || this.url,
             userId: userId || this.botUserId, // NB: no clobber so we don't set ?user_id=BOT
             queryParams: queryParams,
             scheduler:  this.clientSchedulerBuilder ? this.clientSchedulerBuilder() : undefined,

src/components/intent.ts

@@ -49,7 +49,6 @@ export interface IntentOpts {
         sessionPromise: Promise<ClientEncryptionSession|null>;
         sessionCreatedCallback: (session: ClientEncryptionSession) => Promise<void>;
         ensureClientSyncingCallback: () => Promise<void>;
-        homeserverUrl: string;
     };
 }
 
@@ -118,7 +117,6 @@ export class Intent {
         sessionPromise: Promise<ClientEncryptionSession|null>;
         sessionCreatedCallback: (session: ClientEncryptionSession) => Promise<void>;
         ensureClientSyncingCallback: () => Promise<void>;
-        homeserverUrl: string;
     };
     private readyPromise?: Promise<unknown>;