diff options
author | Kegsay <kegan@matrix.org> | 2020-06-16 14:10:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-16 14:10:55 +0100 |
commit | 9c77022513f400db59409f5b55fc6223d38d6bb8 (patch) | |
tree | 52223755553ef4d7065747528e40c27a79a71dff /cmd/dendritejs | |
parent | 57b7fa3db801c27190bfd143cfebe98e3d76a6ae (diff) |
Make userapi responsible for checking access tokens (#1133)
* Make userapi responsible for checking access tokens
There's still plenty of dependencies on account/device DBs, but this
is a start. This is a breaking change as it adds a required config
value `listen.user_api`.
* Cleanup
* Review comments and test fix
Diffstat (limited to 'cmd/dendritejs')
-rw-r--r-- | cmd/dendritejs/main.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go index 8c19eb6d..7930c28d 100644 --- a/cmd/dendritejs/main.go +++ b/cmd/dendritejs/main.go @@ -30,6 +30,7 @@ import ( "github.com/matrix-org/dendrite/internal/setup" "github.com/matrix-org/dendrite/publicroomsapi/storage" "github.com/matrix-org/dendrite/roomserver" + "github.com/matrix-org/dendrite/userapi" go_http_js_libp2p "github.com/matrix-org/go-http-js-libp2p" "github.com/matrix-org/gomatrixserverlib" @@ -211,6 +212,8 @@ func main() { logrus.WithError(err).Panicf("failed to connect to public rooms db") } + userAPI := userapi.NewInternalAPI(accountDB, deviceDB, cfg.Matrix.ServerName, nil) + monolith := setup.Monolith{ Config: base.Cfg, AccountDB: accountDB, @@ -224,6 +227,7 @@ func main() { EDUInternalAPI: eduInputAPI, FederationSenderAPI: fedSenderAPI, RoomserverAPI: rsAPI, + UserAPI: userAPI, //ServerKeyAPI: serverKeyAPI, PublicRoomsDB: publicRoomsDB, |