Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[server] Allow self-delete without subscription row

Neeraj Guptacda24b164431
diff --git a/server/pkg/controller/user/user_delete.go b/server/pkg/controller/user/user_delete.go
index b08d88a6f5..5452b2d104 100644
--- a/server/pkg/controller/user/user_delete.go
+++ b/server/pkg/controller/user/user_delete.go
@@ -1,7 +1,9 @@
package user
import (
+ "database/sql"
"encoding/base64"
+ "errors"
"github.com/ente/museum/ente"
enteJWT "github.com/ente/museum/ente/jwt"
@@ -31,13 +33,13 @@ func (c *UserController) GetDeleteChallengeToken(ctx *gin.Context) (*ente.Delete
})
logger.Info("User initiated self-delete")
subscription, err := c.BillingController.GetSubscription(ctx, userID)
- if err != nil {
+ if err != nil && !errors.Is(err, sql.ErrNoRows) {
return nil, stacktrace.Propagate(err, "")
}
/* todo: add check to see if there's pending abuse report or if user's master password
was changed in last X days.
*/
- shouldNotifyDiscord := subscription.ProductID != ente.FreePlanProductID
+ shouldNotifyDiscord := err == nil && subscription.ProductID != ente.FreePlanProductID
if shouldNotifyDiscord {
go c.DiscordController.NotifyAccountDelete(user.ID, string(subscription.PaymentProvider), subscription.ProductID)
}
@@ -75,7 +77,7 @@ func (c *UserController) SelfDeleteAccount(ctx *gin.Context, req ente.DeleteAcco
return nil, stacktrace.Propagate(err, "")
}
_, err = c.BillingController.GetSubscription(ctx, userID)
- if err != nil {
+ if err != nil && !errors.Is(err, sql.ErrNoRows) {
return nil, stacktrace.Propagate(err, "")
}
logger := logrus.WithFields(logrus.Fields{