Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.
Go email-relayemail-routinghttp-to-smtpmail-deliverymailchimp-alternativemailgun-alternativemailsendermailservermailtemplatemailtestpostmark-alternativesend-emailsendgrid-alternativesendmailtransactional-emailtransactional-outbox
chore: fix user account deletion change admin DeleteUser to schedule deletion instead of immediate delete and to cancel user account deletion
Jonas Kaninda904ecb0ebb07
diff --git a/internal/handlers/admin_handler.go b/internal/handlers/admin_handler.goindex 31bdd88..585cb65 100644--- a/internal/handlers/admin_handler.go+++ b/internal/handlers/admin_handler.go@@ -206,29 +206,69 @@ func (h *AdminHandler) UpdateUser(c *okapi.Context, req *AdminUpdateUserRequest)return ok(c, user)}-// DeleteUser deletes a user (admin only).+// DeleteUser schedules a user for deletion (admin only).func (h *AdminHandler) DeleteUser(c *okapi.Context, req *AdminDeleteUserRequest) error {currentUserID := c.GetInt("user_id")if req.ID == currentUserID {return c.AbortBadRequest("cannot delete your own account")}- _, err := h.userRepo.FindByID(uint(req.ID))+ user, err := h.userRepo.FindByID(uint(req.ID))if err != nil {return c.AbortNotFound("user not found")}- if err := h.userRepo.DeleteAllUserData(uint(req.ID)); err != nil {- return c.AbortInternalServerError("failed to delete user")+ if user.ScheduledDeletionAt != nil {+ return c.AbortBadRequest("account deletion is already scheduled")+ }++ deletionDate := time.Now().Add(7 * 24 * time.Hour)+ user.ScheduledDeletionAt = &deletionDate+ user.Active = false++ if err := h.userRepo.Update(user); err != nil {+ return c.AbortInternalServerError("failed to schedule account deletion")+ }++ if h.bus != nil {+ adminID := uint(c.GetInt("user_id"))+ h.bus.PublishSimple(models.EventCategoryUser, "user.deletion_scheduled", &adminID, c.GetString("email"), c.RealIP(),+ fmt.Sprintf("User ID %d scheduled for deletion on %s", req.ID, deletionDate.Format("2006-01-02")),+ map[string]any{"deleted_user_id": req.ID, "scheduled_deletion_at": deletionDate})+ }++ return ok(c, map[string]any{+ "message": "Account disabled and scheduled for deletion",+ "scheduled_deletion_at": deletionDate,+ })+}++// CancelUserDeletion cancels a scheduled account deletion (admin only).+func (h *AdminHandler) CancelUserDeletion(c *okapi.Context, req *AdminDeleteUserRequest) error {+ user, err := h.userRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("user not found")+ }++ if user.ScheduledDeletionAt == nil {+ return c.AbortBadRequest("no deletion is scheduled for this account")+ }++ user.ScheduledDeletionAt = nil+ user.Active = true++ if err := h.userRepo.Update(user); err != nil {+ return c.AbortInternalServerError("failed to cancel account deletion")}if h.bus != nil {adminID := uint(c.GetInt("user_id"))- h.bus.PublishSimple(models.EventCategoryUser, "user.deleted", &adminID, c.GetString("email"), c.RealIP(),- fmt.Sprintf("User ID %d deleted", req.ID), map[string]any{"deleted_user_id": req.ID})+ h.bus.PublishSimple(models.EventCategoryUser, "user.deletion_cancelled", &adminID, c.GetString("email"), c.RealIP(),+ fmt.Sprintf("Scheduled deletion cancelled for user ID %d", req.ID),+ map[string]any{"user_id": req.ID})}- return noContent(c)+ return ok(c, map[string]any{"message": "Account deletion cancelled"})}// ListAllEmails returns all emails across all users (admin only).diff --git a/internal/routes/admin_routes.go b/internal/routes/admin_routes.goindex 5d2a9c8..0477416 100644--- a/internal/routes/admin_routes.go+++ b/internal/routes/admin_routes.go@@ -97,6 +97,19 @@ func (r *Router) adminRoutes() []okapi.RouteDefinition {okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),},},+ {+ Method: http.MethodPost,+ Path: "/users/{id:int}/cancel-deletion",+ Handler: okapi.H(r.h.admin.CancelUserDeletion),+ Group: adminGroup,+ Summary: "Cancel user deletion",+ Description: "Cancel a scheduled account deletion and re-enable the user (admin only)",+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "User ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },{Method: http.MethodDelete,Path: "/users/{id:int}/2fa",diff --git a/internal/storage/repositories/user_repo.go b/internal/storage/repositories/user_repo.goindex de06171..5337879 100644--- a/internal/storage/repositories/user_repo.go+++ b/internal/storage/repositories/user_repo.go@@ -104,6 +104,19 @@ func (r *UserRepository) DeleteAllUserData(userID uint) error {"user_settings","oauth_accounts",}++ var contactListIDs []uint+ if err := tx.Raw("SELECT id FROM contact_lists WHERE user_id = ?", userID).Scan(&contactListIDs).Error; err != nil {+ return err+ }+ if len(contactListIDs) > 0 {+ if err := tx.Exec("DELETE FROM contact_list_members WHERE list_id IN ?", contactListIDs).Error; err != nil {+ return err+ }+ }+ if err := tx.Exec("DELETE FROM contact_lists WHERE user_id = ?", userID).Error; err != nil {+ return err+ }for _, table := range tables {if err := tx.Exec("DELETE FROM "+table+" WHERE user_id = ?", userID).Error; err != nil {return errdiff --git a/web/src/api/admin.ts b/web/src/api/admin.tsindex c6ede7c..c5e5f95 100644--- a/web/src/api/admin.ts+++ b/web/src/api/admin.ts@@ -14,6 +14,9 @@ export const adminApi = {deleteUser(id: number) {return api.delete(`/admin/users/${id}`)},+ cancelUserDeletion(id: number) {+ return api.post<ApiResponse<{ message: string }>>(`/admin/users/${id}/cancel-deletion`)+ },getUserMetrics(id: number) {return api.get<ApiResponse<UserDetailMetrics>>(`/admin/users/${id}/metrics`)},diff --git a/web/src/api/types.ts b/web/src/api/types.tsindex bcbb72a..581bd64 100644--- a/web/src/api/types.ts+++ b/web/src/api/types.ts@@ -33,6 +33,8 @@ export interface User {role: 'admin' | 'user'active: booleantwo_factor_enabled: boolean+ auth_method: string+ scheduled_deletion_at: string | nullcreated_at: stringlast_login_at: string | null}diff --git a/web/src/views/admin/UserDetail.vue b/web/src/views/admin/UserDetail.vueindex 12973ae..6f306bf 100644--- a/web/src/views/admin/UserDetail.vue+++ b/web/src/views/admin/UserDetail.vue@@ -4,14 +4,18 @@ import { useRoute, useRouter } from 'vue-router'import { adminApi } from '../../api/admin'import { plansApi } from '../../api/plans'import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'import type { UserDetailMetrics, AdminWorkspace, Plan } from '../../api/types'const route = useRoute()const router = useRouter()const notification = useNotificationStore()+const { confirm } = useConfirm()const loading = ref(true)const metrics = ref<UserDetailMetrics | null>(null)const disabling2FA = ref(false)+const deleting = ref(false)+const cancellingDeletion = ref(false)const workspaces = ref<AdminWorkspace[]>([])const plans = ref<Plan[]>([])const changingPlan = ref<number | null>(null)@@ -35,7 +39,14 @@ onMounted(async () => {})async function handleDisable2FA() {- if (!metrics.value || !confirm('Are you sure you want to disable 2FA for this user?')) return+ if (!metrics.value) return+ const confirmed = await confirm({+ title: 'Disable 2FA',+ message: 'Are you sure you want to disable 2FA for this user?',+ confirmText: 'Disable 2FA',+ variant: 'danger',+ })+ if (!confirmed) returndisabling2FA.value = truetry {await adminApi.disable2FA(metrics.value.user.id)@@ -48,6 +59,45 @@ async function handleDisable2FA() {}}+async function handleDeleteUser() {+ if (!metrics.value) return+ const confirmed = await confirm({+ title: 'Delete User',+ message: `Are you sure you want to delete "${metrics.value.user.email}"? The account will be disabled immediately and permanently deleted after 7 days.`,+ confirmText: 'Delete User',+ variant: 'danger',+ })+ if (!confirmed) return+ deleting.value = true+ try {+ await adminApi.deleteUser(metrics.value.user.id)+ const res = await adminApi.getUserMetrics(metrics.value.user.id)+ metrics.value = res.data.data+ notification.success('Account disabled and scheduled for deletion.')+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to delete user'+ notification.error(message)+ } finally {+ deleting.value = false+ }+}++async function handleCancelDeletion() {+ if (!metrics.value) return+ cancellingDeletion.value = true+ try {+ await adminApi.cancelUserDeletion(metrics.value.user.id)+ metrics.value.user.scheduled_deletion_at = null+ metrics.value.user.active = true+ notification.success('Account deletion cancelled.')+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to cancel deletion'+ notification.error(message)+ } finally {+ cancellingDeletion.value = false+ }+}+async function handleChangePlan(workspace: AdminWorkspace, planId: number | null) {changingPlan.value = workspace.idtry {@@ -110,12 +160,21 @@ function formatDate(date: string) {<td style="font-weight: 600;">Role</td><td><span :class="roleBadgeClass(metrics.user.role)">{{ metrics.user.role }}</span></td></tr>+ <tr>+ <td style="font-weight: 600;">Auth Type</td>+ <td>+ <span class="badge badge-neutral">{{ metrics.user.auth_method || 'password' }}</span>+ </td>+ </tr><tr><td style="font-weight: 600;">Status</td><td><span :class="metrics.user.active ? 'badge badge-success' : 'badge badge-danger'">{{ metrics.user.active ? 'Active' : 'Disabled' }}</span>+ <span v-if="metrics.user.scheduled_deletion_at" class="badge badge-danger" style="margin-left: 8px;">+ Scheduled for deletion on {{ formatDate(metrics.user.scheduled_deletion_at) }}+ </span></td></tr><tr>@@ -144,6 +203,33 @@ function formatDate(date: string) {</tr></tbody></table>++ <div style="margin-top: 24px; padding-top: 16px; border-top: 1px solid var(--color-border);">+ <div v-if="metrics.user.scheduled_deletion_at" style="display: flex; align-items: center; gap: 12px;">+ <button+ class="btn btn-primary"+ :disabled="cancellingDeletion"+ @click="handleCancelDeletion"+ >+ {{ cancellingDeletion ? 'Cancelling...' : 'Cancel Scheduled Deletion' }}+ </button>+ <span style="color: var(--color-text-muted); font-size: 0.875rem;">+ This will re-enable the account and cancel the scheduled deletion.+ </span>+ </div>+ <div v-else style="display: flex; align-items: center; gap: 12px;">+ <button+ class="btn btn-danger"+ :disabled="deleting"+ @click="handleDeleteUser"+ >+ {{ deleting ? 'Deleting...' : 'Delete User' }}+ </button>+ <span style="color: var(--color-text-muted); font-size: 0.875rem;">+ The account will be disabled and permanently deleted after 7 days.+ </span>+ </div>+ </div></div></div>diff --git a/web/src/views/admin/Users.vue b/web/src/views/admin/Users.vueindex 6fcb68c..37b74f3 100644--- a/web/src/views/admin/Users.vue+++ b/web/src/views/admin/Users.vue@@ -124,17 +124,18 @@ async function toggleActive(user: User) {async function deleteUser(user: User) {const confirmed = await confirm({title: 'Delete User',- message: `Are you sure you want to delete "${user.email}"? This action cannot be undone. All associated data will be permanently removed.`,+ message: `Are you sure you want to delete "${user.email}"? The account will be disabled immediately and permanently deleted after 7 days.`,confirmText: 'Delete User',variant: 'danger',})if (!confirmed) returntry {await adminApi.deleteUser(user.id)- notify.success('User deleted')+ notify.success('Account disabled and scheduled for deletion.')await loadUsers()- } catch (e) {- notify.error('Failed to delete user')+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to delete user'+ notify.error(message)}}const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {