From f17e4801b821c00dc36db6ca60aab491e0286064 Mon Sep 17 00:00:00 2001 From: danielaloni Date: Wed, 26 Oct 2022 15:10:41 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Delete=203PID=20association=20up?= =?UTF-8?q?on=20deactivating=20user.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- userapi/internal/api.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/userapi/internal/api.go b/userapi/internal/api.go index 2f7795dfe..3414747af 100644 --- a/userapi/internal/api.go +++ b/userapi/internal/api.go @@ -549,14 +549,24 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a return err } - pusherReq := &api.PerformPusherDeletionRequest{ - Localpart: req.Localpart, - } - if err := a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil { + threepids, err := a.DB.GetThreePIDsForLocalpart(ctx, req.Localpart) + if err != nil { 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 return err }