Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Support for deleting accounts from support tools

Matt Roberts0ebdb259e5d3
diff --git a/app/jobs/delete_scheduled_tenants_job.go b/app/jobs/delete_scheduled_tenants_job.go
index 9c49cdaf0..9b0218dff 100644
--- a/app/jobs/delete_scheduled_tenants_job.go
+++ b/app/jobs/delete_scheduled_tenants_job.go
@@ -72,7 +72,11 @@ func (j DeleteScheduledTenantsJobHandler) Run(ctx Context) error {
return errors.Wrap(err, "failed to delete tenant '%d'", tenant.ID)
}
- sendCompletionEmail(ctx, tenant, owner.Result)
+ // Only the owner-initiated flow sets a cancel key, so its absence marks an administrative
+ // deletion (e.g. spam removal from Fider Manage) — those owners get no completion email.
+ if tenant.DeletionCancelKey != "" {
+ sendCompletionEmail(ctx, tenant, owner.Result)
+ }
return nil
}
diff --git a/app/models/entity/tenant.go b/app/models/entity/tenant.go
index f4ca69a03..0fe782273 100644
--- a/app/models/entity/tenant.go
+++ b/app/models/entity/tenant.go
@@ -31,6 +31,10 @@ type Tenant struct {
// site. The tenant stays active during the grace window; a background job performs the
// hard delete once this time passes. Not exposed to clients.
ScheduledDeletionAt *time.Time `json:"-"`
+ // DeletionCancelKey authorises the emailed cancel link, so it is only ever set when the
+ // deletion was requested by the account owner. An administrative deletion leaves it empty,
+ // which is how the deletion job tells the two apart. Not exposed to clients.
+ DeletionCancelKey string `json:"-"`
}
func (t *Tenant) IsDisabled() bool {
diff --git a/app/services/sqlstore/dbEntities/tenant.go b/app/services/sqlstore/dbEntities/tenant.go
index cee834994..2fdb49b37 100644
--- a/app/services/sqlstore/dbEntities/tenant.go
+++ b/app/services/sqlstore/dbEntities/tenant.go
@@ -1,6 +1,8 @@
package dbEntities
import (
+ "database/sql"
+
"github.com/getfider/fider/app/models/entity"
"github.com/getfider/fider/app/models/enum"
"github.com/getfider/fider/app/pkg/dbx"
@@ -28,7 +30,8 @@ type Tenant struct {
IsModerationEnabled bool `db:"is_moderation_enabled"`
IsPro bool `db:"is_pro"`
HasPaddleSubscription bool `db:"has_paddle_subscription"`
- ScheduledDeletionAt dbx.NullTime `db:"scheduled_deletion_at"`
+ ScheduledDeletionAt dbx.NullTime `db:"scheduled_deletion_at"`
+ DeletionCancelKey sql.NullString `db:"deletion_cancel_key"`
}
func (t *Tenant) ToModel() *entity.Tenant {
@@ -69,5 +72,9 @@ func (t *Tenant) ToModel() *entity.Tenant {
tenant.ScheduledDeletionAt = &t.ScheduledDeletionAt.Time
}
+ if t.DeletionCancelKey.Valid {
+ tenant.DeletionCancelKey = t.DeletionCancelKey.String
+ }
+
return tenant
}
diff --git a/app/services/sqlstore/postgres/tenant_deletion.go b/app/services/sqlstore/postgres/tenant_deletion.go
index ffeac9784..479056de1 100644
--- a/app/services/sqlstore/postgres/tenant_deletion.go
+++ b/app/services/sqlstore/postgres/tenant_deletion.go
@@ -46,7 +46,7 @@ func getTenantsPendingDeletion(ctx context.Context, q *query.GetTenantsPendingDe
q.Result = []*entity.Tenant{}
var tenants []*dbEntities.Tenant
err := trx.Select(&tenants, `
- SELECT id, name, subdomain, scheduled_deletion_at
+ SELECT id, name, subdomain, scheduled_deletion_at, deletion_cancel_key
FROM tenants
WHERE scheduled_deletion_at IS NOT NULL AND scheduled_deletion_at <= now()
ORDER BY scheduled_deletion_at ASC
@@ -65,7 +65,7 @@ func getTenantByCancelKey(ctx context.Context, q *query.GetTenantByCancelKey) er
return using(ctx, func(trx *dbx.Trx, _ *entity.Tenant, _ *entity.User) error {
tenant := dbEntities.Tenant{}
err := trx.Get(&tenant, `
- SELECT id, name, subdomain, scheduled_deletion_at
+ SELECT id, name, subdomain, scheduled_deletion_at, deletion_cancel_key
FROM tenants
WHERE deletion_cancel_key = $1
`, q.Key)
diff --git a/app/services/sqlstore/postgres/tenant_deletion_test.go b/app/services/sqlstore/postgres/tenant_deletion_test.go
index c1f9251d6..1fd12b624 100644
--- a/app/services/sqlstore/postgres/tenant_deletion_test.go
+++ b/app/services/sqlstore/postgres/tenant_deletion_test.go
@@ -138,9 +138,39 @@ func TestTenantDeletion_PendingDeletionAndOwner(t *testing.T) {
Expect(bus.Dispatch(ctx, pending)).IsNil()
ids := map[int]bool{}
+ cancelKeys := map[int]string{}
for _, tn := range pending.Result {
ids[tn.ID] = true
+ cancelKeys[tn.ID] = tn.DeletionCancelKey
}
Expect(ids[demoTenant.ID]).IsTrue()
Expect(ids[avengersTenant.ID]).IsFalse()
+
+ // The cancel key must survive the round-trip: the deletion job uses its presence to tell an
+ // owner-requested deletion from an administrative one, and only emails the owner for the
+ // former. If this came back empty, every completion email would silently stop being sent.
+ Expect(cancelKeys[demoTenant.ID]).Equals("past-key")
+}
+
+// An administrative deletion (e.g. spam removal via Fider Manage) writes no cancel key, which is
+// how the deletion job knows to skip the "your account was deleted" email.
+func TestTenantDeletion_AdminScheduledHasNoCancelKey(t *testing.T) {
+ ctx := SetupDatabaseTest(t)
+ defer TeardownDatabaseTest()
+
+ Expect(bus.Dispatch(ctx, &cmd.ScheduleTenantDeletion{
+ TenantID: demoTenant.ID, ScheduledAt: time.Now().Add(-time.Minute),
+ })).IsNil()
+
+ pending := &query.GetTenantsPendingDeletion{}
+ Expect(bus.Dispatch(ctx, pending)).IsNil()
+
+ var found *entity.Tenant
+ for _, tn := range pending.Result {
+ if tn.ID == demoTenant.ID {
+ found = tn
+ }
+ }
+ Expect(found).IsNotNil()
+ Expect(found.DeletionCancelKey).Equals("")
}