mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-22 05:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make Sytest/Complement happy again

Browse source
This commit is contained in:
Till Faelligen 2022-12-23 16:25:39 +01:00
parent bf1bf6b230
commit 17c5a748f7
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clientapi/auth/password.go
View file

@ -101,10 +101,6 @@ func (t *LoginTypePassword) Login(ctx context.Context, req interface{}) (*Login,
} }
} }
// Set the user, so login.Username() can do the right thing
r.Identifier.User = strings.ToLower(localpart)
r.User = strings.ToLower(localpart) // deprecated
// If we couldn't find the user by the lower cased localpart, try the provided // If we couldn't find the user by the lower cased localpart, try the provided
// localpart as is. // localpart as is.
if !res.Exists { if !res.Exists {
@ -127,8 +123,9 @@ func (t *LoginTypePassword) Login(ctx context.Context, req interface{}) (*Login,
JSON: jsonerror.Forbidden("The username or password was incorrect or the account does not exist."), JSON: jsonerror.Forbidden("The username or password was incorrect or the account does not exist."),
} }
} }
r.Identifier.User = localpart
r.User = localpart
} }
// Set the user, so login.Username() can do the right thing
r.Identifier.User = res.Account.UserID
r.User = res.Account.UserID
return &r.Login, nil return &r.Login, nil
} }