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 /clientapi/routing/threepid.go | |
| 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 'clientapi/routing/threepid.go')
| -rw-r--r-- | clientapi/routing/threepid.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clientapi/routing/threepid.go b/clientapi/routing/threepid.go index 49a9f304..c712c1c3 100644 --- a/clientapi/routing/threepid.go +++ b/clientapi/routing/threepid.go @@ -23,6 +23,7 @@ import ( "github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/clientapi/threepid" "github.com/matrix-org/dendrite/internal/config" + "github.com/matrix-org/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" @@ -84,7 +85,7 @@ func RequestEmailToken(req *http.Request, accountDB accounts.Database, cfg *conf // CheckAndSave3PIDAssociation implements POST /account/3pid func CheckAndSave3PIDAssociation( - req *http.Request, accountDB accounts.Database, device *authtypes.Device, + req *http.Request, accountDB accounts.Database, device *api.Device, cfg *config.Dendrite, ) util.JSONResponse { var body threepid.EmailAssociationCheckRequest @@ -148,7 +149,7 @@ func CheckAndSave3PIDAssociation( // GetAssociated3PIDs implements GET /account/3pid func GetAssociated3PIDs( - req *http.Request, accountDB accounts.Database, device *authtypes.Device, + req *http.Request, accountDB accounts.Database, device *api.Device, ) util.JSONResponse { localpart, _, err := gomatrixserverlib.SplitID('@', device.UserID) if err != nil { |