aboutsummaryrefslogtreecommitdiff
path: root/cmd/dendrite-monolith-server/main.go
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-06-16 14:10:55 +0100
committerGitHub <noreply@github.com>2020-06-16 14:10:55 +0100
commit9c77022513f400db59409f5b55fc6223d38d6bb8 (patch)
tree52223755553ef4d7065747528e40c27a79a71dff /cmd/dendrite-monolith-server/main.go
parent57b7fa3db801c27190bfd143cfebe98e3d76a6ae (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/dendrite-monolith-server/main.go')
-rw-r--r--cmd/dendrite-monolith-server/main.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go
index 3a0a84ef..675474b8 100644
--- a/cmd/dendrite-monolith-server/main.go
+++ b/cmd/dendrite-monolith-server/main.go
@@ -30,6 +30,7 @@ import (
"github.com/matrix-org/dendrite/roomserver"
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/serverkeyapi"
+ "github.com/matrix-org/dendrite/userapi"
"github.com/sirupsen/logrus"
)
@@ -119,6 +120,8 @@ func main() {
logrus.WithError(err).Panicf("failed to connect to public rooms db")
}
+ userAPI := userapi.NewInternalAPI(accountDB, deviceDB, cfg.Matrix.ServerName, cfg.Derived.ApplicationServices)
+
monolith := setup.Monolith{
Config: base.Cfg,
AccountDB: accountDB,
@@ -133,6 +136,7 @@ func main() {
FederationSenderAPI: fsAPI,
RoomserverAPI: rsAPI,
ServerKeyAPI: serverKeyAPI,
+ UserAPI: userAPI,
PublicRoomsDB: publicRoomsDB,
}