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
feat(api-keys): detail page and email attribution; fix delete with sent emails
Jonas Kanindab472cf2c7fa1
diff --git a/internal/handlers/api_key_handler.go b/internal/handlers/api_key_handler.goindex 57191c7..07c3d96 100644--- a/internal/handlers/api_key_handler.go+++ b/internal/handlers/api_key_handler.go@@ -148,6 +148,18 @@ func (h *APIKeyHandler) List(c *okapi.Context, req *ListRequest) error {return paginated(c, keys, total, page, size)}+type GetAPIKeyRequest struct {+ ID int `param:"id" doc:"API key ID"`+}++func (h *APIKeyHandler) Get(c *okapi.Context, req *GetAPIKeyRequest) error {+ key, err := h.repo.FindByIDWithCreator(uint(req.ID))+ if err != nil || !ownsResource(c, key.UserID, key.WorkspaceID) {+ return c.AbortNotFound("API key not found")+ }+ return ok(c, key)+}+func (h *APIKeyHandler) Revoke(c *okapi.Context, req *RevokeAPIKeyRequest) error {if err := requireEdit(c); err != nil {return c.AbortForbidden("Insufficient workspace permissions", err)diff --git a/internal/handlers/email_handler.go b/internal/handlers/email_handler.goindex c63c18e..d83f216 100644--- a/internal/handlers/email_handler.go+++ b/internal/handlers/email_handler.go@@ -309,11 +309,16 @@ func (h *EmailHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *EmailHandler) Get(c *okapi.Context, req *GetEmailRequest) error {- em, err := h.emailRepo.FindByUUID(req.ID)+ em, err := h.emailRepo.FindByUUIDWithAPIKey(req.ID)if err != nil || !ownsResource(c, em.UserID, em.WorkspaceID) {return c.AbortNotFound("email not found")}+ // Surface the name of the API key used to send this email (if still linked).+ if em.APIKeyID != nil {+ em.APIKeyName = em.APIKey.Name+ }+if h.redactContent() {redactEmail(em)}diff --git a/internal/models/api_key.go b/internal/models/api_key.goindex cdbd858..65913d9 100644--- a/internal/models/api_key.go+++ b/internal/models/api_key.go@@ -36,7 +36,8 @@ type APIKey struct {Revoked bool `json:"revoked" gorm:"default:false"`AllowedIPs pq.StringArray `json:"allowed_ips" gorm:"type:text[]"`- User User `json:"-" gorm:"foreignKey:UserID"`+ User User `json:"-" gorm:"foreignKey:UserID"`+ CreatedBy *ActorRef `json:"created_by,omitempty" gorm:"foreignKey:UserID;references:ID;constraint:false"`}func (k *APIKey) IsExpired() bool {diff --git a/internal/models/email.go b/internal/models/email.goindex 1699374..fb5ec86 100644--- a/internal/models/email.go+++ b/internal/models/email.go@@ -64,7 +64,9 @@ type Email struct {SMTPHostname string `json:"smtp_hostname,omitempty"`User User `json:"-" gorm:"foreignKey:UserID"`- APIKey APIKey `json:"-" gorm:"foreignKey:APIKeyID"`+ APIKey APIKey `json:"-" gorm:"foreignKey:APIKeyID;constraint:OnDelete:SET NULL"`++ APIKeyName string `json:"api_key_name,omitempty" gorm:"-"`}// Attachment represents a file attachment in an email.diff --git a/internal/routes/workspace_resource_routes.go b/internal/routes/workspace_resource_routes.goindex 755e5da..818c39a 100644--- a/internal/routes/workspace_resource_routes.go+++ b/internal/routes/workspace_resource_routes.go@@ -159,6 +159,18 @@ func (r *Router) workspaceResourceRoutes() []okapi.RouteDefinition {Request: &handlers.ListRequest{},Response: &dto.PageableResponse[models.APIKey]{},},+ {+ Method: http.MethodGet,+ Path: "/api-keys/{id}",+ Handler: okapi.H(r.h.apiKey.Get),+ Group: opsGroup,+ Summary: "Get API key",+ Request: &handlers.GetAPIKeyRequest{},+ Response: &dto.Response[models.APIKey]{},+ Options: []okapi.RouteOption{+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },{Method: http.MethodPut,Path: "/api-keys/{id:int}/revoke",diff --git a/internal/storage/migration/constraints.go b/internal/storage/migration/constraints.goindex 7d594b9..492d648 100644--- a/internal/storage/migration/constraints.go+++ b/internal/storage/migration/constraints.go@@ -46,6 +46,20 @@ func runConstraints(db *gorm.DB) {END IF;END $$`)+ db.Exec(`DO $$ BEGIN+ IF EXISTS (+ SELECT 1 FROM pg_constraint c+ JOIN pg_class t ON c.conrelid = t.oid+ WHERE t.relname = 'emails'+ AND c.conname = 'fk_emails_api_key'+ AND c.confdeltype <> 'n'+ ) THEN+ ALTER TABLE emails DROP CONSTRAINT fk_emails_api_key;+ ALTER TABLE emails ADD CONSTRAINT fk_emails_api_key+ FOREIGN KEY (api_key_id) REFERENCES api_keys(id) ON DELETE SET NULL;+ END IF;+ END $$`)+rebuildUniqueIndexes(db)// Partial unique index: at most one ownership-verified row per domain name@@ -103,10 +117,6 @@ func rebuildUniqueIndexes(db *gorm.DB) {))}- // Subscribers carry their unique index from a GORM tag (idx_sub_scope_email,- // historically on user_id, workspace_id, email). Re-scope it to workspace-only- // here so both fresh and existing databases converge. Recreated under the same- // name so AutoMigrate won't re-add the legacy definition.db.Exec(`DO $$ BEGINDROP INDEX IF EXISTS idx_sub_scope_email;CREATE UNIQUE INDEX idx_sub_scope_email ON subscribers (workspace_id, email) WHERE workspace_id IS NOT NULL;diff --git a/internal/storage/repositories/api_key_repo.go b/internal/storage/repositories/api_key_repo.goindex 7f85e92..2ddbd76 100644--- a/internal/storage/repositories/api_key_repo.go+++ b/internal/storage/repositories/api_key_repo.go@@ -97,6 +97,14 @@ func (r *APIKeyRepository) FindByID(id uint) (*models.APIKey, error) {return &key, nil}+func (r *APIKeyRepository) FindByIDWithCreator(id uint) (*models.APIKey, error) {+ var key models.APIKey+ if err := r.db.Preload("CreatedBy").First(&key, id).Error; err != nil {+ return nil, err+ }+ return &key, nil+}+func (r *APIKeyRepository) UpdateLastUsed(id uint) error {now := time.Now()return r.db.Model(&models.APIKey{}).Where("id = ?", id).Update("last_used_at", now).Errordiff --git a/internal/storage/repositories/email_repo.go b/internal/storage/repositories/email_repo.goindex f6eac3b..7142241 100644--- a/internal/storage/repositories/email_repo.go+++ b/internal/storage/repositories/email_repo.go@@ -56,6 +56,14 @@ func (r *EmailRepository) FindByUUID(uuid string) (*models.Email, error) {return &email, nil}+func (r *EmailRepository) FindByUUIDWithAPIKey(uuid string) (*models.Email, error) {+ var email models.Email+ if err := r.db.Preload("APIKey").Where("uuid = ?", uuid).First(&email).Error; err != nil {+ return nil, err+ }+ return &email, nil+}+func (r *EmailRepository) FindByUserID(userID uint, limit, offset int) ([]models.Email, int64, error) {var emails []models.Emailvar total int64diff --git a/web/src/api/apikeys.ts b/web/src/api/apikeys.tsindex 0fd32fa..e9fc2f6 100644--- a/web/src/api/apikeys.ts+++ b/web/src/api/apikeys.ts@@ -5,6 +5,9 @@ export const apiKeysApi = {list(page = 0, size = 20) {return api.get<PaginatedResponse<ApiKey>>('/workspaces/current/api-keys', { params: { page, size } })},+ get(id: number) {+ return api.get<ApiResponse<ApiKey>>(`/workspaces/current/api-keys/${id}`)+ },create(name: string, allowedIPs?: string[], expiresInDays?: number) {const body: Record<string, any> = { name }if (allowedIPs && allowedIPs.length > 0) body.allowed_ips = allowedIPsdiff --git a/web/src/api/types.ts b/web/src/api/types.tsindex 918c1e8..7f7aa66 100644--- a/web/src/api/types.ts+++ b/web/src/api/types.ts@@ -51,6 +51,7 @@ export interface Email {uuid: stringuser_id: numberapi_key_id: number+ api_key_name?: stringsmtp_hostname: string | nullsender: stringrecipients: string[]@@ -118,6 +119,7 @@ export interface ApiKey {last_used_at: string | nullrevoked: booleanallowed_ips: string[] | null+ created_by?: ActorRef | null}export interface Contact {diff --git a/web/src/router/index.ts b/web/src/router/index.tsindex 7c30f04..1faea4b 100644--- a/web/src/router/index.ts+++ b/web/src/router/index.ts@@ -55,6 +55,7 @@ const routes = [children: [{ path: '', name: 'dashboard', component: () => import('../views/dashboard/Dashboard.vue'), meta: { title: 'Dashboard' } },{ path: 'api-keys', name: 'api-keys', component: () => import('../views/apikeys/ApiKeys.vue'), meta: { title: 'API Keys' } },+ { path: 'api-keys/:id', name: 'api-key-detail', component: () => import('../views/apikeys/ApiKeyDetail.vue'), meta: { title: 'API Key' } },{ path: 'emails', name: 'emails', component: () => import('../views/emails/Emails.vue'), meta: { title: 'Emails' } },{ path: 'emails/:id', name: 'email-detail', component: () => import('../views/emails/EmailDetail.vue'), meta: { title: 'Email' } },{ path: 'inbound-emails', name: 'inbound-emails', component: () => import('../views/inbound/InboundEmails.vue'), meta: { title: 'Inbound Emails' } },diff --git a/web/src/views/apikeys/ApiKeyDetail.vue b/web/src/views/apikeys/ApiKeyDetail.vuenew file mode 100644index 0000000..74f46f3--- /dev/null+++ b/web/src/views/apikeys/ApiKeyDetail.vue@@ -0,0 +1,161 @@+<script setup lang="ts">+import { ref, computed, onMounted } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { apiKeysApi } from '../../api/apikeys'+import type { ApiKey } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'+import { useWorkspaceStore } from '../../stores/workspace'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()+const wsStore = useWorkspaceStore()+const { confirm } = useConfirm()++const loading = ref(true)+const key = ref<ApiKey | null>(null)++const keyId = Number(route.params.id)++onMounted(async () => {+ try {+ const res = await apiKeysApi.get(keyId)+ key.value = res.data.data+ } catch {+ notify.error('Failed to load API key')+ } finally {+ loading.value = false+ }+})++const status = computed<{ label: string; class: string }>(() => {+ const k = key.value+ if (!k) return { label: '', class: '' }+ if (k.revoked) return { label: 'Revoked', class: 'badge-danger' }+ if (k.expires_at && new Date(k.expires_at) < new Date()) return { label: 'Expired', class: 'badge-warning' }+ return { label: 'Active', class: 'badge-success' }+})++const isActive = computed(() => {+ const k = key.value+ return !!k && !k.revoked && !(k.expires_at && new Date(k.expires_at) < new Date())+})++const canDelete = computed(() => {+ const k = key.value+ return !!k && (k.revoked || (!!k.expires_at && new Date(k.expires_at) < new Date()))+})++function formatDate(dateStr: string | null): string {+ if (!dateStr) return 'Never'+ return new Date(dateStr).toLocaleString()+}++async function revoke() {+ if (!key.value) return+ const confirmed = await confirm({+ title: 'Revoke API Key',+ message: `Are you sure you want to revoke "${key.value.name}"? This key will immediately stop working and cannot be reactivated.`,+ confirmText: 'Revoke',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await apiKeysApi.revoke(key.value.id)+ notify.success('API key revoked')+ const res = await apiKeysApi.get(keyId)+ key.value = res.data.data+ } catch {+ notify.error('Failed to revoke API key')+ }+}++async function remove() {+ if (!key.value) return+ const confirmed = await confirm({+ title: 'Delete API Key',+ message: `Are you sure you want to permanently delete "${key.value.name}"? This action cannot be undone.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await apiKeysApi.delete(key.value.id)+ notify.success('API key deleted')+ router.push('/api-keys')+ } catch {+ notify.error('Failed to delete API key')+ }+}+</script>++<template>+ <div>+ <div class="page-header">+ <h1>{{ key?.name || 'API Key' }}</h1>+ <div style="display: flex; gap: 8px">+ <button v-if="wsStore.canEdit && isActive" class="btn btn-danger" @click="revoke">Revoke</button>+ <button v-if="wsStore.canEdit && canDelete" class="btn btn-danger" @click="remove">Delete</button>+ <button class="btn btn-secondary" @click="router.push('/api-keys')">Back to API Keys</button>+ </div>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <div v-else-if="!key" class="card">+ <div class="empty-state">+ <h3>API key not found</h3>+ <p>It may have been deleted, or belongs to another workspace.</p>+ </div>+ </div>++ <div v-else class="card">+ <div class="card-header">+ <h2>{{ key.name }}</h2>+ <span class="badge" :class="status.class">{{ status.label }}</span>+ </div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 160px">Key ID</td>+ <td><code>{{ key.id }}</code></td>+ </tr>+ <tr>+ <td style="font-weight: 600">Prefix</td>+ <td><code>{{ key.key_prefix }}…</code></td>+ </tr>+ <tr>+ <td style="font-weight: 600">Created</td>+ <td>{{ formatDate(key.created_at) }}</td>+ </tr>+ <tr v-if="key.created_by">+ <td style="font-weight: 600">Created by</td>+ <td>{{ key.created_by.name }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Last used</td>+ <td>{{ formatDate(key.last_used_at) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Expires</td>+ <td>{{ formatDate(key.expires_at) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Allowed IPs</td>+ <td>+ <template v-if="key.allowed_ips && key.allowed_ips.length > 0">+ <code v-for="(ip, i) in key.allowed_ips" :key="i" style="margin-right: 6px; font-size: 12px">{{ ip }}</code>+ </template>+ <span v-else style="color: var(--text-muted)">Any IP</span>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>+ </div>+</template>diff --git a/web/src/views/apikeys/ApiKeys.vue b/web/src/views/apikeys/ApiKeys.vueindex 9ab5a15..bd1e6a1 100644--- a/web/src/views/apikeys/ApiKeys.vue+++ b/web/src/views/apikeys/ApiKeys.vue@@ -217,7 +217,9 @@ onMounted(() => {</thead><tbody><tr v-for="key in keys" :key="key.id">- <td>{{ key.name }}</td>+ <td>+ <router-link :to="{ name: 'api-key-detail', params: { id: key.id } }">{{ key.name }}</router-link>+ </td><td><code>{{ key.key_prefix }}...</code></td><td>{{ formatDate(key.created_at) }}</td><td>{{ key.last_used_at ? formatDate(key.last_used_at) : 'Never' }}</td>diff --git a/web/src/views/emails/EmailDetail.vue b/web/src/views/emails/EmailDetail.vueindex 4b6c709..543cf3d 100644--- a/web/src/views/emails/EmailDetail.vue+++ b/web/src/views/emails/EmailDetail.vue@@ -134,6 +134,16 @@ function parseHeaders(json: string): Record<string, string> | null {<td style="font-weight: 600">Template</td><td>{{ email.template_name || 'N/A' }}</td></tr>+ <tr>+ <td style="font-weight: 600">API Key</td>+ <td>+ <template v-if="email.api_key_name">+ <router-link v-if="email.api_key_id" :to="{ name: 'api-key-detail', params: { id: email.api_key_id } }">{{ email.api_key_name }}</router-link>+ <span v-else>{{ email.api_key_name }}</span>+ </template>+ <span v-else>N/A</span>+ </td>+ </tr><tr><td style="font-weight: 600">Provider</td><td>