0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[server] Remove existing scheduledDelete entries if account is recovered

Browse source
This commit is contained in:
Neeraj Gupta 2024-04-11 11:03:57 +05:30
parent 02e8861e96
commit 830483ca68
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/pkg/controller/data_cleanup/controller.go
View file

@ -190,8 +190,15 @@ func (c *DeleteUserCleanupController) storageCheck(ctx context.Context, item *en
}
func (c *DeleteUserCleanupController) isDeleted(item *entity.DataCleanup) error {
_, err := c.UserRepo.Get(item.UserID)
u, err := c.UserRepo.Get(item.UserID)
if err == nil {
// user is not deleted, double check by verifying email is not empty
if u.Email != "" {
remErr := c.Repo.RemoveScheduledDelete(context.Background(), item.UserID)
if remErr != nil {
return stacktrace.Propagate(remErr, "failed to remove scheduled delete entry")
}
}
return stacktrace.Propagate(ente.NewBadRequestWithMessage("User ID is linked to undeleted account"), "")
}
if !errors.Is(err, ente.ErrUserDeleted) {