diff options
author | Kegsay <kegan@matrix.org> | 2020-06-15 16:57:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-15 16:57:59 +0100 |
commit | 7c36fb78a729dcce174a5d1e577edeeeb9ca806d (patch) | |
tree | 0059b02850debc57f7d24658039b924d427f1434 /federationapi/federationapi.go | |
parent | 1aac3173410dbe5581f27b2f9104ef850fefa546 (diff) |
Fix rooms v3 url paths for good - with tests (#1130)
* Fix rooms v3 url paths for good - with tests
- Add a test rig around `federationapi` to test routing.
- Use `JSONVerifier` over `KeyRing` so we can stub things out more easily.
- Add `test.NopJSONVerifier` which verifies nothing.
- Add `base.BaseMux` which is the original `mux.Router` used to spawn public/internal routers.
- Listen on `base.BaseMux` and not the default serve mux as it cleans paths which we don't want.
- Factor out `ListenAndServe` to `test.ListenAndServe` and add flag for listening on TLS.
* Fix comments
* Linting
Diffstat (limited to 'federationapi/federationapi.go')
-rw-r--r-- | federationapi/federationapi.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go index 9299b501..db272f1c 100644 --- a/federationapi/federationapi.go +++ b/federationapi/federationapi.go @@ -35,7 +35,7 @@ func AddPublicRoutes( accountsDB accounts.Database, deviceDB devices.Database, federation *gomatrixserverlib.FederationClient, - keyRing *gomatrixserverlib.KeyRing, + keyRing gomatrixserverlib.JSONVerifier, rsAPI roomserverAPI.RoomserverInternalAPI, asAPI appserviceAPI.AppServiceQueryAPI, federationSenderAPI federationSenderAPI.FederationSenderInternalAPI, @@ -44,7 +44,7 @@ func AddPublicRoutes( routing.Setup( router, cfg, rsAPI, asAPI, - eduAPI, federationSenderAPI, *keyRing, + eduAPI, federationSenderAPI, keyRing, federation, accountsDB, deviceDB, ) } |