mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-21 04:53:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add missing servername when getting accounts by localpart

Browse source
This commit is contained in:
Till Faelligen 2022-11-28 07:59:52 +01:00
parent 4d4877af5a
commit 660771b83f
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roomserver/internal/input/input_events.go
View file

@ -775,7 +775,10 @@ func (r *Inputer) kickGuests(ctx context.Context, event *gomatrixserverlib.Event
} }
accountRes := &userAPI.QueryAccountByLocalpartResponse{} accountRes := &userAPI.QueryAccountByLocalpartResponse{}
if err = r.UserAPI.QueryAccountByLocalpart(ctx, &userAPI.QueryAccountByLocalpartRequest{Localpart: localpart}, accountRes); err != nil { if err = r.UserAPI.QueryAccountByLocalpart(ctx, &userAPI.QueryAccountByLocalpartRequest{
Localpart: localpart,
ServerName: senderDomain,
}, accountRes); err != nil {
return err return err
} }
if accountRes.Account == nil { if accountRes.Account == nil {

3
userapi/api/api.go
View file

@ -674,7 +674,8 @@ type PerformSaveThreePIDAssociationRequest struct {
} }
type QueryAccountByLocalpartRequest struct { type QueryAccountByLocalpartRequest struct {
Localpart string Localpart string
ServerName gomatrixserverlib.ServerName
} }
type QueryAccountByLocalpartResponse struct { type QueryAccountByLocalpartResponse struct {

2
userapi/internal/api.go
View file

@ -549,7 +549,7 @@ func (a *UserInternalAPI) QueryAccessToken(ctx context.Context, req *api.QueryAc
} }
func (a *UserInternalAPI) QueryAccountByLocalpart(ctx context.Context, req *api.QueryAccountByLocalpartRequest, res *api.QueryAccountByLocalpartResponse) (err error) { func (a *UserInternalAPI) QueryAccountByLocalpart(ctx context.Context, req *api.QueryAccountByLocalpartRequest, res *api.QueryAccountByLocalpartResponse) (err error) {
res.Account, err = a.DB.GetAccountByLocalpart(ctx, req.Localpart) res.Account, err = a.DB.GetAccountByLocalpart(ctx, req.Localpart, req.ServerName)
return return
} }