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

🐛 Delete 3PID association upon deactivating user.

Browse source
This commit is contained in:
danielaloni 2022-10-26 15:10:41 +03:00
parent 2511b7d5ca
commit f17e4801b8
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
userapi/internal/api.go
View file

@ -549,14 +549,24 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a
return err return err
} }
pusherReq := &api.PerformPusherDeletionRequest{ threepids, err := a.DB.GetThreePIDsForLocalpart(ctx, req.Localpart)
Localpart: req.Localpart, if err != nil {
}
if err := a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil {
return err return err
} }
err := a.DB.DeactivateAccount(ctx, req.Localpart) err = a.DB.RemoveThreePIDAssociation(ctx, threepids[0].Address, threepids[0].Medium)
if err != nil {
return err
}
pusherReq := &api.PerformPusherDeletionRequest{
Localpart: req.Localpart,
}
if err = a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil {
return err
}
err = a.DB.DeactivateAccount(ctx, req.Localpart)
res.AccountDeactivated = err == nil res.AccountDeactivated = err == nil
return err return err
} }