Read the right username field when performing account deactivation (#1954)

`Login` has 2 username fields, and we were always checking the
deprecated one. Instead, check both.
This commit is contained in:
kegsay 2021-08-02 13:11:23 +01:00 committed by GitHub
parent ed4097825b
commit a22ab3eee6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -33,7 +33,7 @@ func Deactivate(
return *errRes return *errRes
} }
localpart, _, err := gomatrixserverlib.SplitID('@', login.User) localpart, _, err := gomatrixserverlib.SplitID('@', login.Username())
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("gomatrixserverlib.SplitID failed") util.GetLogger(req.Context()).WithError(err).Error("gomatrixserverlib.SplitID failed")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()