Move server FQDN to query parameters

badges · Dec 20, 2018 · 410015e · 410015e
1 parent 2a94b15
commit 410015e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/services/matrix/matrix.service.js b/services/matrix/matrix.service.js
@@ -167,7 +167,7 @@ module.exports = class Matrix extends BaseJsonService {
     }
   }
 
-  async handle({ roomAlias, serverFQDN }) {
+  async handle({ roomAlias }, { serverFQDN }) {
     const members = await this.fetch({ roomAlias, serverFQDN })
     return this.constructor.render({ members })
   }
@@ -183,8 +183,9 @@ module.exports = class Matrix extends BaseJsonService {
   static get route() {
     return {
       base: 'matrix',
-      format: '([^/]+)(?:/([^/]+))?',
-      capture: ['roomAlias', 'serverFQDN'],
+      format: '([^/]+)',
+      capture: ['roomAlias'],
+      queryParams: ['serverFQDN'],
     }
   }
 

diff --git a/services/matrix/matrix.tester.js b/services/matrix/matrix.tester.js
@@ -374,7 +374,9 @@ t.create('server uses a custom port')
   })
 
 t.create('specify the homeserver fqdn')
-  .get('/ALIAS:DUMMY.dumb/matrix.DUMMY.dumb.json?style=_shields_test')
+  .get(
+    '/ALIAS:DUMMY.dumb.json?style=_shields_test&serverFQDN=matrix.DUMMY.dumb'
+  )
   .intercept(nock =>
     nock('https://matrix.DUMMY.dumb/')
       .post('/_matrix/client/r0/register?kind=guest')