mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow AS to deactivate it's own users (#30)

Browse source
This commit is contained in:
PiotrKozimor 2022-08-26 14:41:09 +02:00 committed by GitHub
parent d15a4e4a61
commit 0782819d26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clientapi/routing/deactivate.go
View file

@ -27,13 +27,17 @@ func Deactivate(
JSON: jsonerror.BadJSON("The request body could not be read: " + err.Error()), JSON: jsonerror.BadJSON("The request body could not be read: " + err.Error()),
} }
} }
var userId string
login, errRes := userInteractiveAuth.Verify(ctx, bodyBytes, deviceAPI) if deviceAPI.AccountType != api.AccountTypeAppService {
if errRes != nil { login, errRes := userInteractiveAuth.Verify(ctx, bodyBytes, deviceAPI)
return *errRes if errRes != nil {
return *errRes
}
userId = login.Username()
} else {
userId = deviceAPI.UserID
} }
localpart, _, err := gomatrixserverlib.SplitID('@', userId)
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()