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: rename package from jkaninda to goposta and merge all features
Jonas Kaninda1ebd98b2e821
diff --git a/.env.example b/.env.exampleindex 5ee1029..2dd5f5f 100644--- a/.env.example+++ b/.env.example@@ -19,6 +19,8 @@ POSTA_JWT_SECRET=change-me-in-production# Store emails without sending (useful for development)POSTA_DEV_MODE=false+# Enable auth (login/register) rate limiting+POSTA_AUTH_RATE_LIMIT_ENABLED=true# Hourly email limit per userPOSTA_RATE_LIMIT_HOURLY=100# Daily email limit per user@@ -54,3 +56,11 @@ POSTA_WEBHOOK_MAX_RETRIES=3# Webhook request timeout in secondsPOSTA_WEBHOOK_TIMEOUT_SECS=10POSTA_ENV=production++# Google OAuth client ID for SSO login+# POSTA_GOOGLE_OAUTH_CLIENT_ID=your-client-id+# Google OAuth client secret for SSO login+# POSTA_GOOGLE_OAUTH_CLIENT_SECRET=your-secret+# OAuth callback base URL (optional if POSTA_WEB_URL is defined)+POSTA_OAUTH_CALLBACK_URL=https://posta.example.com+POSTA_API_URL=\ No newline at end of filediff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.ymlnew file mode 100644index 0000000..9c4eacc--- /dev/null+++ b/.github/workflows/deploy-docs.yml@@ -0,0 +1,55 @@+name: Deploy Docs++on:+ push:+ branches:+ - main+ paths:+ - "docs/**"+ workflow_dispatch:++permissions:+ contents: read+ pages: write+ id-token: write++concurrency:+ group: "pages"+ cancel-in-progress: false++jobs:+ build:+ runs-on: ubuntu-latest+ defaults:+ run:+ working-directory: docs+ steps:+ - uses: actions/checkout@v4++ - uses: actions/setup-node@v4+ with:+ node-version: 20+ cache: npm+ cache-dependency-path: docs/package-lock.json++ - name: Install dependencies+ run: npm ci++ - name: Build docs+ run: npm run build++ - name: Upload artifact+ uses: actions/upload-pages-artifact@v3+ with:+ path: docs/build++ deploy:+ environment:+ name: github-pages+ url: ${{ steps.deployment.outputs.page_url }}+ runs-on: ubuntu-latest+ needs: build+ steps:+ - name: Deploy to GitHub Pages+ id: deployment+ uses: actions/deploy-pages@v4diff --git a/Makefile b/Makefileindex 834f835..db815e5 100644--- a/Makefile+++ b/Makefile@@ -5,7 +5,7 @@ BUILD_DIR := binUI_DIR := webVERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")COMMIT ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")-LDFLAGS := -X github.com/jkaninda/posta/internal/config.Version=$(VERSION) -X github.com/jkaninda/posta/internal/config.CommitID=$(COMMIT)+LDFLAGS := -X github.com/goposta/posta/internal/config.Version=$(VERSION) -X github.com/goposta/posta/internal/config.CommitID=$(COMMIT)build:go build -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY) ./cmd/postadiff --git a/Posta Observability Dashboard.json b/Posta Observability Dashboard.jsonnew file mode 100644index 0000000..e1fa51e--- /dev/null+++ b/Posta Observability Dashboard.json@@ -0,0 +1,1108 @@+{+ "__inputs": [+ {+ "name": "DS_PROMETHEUS",+ "label": "Prometheus",+ "description": "",+ "type": "datasource",+ "pluginId": "prometheus",+ "pluginName": "Prometheus"+ }+ ],+ "__elements": {},+ "__requires": [+ {+ "type": "panel",+ "id": "gauge",+ "name": "Gauge",+ "version": ""+ },+ {+ "type": "grafana",+ "id": "grafana",+ "name": "Grafana",+ "version": "12.1.0"+ },+ {+ "type": "datasource",+ "id": "prometheus",+ "name": "Prometheus",+ "version": "1.0.0"+ },+ {+ "type": "panel",+ "id": "stat",+ "name": "Stat",+ "version": ""+ },+ {+ "type": "panel",+ "id": "timeseries",+ "name": "Time series",+ "version": ""+ }+ ],+ "annotations": {+ "list": [+ {+ "builtIn": 1,+ "datasource": {+ "type": "grafana",+ "uid": "-- Grafana --"+ },+ "enable": true,+ "hide": true,+ "iconColor": "rgba(0, 211, 255, 1)",+ "name": "Annotations & Alerts",+ "type": "dashboard"+ }+ ]+ },+ "description": "Visualize Posta email delivery platform metrics",+ "editable": true,+ "fiscalYearStartMonth": 0,+ "graphTooltip": 0,+ "id": null,+ "links": [],+ "panels": [+ {+ "collapsed": false,+ "gridPos": { "h": 1, "w": 24, "x": 0, "y": 0 },+ "id": 100,+ "panels": [],+ "title": "Email Delivery",+ "type": "row"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Total emails successfully sent",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "green", "value": 0 },+ { "color": "dark-green", "value": 1000 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 0, "y": 1 },+ "id": 1,+ "options": {+ "colorMode": "value",+ "graphMode": "area",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_emails_sent_total{instance=~\"$instance\"})",+ "legendFormat": "Emails Sent",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Emails Sent",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Total emails that failed to send",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "green", "value": 0 },+ { "color": "dark-orange", "value": 10 },+ { "color": "dark-red", "value": 100 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 6, "y": 1 },+ "id": 2,+ "options": {+ "colorMode": "value",+ "graphMode": "area",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_emails_failed_total{instance=~\"$instance\"})",+ "legendFormat": "Emails Failed",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Emails Failed",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Total emails enqueued for delivery",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "blue", "value": 0 },+ { "color": "dark-blue", "value": 1000 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 12, "y": 1 },+ "id": 3,+ "options": {+ "colorMode": "value",+ "graphMode": "area",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_emails_queued_total{instance=~\"$instance\"})",+ "legendFormat": "Emails Queued",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Emails Queued",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Total email retry attempts",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "dark-yellow", "value": 0 },+ { "color": "dark-orange", "value": 50 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 18, "y": 1 },+ "id": 4,+ "options": {+ "colorMode": "value",+ "graphMode": "area",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_email_retries_total{instance=~\"$instance\"})",+ "legendFormat": "Email Retries",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Email Retries",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Email delivery success rate",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "dark-red", "value": 0 },+ { "color": "dark-orange", "value": 90 },+ { "color": "semi-dark-green", "value": 98 }+ ]+ },+ "unit": "percent"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 6, "x": 0, "y": 5 },+ "id": 5,+ "options": {+ "minVizHeight": 75,+ "minVizWidth": 75,+ "orientation": "auto",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showThresholdLabels": false,+ "showThresholdMarkers": true,+ "sizing": "auto"+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_emails_sent_total{instance=~\"$instance\"}) / (sum(posta_emails_sent_total{instance=~\"$instance\"}) + sum(posta_emails_failed_total{instance=~\"$instance\"})) * 100",+ "legendFormat": "Delivery Rate",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Delivery Rate",+ "type": "gauge"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Webhook delivery success vs failure",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "green", "value": 0 },+ { "color": "dark-green", "value": 100 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 6, "y": 5 },+ "id": 6,+ "options": {+ "colorMode": "value",+ "graphMode": "none",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_webhook_deliveries_total{instance=~\"$instance\",status=\"success\"})",+ "legendFormat": "Webhook Success",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Webhook Deliveries (Success)",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Failed webhook delivery attempts",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "dark-orange", "value": 0 },+ { "color": "dark-red", "value": 50 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 6, "y": 9 },+ "id": 7,+ "options": {+ "colorMode": "value",+ "graphMode": "none",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_webhook_deliveries_total{instance=~\"$instance\",status=\"failed\"})",+ "legendFormat": "Webhook Failed",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Webhook Deliveries (Failed)",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Bounces by type",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "dark-red", "value": 0 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 12, "y": 5 },+ "id": 8,+ "options": {+ "colorMode": "value",+ "graphMode": "none",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_bounces_total{instance=~\"$instance\"}) by (type)",+ "legendFormat": "{{type}}",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Bounces by Type",+ "type": "stat"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Total email suppressions",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "decimals": 0,+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "dark-purple", "value": 0 }+ ]+ },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 4, "w": 6, "x": 18, "y": 5 },+ "id": 9,+ "options": {+ "colorMode": "value",+ "graphMode": "area",+ "justifyMode": "auto",+ "orientation": "auto",+ "percentChangeColorMode": "standard",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showPercentChange": false,+ "textMode": "auto",+ "wideLayout": true+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(posta_suppressions_total{instance=~\"$instance\"})",+ "legendFormat": "Suppressions",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Suppressions",+ "type": "stat"+ },+ {+ "collapsed": false,+ "gridPos": { "h": 1, "w": 24, "x": 0, "y": 13 },+ "id": 200,+ "panels": [],+ "title": "Email Throughput & Trends",+ "type": "row"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Email send/fail rate over time",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }] },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 10, "w": 24, "x": 0, "y": 14 },+ "id": 10,+ "options": {+ "legend": { "calcs": ["mean", "lastNotNull", "max"], "displayMode": "table", "placement": "right", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(posta_emails_sent_total{instance=~\"$instance\"}[5m])",+ "legendFormat": "Sent/s",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(posta_emails_failed_total{instance=~\"$instance\"}[5m])",+ "legendFormat": "Failed/s",+ "range": true,+ "refId": "B"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(posta_emails_queued_total{instance=~\"$instance\"}[5m])",+ "legendFormat": "Queued/s",+ "range": true,+ "refId": "C"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(posta_email_retries_total{instance=~\"$instance\"}[5m])",+ "legendFormat": "Retries/s",+ "range": true,+ "refId": "D"+ }+ ],+ "title": "Email Throughput Rate",+ "type": "timeseries"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Webhook delivery rate and duration",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }] },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 12, "x": 0, "y": 24 },+ "id": 11,+ "options": {+ "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", "showLegend": true },+ "tooltip": { "hideZeros": false, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(posta_webhook_deliveries_total{instance=~\"$instance\",status=\"success\"}[5m])",+ "legendFormat": "Success/s",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(posta_webhook_deliveries_total{instance=~\"$instance\",status=\"failed\"}[5m])",+ "legendFormat": "Failed/s",+ "range": true,+ "refId": "B"+ }+ ],+ "title": "Webhook Delivery Rate",+ "type": "timeseries"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Webhook delivery latency percentiles",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }] },+ "unit": "s"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 12, "x": 12, "y": 24 },+ "id": 12,+ "options": {+ "legend": { "calcs": ["mean", "lastNotNull"], "displayMode": "table", "placement": "bottom", "showLegend": true },+ "tooltip": { "hideZeros": false, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "histogram_quantile(0.50, sum(rate(posta_webhook_delivery_duration_seconds_bucket{instance=~\"$instance\"}[5m])) by (le))",+ "legendFormat": "p50",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "histogram_quantile(0.95, sum(rate(posta_webhook_delivery_duration_seconds_bucket{instance=~\"$instance\"}[5m])) by (le))",+ "legendFormat": "p95",+ "range": true,+ "refId": "B"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "histogram_quantile(0.99, sum(rate(posta_webhook_delivery_duration_seconds_bucket{instance=~\"$instance\"}[5m])) by (le))",+ "legendFormat": "p99",+ "range": true,+ "refId": "C"+ }+ ],+ "title": "Webhook Delivery Latency (p50 / p95 / p99)",+ "type": "timeseries"+ },+ {+ "collapsed": false,+ "gridPos": { "h": 1, "w": 24, "x": 0, "y": 32 },+ "id": 300,+ "panels": [],+ "title": "HTTP API & Performance",+ "type": "row"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "Total HTTP requests by status code",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 0, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "auto", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }] },+ "unit": "reqps"+ },+ "overrides": []+ },+ "gridPos": { "h": 10, "w": 24, "x": 0, "y": 33 },+ "id": 13,+ "options": {+ "legend": { "calcs": ["mean", "lastNotNull", "max"], "displayMode": "table", "placement": "right", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(rate(posta_http_requests_total{instance=~\"$instance\"}[5m])) by (status)",+ "legendFormat": "HTTP {{status}}",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "HTTP Request Rate by Status Code",+ "type": "timeseries"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "description": "HTTP request latency by endpoint",+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }] },+ "unit": "s"+ },+ "overrides": []+ },+ "gridPos": { "h": 10, "w": 24, "x": 0, "y": 43 },+ "id": 14,+ "options": {+ "legend": { "calcs": ["mean", "lastNotNull"], "displayMode": "table", "placement": "right", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "histogram_quantile(0.50, sum(rate(posta_http_request_duration_seconds_bucket{instance=~\"$instance\"}[5m])) by (le, path))",+ "legendFormat": "{{path}} (p50)",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "histogram_quantile(0.95, sum(rate(posta_http_request_duration_seconds_bucket{instance=~\"$instance\"}[5m])) by (le, path))",+ "legendFormat": "{{path}} (p95)",+ "range": true,+ "refId": "B"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "histogram_quantile(0.99, sum(rate(posta_http_request_duration_seconds_bucket{instance=~\"$instance\"}[5m])) by (le, path))",+ "legendFormat": "{{path}} (p99)",+ "range": true,+ "refId": "C"+ }+ ],+ "title": "API Request Latency Percentiles by Endpoint (p50 / p95 / p99)",+ "type": "timeseries"+ },+ {+ "collapsed": false,+ "gridPos": { "h": 1, "w": 24, "x": 0, "y": 53 },+ "id": 400,+ "panels": [],+ "title": "Go Runtime",+ "type": "row"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "green", "value": 0 },+ { "color": "orange", "value": 500000000 },+ { "color": "semi-dark-red", "value": 1500000000 }+ ]+ },+ "unit": "decbytes"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 6, "x": 0, "y": 54 },+ "id": 15,+ "options": {+ "minVizHeight": 75, "minVizWidth": 75, "orientation": "auto",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showThresholdLabels": false, "showThresholdMarkers": true, "sizing": "auto"+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "sum(go_memstats_heap_inuse_bytes{instance=~\"$instance\"})",+ "legendFormat": "{{job}}",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "Heap In Use",+ "type": "gauge"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "thresholds" },+ "mappings": [],+ "thresholds": {+ "mode": "absolute",+ "steps": [+ { "color": "semi-dark-green", "value": 0 },+ { "color": "semi-dark-orange", "value": 50 },+ { "color": "dark-red", "value": 75 }+ ]+ },+ "unit": "percent"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 6, "x": 6, "y": 54 },+ "id": 16,+ "options": {+ "minVizHeight": 75, "minVizWidth": 75, "orientation": "auto",+ "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },+ "showThresholdLabels": false, "showThresholdMarkers": true, "sizing": "auto"+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(process_cpu_seconds_total{instance=~\"$instance\"}[5m]) * 100",+ "legendFormat": "{{job}}",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "CPU Usage",+ "type": "gauge"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }, { "color": "red", "value": 80 }] },+ "unit": "bytes"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 12, "x": 0, "y": 62 },+ "id": 17,+ "options": {+ "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_memstats_heap_alloc_bytes{instance=~\"$instance\"}",+ "legendFormat": "Heap Allocated",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_memstats_heap_inuse_bytes{instance=~\"$instance\"}",+ "legendFormat": "Heap In Use",+ "range": true,+ "refId": "B"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_memstats_heap_idle_bytes{instance=~\"$instance\"}",+ "legendFormat": "Heap Idle",+ "range": true,+ "refId": "C"+ }+ ],+ "title": "Go Heap Memory Usage",+ "type": "timeseries"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }, { "color": "red", "value": 80 }] },+ "unit": "short"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 12, "x": 12, "y": 62 },+ "id": 18,+ "options": {+ "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_goroutines{instance=~\"$instance\"}",+ "legendFormat": "Goroutines",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_threads{instance=~\"$instance\"}",+ "legendFormat": "OS Threads",+ "range": true,+ "refId": "B"+ }+ ],+ "title": "Go Goroutine & Thread Count",+ "type": "timeseries"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }, { "color": "red", "value": 75 }] },+ "unit": "percent"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 12, "x": 0, "y": 70 },+ "id": 19,+ "options": {+ "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(process_cpu_seconds_total{instance=~\"$instance\"}[$__rate_interval]) * 100",+ "legendFormat": "CPU Usage",+ "range": true,+ "refId": "A"+ }+ ],+ "title": "CPU Usage (%)",+ "type": "timeseries"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "fieldConfig": {+ "defaults": {+ "color": { "mode": "palette-classic" },+ "custom": {+ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text",+ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, "barWidthFactor": 0.6,+ "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none",+ "hideFrom": { "legend": false, "tooltip": false, "viz": false },+ "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5,+ "scaleDistribution": { "type": "linear" }, "showPoints": "never", "spanNulls": false,+ "stacking": { "group": "A", "mode": "none" },+ "thresholdsStyle": { "mode": "off" }+ },+ "mappings": [],+ "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": 0 }, { "color": "red", "value": 80 }] },+ "unit": "s"+ },+ "overrides": []+ },+ "gridPos": { "h": 8, "w": 12, "x": 12, "y": 70 },+ "id": 20,+ "options": {+ "legend": { "calcs": [], "displayMode": "list", "placement": "bottom", "showLegend": true },+ "tooltip": { "hideZeros": false, "maxHeight": 600, "mode": "multi", "sort": "none" }+ },+ "pluginVersion": "12.1.0",+ "targets": [+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_gc_duration_seconds{instance=~\"$instance\",quantile=\"0.5\"}",+ "legendFormat": "GC p50",+ "range": true,+ "refId": "A"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "go_gc_duration_seconds{instance=~\"$instance\",quantile=\"0.95\"}",+ "legendFormat": "GC p95",+ "range": true,+ "refId": "B"+ },+ {+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "editorMode": "code",+ "expr": "rate(go_gc_duration_seconds_count{instance=~\"$instance\"}[5m])",+ "legendFormat": "GC Frequency",+ "range": true,+ "refId": "C"+ }+ ],+ "title": "Go GC Pause Duration",+ "type": "timeseries"+ }+ ],+ "refresh": "30s",+ "schemaVersion": 41,+ "tags": [+ "posta",+ "email",+ "go",+ "smtp"+ ],+ "templating": {+ "list": [+ {+ "current": {},+ "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" },+ "definition": "label_values(posta_emails_sent_total,instance)",+ "includeAll": true,+ "multi": true,+ "name": "instance",+ "options": [],+ "query": {+ "qryType": 1,+ "query": "label_values(posta_emails_sent_total,instance)",+ "refId": "PrometheusVariableQueryEditor-VariableQuery"+ },+ "refresh": 1,+ "regex": "",+ "sort": 1,+ "type": "query"+ }+ ]+ },+ "time": {+ "from": "now-1h",+ "to": "now"+ },+ "timepicker": {},+ "timezone": "",+ "title": "Posta Observability Dashboard",+ "uid": "posta-observability",+ "version": 1,+ "weekStart": ""+}diff --git a/README.md b/README.mdindex 2f1c8c9..6d5c24e 100644--- a/README.md+++ b/README.md@@ -1,17 +1,16 @@# Posta<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/logo.png" alt="Posta" width="150" />+ <img src="https://raw.githubusercontent.com/goposta/posta/main/logo.png" alt="Posta" width="150" /></p>-[](https://github.com/jkaninda/posta/actions/workflows/ci.yml)-[](https://goreportcard.com/report/github.com/jkaninda/posta)-[](https://go.dev/)-[](https://pkg.go.dev/github.com/jkaninda/posta)-[](https://github.com/jkaninda/posta/releases)---+[](https://github.com/goposta/posta/actions/workflows/ci.yml)+[](https://goreportcard.com/report/github.com/goposta/posta)+[](https://go.dev/)+[](https://pkg.go.dev/github.com/goposta/posta)+[](https://github.com/goposta/posta/releases)++**Posta** is a self-hosted email delivery platform that allows applications to send emails through HTTP APIs while Posta manages SMTP delivery, templates, storage, security, and analytics.@@ -155,6 +154,28 @@ Response:---+## Workspaces++* **Multi-Workspace Isolation**+ Create workspaces to share resources with your team. Each workspace acts as an isolated environment — like GitHub Organizations.++* **Role-Based Access Control**+ Four roles: Owner, Admin, Editor, and Viewer. Control who can create resources, manage members, or view data.++* **Member Invitations**+ Invite users by email with a specific role. Invitees can accept or decline directly from the dashboard.++* **Workspace Switcher**+ Switch between your personal space and workspaces from the sidebar. All resources, analytics, and stats are scoped to the active context.++* **Data Transfer**+ Transfer personal resources (templates, contacts, SMTP servers, API keys, etc.) into a workspace.++* **Workspace-Scoped API Keys**+ API keys created in a workspace context are automatically scoped to that workspace.++---+## Events and Webhooks* **Webhooks**@@ -298,7 +319,7 @@ Response:## Local Development```bash-git clone https://github.com/jkaninda/posta.git+git clone https://github.com/goposta/posta.gitcd postamake dev-deps@@ -340,45 +361,63 @@ Password: admin1234Posta includes a web dashboard for managing templates, SMTP servers, domains, contacts, API keys, and analytics.<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/docs/screenshots/dashboard.png" alt="Posta Dashboard" width="900"/>+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/dashboard.png" alt="Posta Dashboard" width="900"/></p>### Email Analytics<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/docs/screenshots/analytics.png" alt="Email Analytics" width="900"/>+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/analytics.png" alt="Email Analytics" width="900"/>+</p>++### Email Logs++<p align="center">+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/email-logs.png" alt="Email Logs" width="900"/>+</p>++### Email Detail++<p align="center">+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/email-detail.png" alt="Email Detail" width="900"/></p>### Template Detail<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/docs/screenshots/template-detail.png" alt="Template Detail" width="900"/>+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/template-detail.png" alt="Template Detail" width="900"/></p>### Template Editor<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/docs/screenshots/template-editor.png" alt="Template Editor" width="900"/>+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/template-preview.png" alt="Template Preview" width="900"/></p>### Admin Platform Metrics<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/docs/screenshots/admin-platform-metrics.png" alt="Admin Platform Metrics" width="900"/>+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/admin-platform-metrics.png" alt="Admin Platform Metrics" width="900"/></p>### Admin Platform Metrics (Dark)<p align="center">- <img src="https://raw.githubusercontent.com/jkaninda/posta/main/docs/screenshots/admin-platform-metrics-dark.png" alt="Admin Platform Metrics Dark" width="900"/>+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/admin-metrics-light.png" alt="Admin Metrics Light" width="900"/>+</p>++### Admin Metrics (Dark)++<p align="center">+ <img src="https://raw.githubusercontent.com/goposta/posta/main/docs/screenshots/admin-metrics-dark.png" alt="Admin Metrics Dark" width="900"/></p>---## Official Clients-- Go: https://github.com/jkaninda/posta-go-- Php: https://github.com/jkaninda/posta-php-- Java: https://github.com/jkaninda/posta-java+- Go: https://github.com/goposta/posta-go+- Php: https://github.com/goposta/posta-php+- Java: https://github.com/goposta/posta-java### Go Client SDK@@ -388,7 +427,7 @@ An official Go client is available:Install:```bash-go get github.com/jkaninda/posta-go+go get github.com/goposta/posta-go```Example:@@ -400,7 +439,7 @@ import ("fmt""log"- posta "github.com/jkaninda/posta-go"+ posta "github.com/goposta/posta-go")func main() {diff --git a/cmd/posta/server.go b/cmd/posta/server.goindex 34256e1..02d6fbd 100644--- a/cmd/posta/server.go+++ b/cmd/posta/server.go@@ -24,19 +24,21 @@ import ("github.com/hibiken/asynq""github.com/jkaninda/logger""github.com/jkaninda/okapi/okapicli"- "github.com/jkaninda/posta/internal/config"- cronpkg "github.com/jkaninda/posta/internal/cron"- "github.com/jkaninda/posta/internal/cron/jobs"- "github.com/jkaninda/posta/internal/metrics"- "github.com/jkaninda/posta/internal/routes"- "github.com/jkaninda/posta/internal/services/retry"- "github.com/jkaninda/posta/internal/services/seeder"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/services/webhook"- "github.com/jkaninda/posta/internal/storage"- "github.com/jkaninda/posta/internal/storage/migration"- "github.com/jkaninda/posta/internal/storage/repositories"- "github.com/jkaninda/posta/internal/worker"+ "github.com/goposta/posta/internal/config"+ cronpkg "github.com/goposta/posta/internal/cron"+ "github.com/goposta/posta/internal/cron/jobs"+ "github.com/goposta/posta/internal/metrics"+ "github.com/goposta/posta/internal/routes"+ "github.com/goposta/posta/internal/services/retry"+ "github.com/goposta/posta/internal/services/seeder"+ "github.com/goposta/posta/internal/services/tracking"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/services/webhook"+ "github.com/goposta/posta/internal/storage"+ "github.com/goposta/posta/internal/storage/blob"+ "github.com/goposta/posta/internal/storage/migration"+ "github.com/goposta/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/worker""github.com/redis/go-redis/v9""gorm.io/gorm")@@ -44,6 +46,7 @@ import (type serverResources struct {producer *worker.ProducercronManager *cronpkg.Manager+ blobStore blob.Storedb *gorm.DBredis *redis.Client}@@ -72,16 +75,36 @@ func runServer(cli *okapicli.CLI) {seedDefaults(res.db, cfg.AdminEmail)+ // Initialize blob storage (S3 or filesystem) for attachments+ if cfg.BlobProvider != "" {+ bs, err := blob.New(blob.Config{+ Provider: cfg.BlobProvider,+ S3Endpoint: cfg.BlobS3Endpoint,+ S3Region: cfg.BlobS3Region,+ S3Bucket: cfg.BlobS3Bucket,+ S3AccessKeyID: cfg.BlobS3AccessKey,+ S3SecretAccessKey: cfg.BlobS3SecretKey,+ S3UseSSL: cfg.BlobS3UseSSL,+ S3ForcePathStyle: cfg.BlobS3PathStyle,+ FSBasePath: cfg.BlobFSPath,+ })+ if err != nil {+ logger.Fatal("failed to initialize blob storage", "error", err)+ }+ res.blobStore = bs+ logger.Info("blob storage initialized", "provider", cfg.BlobProvider)+ }+if cfg.EmbeddedWorker && !cfg.DevMode {res.producer = worker.NewProducer(cfg.Redis.Addr, cfg.Redis.Password, cfg.WorkerMaxRetries)- startEmbeddedWorker(res.db, cfg)+ startEmbeddedWorker(res.db, cfg, res.blobStore)}if !cfg.DevMode {res.cronManager = initCronManager(res.db, cfg)}- routes.InitRoutes(app, res.db, res.redis, cfg, res.producer, res.cronManager, context.Background())+ routes.InitRoutes(app, res.db, res.redis, cfg, res.producer, res.cronManager, res.blobStore, context.Background())if res.cronManager != nil {res.cronManager.Start(context.Background())@@ -137,7 +160,7 @@ func newWebhookDispatcher(db *gorm.DB, cfg *config.Config) *webhook.Dispatcher {}// startEmbeddedWorker starts an in-process asynq worker for email delivery.-func startEmbeddedWorker(db *gorm.DB, cfg *config.Config) {+func startEmbeddedWorker(db *gorm.DB, cfg *config.Config, blobStore blob.Store) {dispatcher := newWebhookDispatcher(db, cfg)handler := worker.NewEmailSendHandler(@@ -148,6 +171,9 @@ func startEmbeddedWorker(db *gorm.DB, cfg *config.Config) {repositories.NewContactRepository(db),dispatcher,)+ if blobStore != nil {+ handler.SetBlobStore(blobStore)+ }handler.OnSent(metrics.IncrementEmailSent)handler.OnFailed(metrics.IncrementEmailFailed)@@ -168,8 +194,29 @@ func startEmbeddedWorker(db *gorm.DB, cfg *config.Config) {},)+ // Campaign processor+ campaignProducer := worker.NewProducer(cfg.Redis.Addr, cfg.Redis.Password, cfg.WorkerMaxRetries)+ trackingRepo := repositories.NewTrackingRepository(db)+ trackingService := tracking.NewService(trackingRepo, cfg.AppWebURL, []byte(cfg.JWTSecret))+ campaignDispatcher := newWebhookDispatcher(db, cfg)+ campaignProcessor := worker.NewCampaignProcessor(+ repositories.NewCampaignRepository(db),+ repositories.NewCampaignMessageRepository(db),+ repositories.NewSubscriberListRepository(db),+ repositories.NewSubscriberRepository(db),+ repositories.NewEmailRepository(db),+ repositories.NewTemplateRepository(db),+ repositories.NewTemplateVersionRepository(db),+ repositories.NewTemplateLocalizationRepository(db),+ trackingService,+ campaignProducer,+ campaignDispatcher,+ )+mux := asynq.NewServeMux()mux.HandleFunc(worker.TypeEmailSend, handler.ProcessTask)+ mux.HandleFunc(worker.TypeCampaignStart, campaignProcessor.HandleCampaignStart)+ mux.HandleFunc(worker.TypeCampaignBatch, campaignProcessor.HandleCampaignBatch)go func() {if err := srv.Run(mux); err != nil {@@ -193,9 +240,11 @@ func initCronManager(db *gorm.DB, cfg *config.Config) *cronpkg.Manager {repositories.NewEmailRepository(db),repositories.NewEventRepository(db),repositories.NewWebhookDeliveryRepository(db),+ repositories.NewTrackingRepository(db),settingsProvider,))manager.Register(jobs.NewDailyReportJob(repositories.NewUserSettingRepository(db)))+ manager.Register(jobs.NewAccountCleanupJob(repositories.NewUserRepository(db)))return manager}@@ -248,5 +297,6 @@ func webhookConfig(cfg *config.Config) webhook.Config {return webhook.Config{MaxRetries: cfg.WebhookMaxRetries,Timeout: time.Duration(cfg.WebhookTimeoutSecs) * time.Second,+ ProxyURL: cfg.WebhookProxyURL,}}diff --git a/cmd/posta/worker.go b/cmd/posta/worker.goindex 90c1c42..f9f1202 100644--- a/cmd/posta/worker.go+++ b/cmd/posta/worker.go@@ -20,10 +20,12 @@ package mainimport ("github.com/hibiken/asynq""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/config"- "github.com/jkaninda/posta/internal/metrics"- "github.com/jkaninda/posta/internal/storage/repositories"- "github.com/jkaninda/posta/internal/worker"+ "github.com/goposta/posta/internal/config"+ "github.com/goposta/posta/internal/metrics"+ "github.com/goposta/posta/internal/services/tracking"+ "github.com/goposta/posta/internal/storage/blob"+ "github.com/goposta/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/worker")func runWorker() error {@@ -38,6 +40,27 @@ func runWorker() error {}}()+ // Initialize blob storage for attachment retrieval+ var blobStore blob.Store+ if cfg.BlobProvider != "" {+ bs, err := blob.New(blob.Config{+ Provider: cfg.BlobProvider,+ S3Endpoint: cfg.BlobS3Endpoint,+ S3Region: cfg.BlobS3Region,+ S3Bucket: cfg.BlobS3Bucket,+ S3AccessKeyID: cfg.BlobS3AccessKey,+ S3SecretAccessKey: cfg.BlobS3SecretKey,+ S3UseSSL: cfg.BlobS3UseSSL,+ S3ForcePathStyle: cfg.BlobS3PathStyle,+ FSBasePath: cfg.BlobFSPath,+ })+ if err != nil {+ logger.Fatal("failed to initialize blob storage", "error", err)+ }+ blobStore = bs+ logger.Info("blob storage initialized", "provider", cfg.BlobProvider)+ }+dispatcher := newWebhookDispatcher(db, cfg)handler := worker.NewEmailSendHandler(@@ -48,6 +71,9 @@ func runWorker() error {repositories.NewContactRepository(db),dispatcher,)+ if blobStore != nil {+ handler.SetBlobStore(blobStore)+ }handler.OnSent(metrics.IncrementEmailSent)handler.OnFailed(metrics.IncrementEmailFailed)@@ -68,8 +94,29 @@ func runWorker() error {},)+ // Campaign processor+ campaignProducer := worker.NewProducer(cfg.Redis.Addr, cfg.Redis.Password, cfg.WorkerMaxRetries)+ trackingRepo := repositories.NewTrackingRepository(db)+ trackingService := tracking.NewService(trackingRepo, cfg.AppWebURL, []byte(cfg.JWTSecret))+ campaignDispatcher := newWebhookDispatcher(db, cfg)+ campaignProcessor := worker.NewCampaignProcessor(+ repositories.NewCampaignRepository(db),+ repositories.NewCampaignMessageRepository(db),+ repositories.NewSubscriberListRepository(db),+ repositories.NewSubscriberRepository(db),+ repositories.NewEmailRepository(db),+ repositories.NewTemplateRepository(db),+ repositories.NewTemplateVersionRepository(db),+ repositories.NewTemplateLocalizationRepository(db),+ trackingService,+ campaignProducer,+ campaignDispatcher,+ )+mux := asynq.NewServeMux()mux.HandleFunc(worker.TypeEmailSend, handler.ProcessTask)+ mux.HandleFunc(worker.TypeCampaignStart, campaignProcessor.HandleCampaignStart)+ mux.HandleFunc(worker.TypeCampaignBatch, campaignProcessor.HandleCampaignBatch)logger.Info("Posta worker started","version", config.Version,diff --git a/docker/Dockerfile b/docker/Dockerfileindex e3f2a55..a274fa6 100644--- a/docker/Dockerfile+++ b/docker/Dockerfile@@ -21,7 +21,7 @@ RUN go mod downloadCOPY cmd/ cmd/COPY internal/ internal/RUN CGO_ENABLED=0 go build \- -ldflags "-s -w -X 'github.com/jkaninda/posta/internal/config.Version=${VERSION}' -X 'github.com/jkaninda/posta/internal/config.CommitID=${COMMIT}' -X 'github.com/jkaninda/posta/internal/config.BuildDate=${BUILD_DATE}'" \+ -ldflags "-s -w -X 'github.com/goposta/posta/internal/config.Version=${VERSION}' -X 'github.com/goposta/posta/internal/config.CommitID=${COMMIT}' -X 'github.com/goposta/posta/internal/config.BuildDate=${BUILD_DATE}'" \-o /bin/posta ./cmd/posta# Runtime stage@@ -35,7 +35,7 @@ LABEL org.opencontainers.image.title="posta" \org.opencontainers.image.licenses="Apache" \org.opencontainers.image.authors="Jonas Kaninda" \org.opencontainers.image.version="${VERSION}" \- org.opencontainers.image.source="https://github.com/jkaninda/posta" \+ org.opencontainers.image.source="https://github.com/goposta/posta" \org.opencontainers.image.revision="${COMMIT}"RUN apk add --no-cache ca-certificates tzdata \diff --git a/docs/screenshots/admin-platform-metrics-dark.png b/docs/screenshots/admin-platform-metrics-dark.pngdeleted file mode 100644index 049b51d..0000000Binary files a/docs/screenshots/admin-platform-metrics-dark.png and /dev/null differdiff --git a/docs/screenshots/admin-platform-metrics.png b/docs/screenshots/admin-platform-metrics.pngdeleted file mode 100644index fcfe370..0000000Binary files a/docs/screenshots/admin-platform-metrics.png and /dev/null differdiff --git a/docs/screenshots/analytics.png b/docs/screenshots/analytics.pngdeleted file mode 100644index 8eb18e9..0000000Binary files a/docs/screenshots/analytics.png and /dev/null differdiff --git a/docs/screenshots/dashboard.png b/docs/screenshots/dashboard.pngdeleted file mode 100644index d23a266..0000000Binary files a/docs/screenshots/dashboard.png and /dev/null differdiff --git a/docs/screenshots/template-detail.png b/docs/screenshots/template-detail.pngdeleted file mode 100644index 54340af..0000000Binary files a/docs/screenshots/template-detail.png and /dev/null differdiff --git a/docs/screenshots/template-editor.png b/docs/screenshots/template-editor.pngdeleted file mode 100644index 48417de..0000000Binary files a/docs/screenshots/template-editor.png and /dev/null differdiff --git a/examples/compose.yml b/examples/compose.ymlindex b4fbd7a..d4cf209 100644--- a/examples/compose.yml+++ b/examples/compose.yml@@ -7,7 +7,7 @@services:posta:- image: jkaninda/posta:latest+ image: goposta/posta:latestports:- "9000:9000"environment:diff --git a/examples/docker-compose-full.yml b/examples/docker-compose-full.ymlindex a69c911..27d2720 100644--- a/examples/docker-compose-full.yml+++ b/examples/docker-compose-full.yml@@ -14,7 +14,7 @@services:posta:- image: jkaninda/posta:latest+ image: goposta/posta:latestports:- "9000:9000"environment:@@ -42,7 +42,7 @@ services:restart: unless-stoppedworker:- image: jkaninda/posta:latest+ image: goposta/posta:latestcommand: ["worker"]environment:POSTA_DB_HOST: posta-dbdiff --git a/go.mod b/go.modindex b7df19d..a57b4a8 100644--- a/go.mod+++ b/go.mod@@ -1,4 +1,4 @@-module github.com/jkaninda/posta+module github.com/goposta/postago 1.26.1@@ -20,15 +20,30 @@ require ()require (+ cloud.google.com/go/compute/metadata v0.3.0 // indirectgithub.com/PuerkitoBio/goquery v1.11.0 // indirectgithub.com/andybalholm/cascadia v1.3.3 // indirect+ github.com/aws/aws-sdk-go-v2 v1.41.4 // indirect+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7 // indirect+ github.com/aws/aws-sdk-go-v2/credentials v1.19.12 // indirect+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 // indirect+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 // indirect+ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21 // indirect+ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect+ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 // indirect+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 // indirect+ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 // indirect+ github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1 // indirect+ github.com/aws/smithy-go v1.24.2 // indirectgithub.com/beorn7/perks v1.0.1 // indirectgithub.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirectgithub.com/cespare/xxhash/v2 v2.3.0 // indirectgithub.com/clipperhouse/uax29/v2 v2.2.0 // indirect+ github.com/coreos/go-oidc/v3 v3.17.0 // indirectgithub.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirectgithub.com/fatih/color v1.18.0 // indirectgithub.com/getkin/kin-openapi v0.134.0 // indirect+ github.com/go-jose/go-jose/v4 v4.1.3 // indirectgithub.com/go-openapi/jsonpointer v0.22.5 // indirectgithub.com/go-openapi/swag/jsonname v0.25.5 // indirectgithub.com/golang-jwt/jwt/v5 v5.3.1 // indirect@@ -67,6 +82,7 @@ require (go.uber.org/atomic v1.11.0 // indirectgo.yaml.in/yaml/v2 v2.4.4 // indirectgolang.org/x/net v0.51.0 // indirect+ golang.org/x/oauth2 v0.36.0 // indirectgolang.org/x/sync v0.20.0 // indirectgolang.org/x/sys v0.42.0 // indirectgolang.org/x/text v0.34.0 // indirectdiff --git a/go.sum b/go.sumindex aa379a7..ca2f69d 100644--- a/go.sum+++ b/go.sum@@ -1,7 +1,33 @@+cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=+cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw=github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ=github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=+github.com/aws/aws-sdk-go-v2 v1.41.4 h1:10f50G7WyU02T56ox1wWXq+zTX9I1zxG46HYuG1hH/k=+github.com/aws/aws-sdk-go-v2 v1.41.4/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7 h1:3kGOqnh1pPeddVa/E37XNTaWJ8W6vrbYV9lJEkCnhuY=+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI=+github.com/aws/aws-sdk-go-v2/credentials v1.19.12 h1:oqtA6v+y5fZg//tcTWahyN9PEn5eDU/Wpvc2+kJ4aY8=+github.com/aws/aws-sdk-go-v2/credentials v1.19.12/go.mod h1:U3R1RtSHx6NB0DvEQFGyf/0sbrpJrluENHdPy1j/3TE=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 h1:CNXO7mvgThFGqOFgbNAP2nol2qAWBOGfqR/7tQlvLmc=+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20/go.mod h1:oydPDJKcfMhgfcgBUZaG+toBbwy8yPWubJXBVERtI4o=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 h1:tN6W/hg+pkM+tf9XDkWUbDEjGLb+raoBMFsTodcoYKw=+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20/go.mod h1:YJ898MhD067hSHA6xYCx5ts/jEd8BSOLtQDL3iZsvbc=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21 h1:SwGMTMLIlvDNyhMteQ6r8IJSBPlRdXX5d4idhIGbkXA=+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.21/go.mod h1:UUxgWxofmOdAMuqEsSppbDtGKLfR04HGsD0HXzvhI1k=+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY=+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI=+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 h1:qtJZ70afD3ISKWnoX3xB0J2otEqu3LqicRcDBqsj0hQ=+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12/go.mod h1:v2pNpJbRNl4vEUWEh5ytQok0zACAKfdmKS51Hotc3pQ=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 h1:2HvVAIq+YqgGotK6EkMf+KIEqTISmTYh5zLpYyeTo1Y=+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20/go.mod h1:V4X406Y666khGa8ghKmphma/7C0DAtEQYhkq9z4vpbk=+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 h1:siU1A6xjUZ2N8zjTHSXFhB9L/2OY8Dqs0xXiLjF30jA=+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20/go.mod h1:4TLZCmVJDM3FOu5P5TJP0zOlu9zWgDWU7aUxWbr+rcw=+github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1 h1:csi9NLpFZXb9fxY7rS1xVzgPRGMt7MSNWeQ6eo247kE=+github.com/aws/aws-sdk-go-v2/service/s3 v1.97.1/go.mod h1:qXVal5H0ChqXP63t6jze5LmFalc7+ZE7wOdLtZ0LCP0=+github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=+github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=@@ -14,6 +40,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFgithub.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=+github.com/coreos/go-oidc/v3 v3.17.0 h1:hWBGaQfbi0iVviX4ibC7bk8OKT5qNr4klBaCHVNvehc=+github.com/coreos/go-oidc/v3 v3.17.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8=github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=@@ -25,6 +53,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkgithub.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=github.com/getkin/kin-openapi v0.134.0 h1:/L5+1+kfe6dXh8Ot/wqiTgUkjOIEJiC0bbYVziHB8rU=github.com/getkin/kin-openapi v0.134.0/go.mod h1:wK6ZLG/VgoETO9pcLJ/VmAtIcl/DNlMayNTb716EUxE=+github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=+github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=github.com/go-openapi/jsonpointer v0.22.5 h1:8on/0Yp4uTb9f4XvTrM2+1CPrV05QPZXu+rvu2o9jcA=github.com/go-openapi/jsonpointer v0.22.5/go.mod h1:gyUR3sCvGSWchA2sUBJGluYMbe1zazrYWIkWPjjMUY0=github.com/go-openapi/swag/jsonname v0.25.5 h1:8p150i44rv/Drip4vWI3kGi9+4W9TdI3US3uUYSFhSo=@@ -178,6 +208,8 @@ golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=+golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=+golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=diff --git a/internal/config/config.go b/internal/config/config.goindex 7a6c619..f7833cd 100644--- a/internal/config/config.go+++ b/internal/config/config.go@@ -24,29 +24,31 @@ import (goutils "github.com/jkaninda/go-utils""github.com/jkaninda/logger""github.com/jkaninda/okapi"- errorhandlers "github.com/jkaninda/posta/internal/error_handlers"- "github.com/jkaninda/posta/internal/storage"+ errorhandlers "github.com/goposta/posta/internal/error_handlers"+ "github.com/goposta/posta/internal/storage""github.com/joho/godotenv""github.com/redis/go-redis/v9""gorm.io/gorm")type Config struct {- Database DatabaseConfig- Redis RedisConfig- JWTSecret string- Env string- Port int- DevMode bool- RateLimitHourly int- RateLimitDaily int- AdminEmail string- AdminPassword string- OpenAPIDocs bool- MetricsEnabled bool- WebDir string- AppWebURL string- CORSOrigins string+ Database DatabaseConfig+ Redis RedisConfig+ JWTSecret string+ Env string+ Port int+ DevMode bool+ RateLimitHourly int+ RateLimitDaily int+ AuthRateLimitEnabled bool+ AdminEmail string+ AdminPassword string+ OpenAPIDocs bool+ MetricsEnabled bool+ WebDir string+ AppWebURL string+ ApiBaseURL string+ CORSOrigins string// Worker settingsEmbeddedWorker bool@@ -56,6 +58,23 @@ type Config struct {// Webhook settingsWebhookMaxRetries intWebhookTimeoutSecs int+ WebhookProxyURL string++ // OAuth settings+ GoogleOAuthClientID string+ GoogleOAuthClientSecret string+ OAuthCallbackBaseURL string++ // Blob storage settings (S3-compatible or filesystem)+ BlobProvider string+ BlobS3Endpoint string+ BlobS3Region string+ BlobS3Bucket string+ BlobS3AccessKey string+ BlobS3SecretKey string+ BlobS3UseSSL bool+ BlobS3PathStyle bool+ BlobFSPath string}type DatabaseConfig struct {DB *gorm.DB@@ -100,18 +119,20 @@ func New() *Config {Addr: goutils.Env("POSTA_REDIS_ADDR", "localhost:6379"),Password: goutils.Env("POSTA_REDIS_PASSWORD", ""),},- Port: goutils.EnvInt("POSTA_PORT", 9000),- Env: goutils.Env("POSTA_ENV", "dev"),- JWTSecret: goutils.Env("POSTA_JWT_SECRET", "change-me-in-production"),- DevMode: goutils.EnvBool("POSTA_DEV_MODE", false),- RateLimitHourly: goutils.EnvInt("POSTA_RATE_LIMIT_HOURLY", 100),- RateLimitDaily: goutils.EnvInt("POSTA_RATE_LIMIT_DAILY", 1000),- AdminEmail: goutils.Env("POSTA_ADMIN_EMAIL", "[email protected]"),- AdminPassword: goutils.Env("POSTA_ADMIN_PASSWORD", "admin1234"),- OpenAPIDocs: goutils.EnvBool("POSTA_OPENAPI_DOCS", true),- MetricsEnabled: goutils.EnvBool("POSTA_METRICS_ENABLED", false),- WebDir: goutils.Env("POSTA_WEB_DIR", "web/dist"),- AppWebURL: goutils.Env("POSTA_WEB_URL", ""),+ Port: goutils.EnvInt("POSTA_PORT", 9000),+ Env: goutils.Env("POSTA_ENV", "dev"),+ JWTSecret: goutils.Env("POSTA_JWT_SECRET", "change-me-in-production"),+ DevMode: goutils.EnvBool("POSTA_DEV_MODE", false),+ RateLimitHourly: goutils.EnvInt("POSTA_RATE_LIMIT_HOURLY", 100),+ RateLimitDaily: goutils.EnvInt("POSTA_RATE_LIMIT_DAILY", 1000),+ AuthRateLimitEnabled: goutils.EnvBool("POSTA_AUTH_RATE_LIMIT_ENABLED", true),+ AdminEmail: goutils.Env("POSTA_ADMIN_EMAIL", "[email protected]"),+ AdminPassword: goutils.Env("POSTA_ADMIN_PASSWORD", "admin1234"),+ OpenAPIDocs: goutils.EnvBool("POSTA_OPENAPI_DOCS", true),+ MetricsEnabled: goutils.EnvBool("POSTA_METRICS_ENABLED", false),+ WebDir: goutils.Env("POSTA_WEB_DIR", "web/dist"),+ AppWebURL: goutils.Env("POSTA_WEB_URL", ""),+ ApiBaseURL: goutils.Env("POSTA_API_URL", ""),CORSOrigins: goutils.Env("POSTA_CORS_ORIGINS", "*"),@@ -121,6 +142,21 @@ func New() *Config {WebhookMaxRetries: goutils.EnvInt("POSTA_WEBHOOK_MAX_RETRIES", 3),WebhookTimeoutSecs: goutils.EnvInt("POSTA_WEBHOOK_TIMEOUT_SECS", 10),+ WebhookProxyURL: goutils.Env("POSTA_WEBHOOK_PROXY_URL", ""),++ GoogleOAuthClientID: goutils.Env("POSTA_GOOGLE_OAUTH_CLIENT_ID", ""),+ GoogleOAuthClientSecret: goutils.Env("POSTA_GOOGLE_OAUTH_CLIENT_SECRET", ""),+ OAuthCallbackBaseURL: goutils.Env("POSTA_OAUTH_CALLBACK_URL", ""),++ BlobProvider: goutils.Env("POSTA_BLOB_PROVIDER", ""),+ BlobS3Endpoint: goutils.Env("POSTA_BLOB_S3_ENDPOINT", ""),+ BlobS3Region: goutils.Env("POSTA_BLOB_S3_REGION", "us-east-1"),+ BlobS3Bucket: goutils.Env("POSTA_BLOB_S3_BUCKET", ""),+ BlobS3AccessKey: goutils.Env("POSTA_BLOB_S3_ACCESS_KEY", ""),+ BlobS3SecretKey: goutils.Env("POSTA_BLOB_S3_SECRET_KEY", ""),+ BlobS3UseSSL: goutils.EnvBool("POSTA_BLOB_S3_USE_SSL", true),+ BlobS3PathStyle: goutils.EnvBool("POSTA_BLOB_S3_PATH_STYLE", false),+ BlobFSPath: goutils.Env("POSTA_BLOB_FS_PATH", "data/attachments"),}}func (c *Config) validate() error {@@ -149,6 +185,13 @@ func (c *Config) Initialize(app *okapi.Okapi) error {for i := range corsOrigins {corsOrigins[i] = strings.TrimSpace(corsOrigins[i])}+ apiServers := okapi.Servers{}+ if c.AppWebURL != "" {+ apiServers = append(apiServers, okapi.Server{URL: c.AppWebURL})+ }+ if c.ApiBaseURL != "" {+ apiServers = append(apiServers, okapi.Server{URL: c.ApiBaseURL})+ }app.WithCORS(okapi.Cors{AllowedOrigins: corsOrigins,AllowedHeaders: []string{"Content-Type", "Authorization", "X-Request-ID"},@@ -160,8 +203,10 @@ func (c *Config) Initialize(app *okapi.Okapi) error {Title: "Posta API",Version: "v1",License: okapi.License{- Name: "MIT",+ Name: "Apache",+ URL: "http://www.apache.org/licenses/LICENSE-2.0",},+ Servers: apiServers,})}app.WithErrorHandler(errorhandlers.CustomErrorHandler())diff --git a/internal/cron/jobs/account_cleanup.go b/internal/cron/jobs/account_cleanup.gonew file mode 100644index 0000000..3ea16a9--- /dev/null+++ b/internal/cron/jobs/account_cleanup.go@@ -0,0 +1,64 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package jobs++import (+ "context"++ "github.com/hibiken/asynq"+ "github.com/jkaninda/logger"+ "github.com/goposta/posta/internal/storage/repositories"+)++// AccountCleanupJob permanently deletes user accounts whose scheduled+// deletion date has passed.+type AccountCleanupJob struct {+ userRepo *repositories.UserRepository+}++func NewAccountCleanupJob(userRepo *repositories.UserRepository) *AccountCleanupJob {+ return &AccountCleanupJob{userRepo: userRepo}+}++func (j *AccountCleanupJob) Name() string { return "account-cleanup" }+func (j *AccountCleanupJob) Schedule() string { return "0 2 * * *" } // daily at 02:00 UTC++func (j *AccountCleanupJob) Run(_ context.Context, _ *asynq.Client) error {+ users, err := j.userRepo.FindScheduledForDeletion()+ if err != nil {+ logger.Error("account cleanup: failed to find users scheduled for deletion", "error", err)+ return err+ }++ if len(users) == 0 {+ return nil+ }++ deleted := 0+ for _, user := range users {+ if err := j.userRepo.DeleteAllUserData(user.ID); err != nil {+ logger.Error("account cleanup: failed to delete user", "user_id", user.ID, "email", user.Email, "error", err)+ continue+ }+ logger.Info("account cleanup: permanently deleted user", "user_id", user.ID, "email", user.Email)+ deleted+++ }++ logger.Info("account cleanup: completed", "deleted", deleted, "total", len(users))+ return nil+}diff --git a/internal/cron/jobs/daily_report.go b/internal/cron/jobs/daily_report.goindex 2a88bf3..beed144 100644--- a/internal/cron/jobs/daily_report.go+++ b/internal/cron/jobs/daily_report.go@@ -23,8 +23,8 @@ import ("github.com/hibiken/asynq""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/cron"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/cron"+ "github.com/goposta/posta/internal/storage/repositories")const TypeDailyReport = "cron:daily-report"diff --git a/internal/cron/jobs/retention.go b/internal/cron/jobs/retention.goindex ac48198..2fd8600 100644--- a/internal/cron/jobs/retention.go+++ b/internal/cron/jobs/retention.go@@ -23,8 +23,8 @@ import ("github.com/hibiken/asynq""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/storage/repositories")// RetentionCleanupJob purges old email logs, audit events, and webhook@@ -33,6 +33,7 @@ type RetentionCleanupJob struct {emailRepo *repositories.EmailRepositoryeventRepo *repositories.EventRepositorywhDeliveryRepo *repositories.WebhookDeliveryRepository+ trackingRepo *repositories.TrackingRepositorysettings *settings.Provider}@@ -40,12 +41,14 @@ func NewRetentionCleanupJob(emailRepo *repositories.EmailRepository,eventRepo *repositories.EventRepository,whDeliveryRepo *repositories.WebhookDeliveryRepository,+ trackingRepo *repositories.TrackingRepository,sp *settings.Provider,) *RetentionCleanupJob {return &RetentionCleanupJob{emailRepo: emailRepo,eventRepo: eventRepo,whDeliveryRepo: whDeliveryRepo,+ trackingRepo: trackingRepo,settings: sp,}}@@ -90,5 +93,17 @@ func (j *RetentionCleanupJob) Run(_ context.Context, _ *asynq.Client) error {}}+ // Clean up old tracking events+ trackingRetention := j.settings.TrackingEventRetentionDays()+ if trackingRetention > 0 {+ before := time.Now().AddDate(0, 0, -trackingRetention)+ deleted, err := j.trackingRepo.DeleteOlderThan(before)+ if err != nil {+ logger.Error("retention cleanup: failed to delete old tracking events", "error", err)+ } else if deleted > 0 {+ logger.Info("retention cleanup: deleted old tracking events", "count", deleted, "older_than_days", trackingRetention)+ }+ }+return nil}diff --git a/internal/dto/types.go b/internal/dto/types.goindex e866b87..003978d 100644--- a/internal/dto/types.go+++ b/internal/dto/types.go@@ -20,7 +20,7 @@ package dto// Response is the standard API response envelope with a generic data field.type Response[T any] struct {Success bool `json:"success"`- Data T `json:"data,omitempty"`+ Data T `json:"data"`}// PageableResponse is the paginated API response envelope.diff --git a/internal/error_handlers/errors.go b/internal/error_handlers/errors.goindex 43ca941..2f4add1 100644--- a/internal/error_handlers/errors.go+++ b/internal/error_handlers/errors.go@@ -19,7 +19,7 @@ package errorhandlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/dto"+ "github.com/goposta/posta/internal/dto")// CustomErrorHandler returns an okapi.ErrorHandler that formats errorsdiff --git a/internal/handlers/admin_handler.go b/internal/handlers/admin_handler.goindex b2246c8..08cf1ef 100644--- a/internal/handlers/admin_handler.go+++ b/internal/handlers/admin_handler.go@@ -24,12 +24,12 @@ import ("github.com/hibiken/asynq""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/cache"- "github.com/jkaninda/posta/internal/services/eventbus"- "github.com/jkaninda/posta/internal/services/seeder"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/cache"+ "github.com/goposta/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/services/seeder"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/storage/repositories""golang.org/x/crypto/bcrypt""gorm.io/gorm")@@ -41,6 +41,8 @@ type AdminHandler struct {keyRepo *repositories.APIKeyRepositoryemailRepo *repositories.EmailRepositorywhDeliveryRepo *repositories.WebhookDeliveryRepository+ workspaceRepo *repositories.WorkspaceRepository+ planRepo *repositories.PlanRepositoryinspector *asynq.Inspectorbus *eventbus.EventBusseeder *seeder.Seeder@@ -116,6 +118,12 @@ func NewAdminHandler(db *gorm.DB, c *cache.Cache, userRepo *repositories.UserRepreturn &AdminHandler{db: db, cache: c, userRepo: userRepo, keyRepo: keyRepo, emailRepo: emailRepo, whDeliveryRepo: whDeliveryRepo, inspector: inspector, bus: bus, seeder: seeder, embeddedWorker: embeddedWorker}}+// SetWorkspaceRepo sets the workspace and plan repositories for workspace management.+func (h *AdminHandler) SetWorkspaceRepo(wsRepo *repositories.WorkspaceRepository, planRepo *repositories.PlanRepository) {+ h.workspaceRepo = wsRepo+ h.planRepo = planRepo+}+func (h *AdminHandler) SetEmailSettings(s *settings.Provider) {h.emailSettings = s}@@ -210,7 +218,7 @@ func (h *AdminHandler) DeleteUser(c *okapi.Context, req *AdminDeleteUserRequest)return c.AbortNotFound("user not found")}- if err := h.userRepo.Delete(uint(req.ID)); err != nil {+ if err := h.userRepo.DeleteAllUserData(uint(req.ID)); err != nil {return c.AbortInternalServerError("failed to delete user")}@@ -366,6 +374,66 @@ func (h *AdminHandler) UserMetrics(c *okapi.Context, req *AdminGetUserRequest) ereturn ok(c, m)}+// AdminWorkspace is a workspace with its plan name for admin views.+type AdminWorkspace struct {+ ID uint `json:"id"`+ Name string `json:"name"`+ Slug string `json:"slug"`+ OwnerID uint `json:"owner_id"`+ PlanID *uint `json:"plan_id"`+ PlanName string `json:"plan_name"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt time.Time `json:"updated_at"`+}++// UserWorkspaces returns workspaces for a specific user (admin only).+func (h *AdminHandler) UserWorkspaces(c *okapi.Context, req *AdminGetUserRequest) error {+ _, err := h.userRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("user not found")+ }++ workspaces, err := h.workspaceRepo.FindByUserID(uint(req.ID))+ if err != nil {+ return c.AbortInternalServerError("failed to list workspaces")+ }++ // Collect plan IDs and fetch plan names+ planIDs := make(map[uint]bool)+ for _, ws := range workspaces {+ if ws.PlanID != nil {+ planIDs[*ws.PlanID] = true+ }+ }++ planNames := make(map[uint]string)+ if h.planRepo != nil {+ for id := range planIDs {+ if plan, err := h.planRepo.FindByID(id); err == nil {+ planNames[plan.ID] = plan.Name+ }+ }+ }++ result := make([]AdminWorkspace, len(workspaces))+ for i, ws := range workspaces {+ result[i] = AdminWorkspace{+ ID: ws.ID,+ Name: ws.Name,+ Slug: ws.Slug,+ OwnerID: ws.OwnerID,+ PlanID: ws.PlanID,+ CreatedAt: ws.CreatedAt,+ UpdatedAt: ws.UpdatedAt,+ }+ if ws.PlanID != nil {+ result[i].PlanName = planNames[*ws.PlanID]+ }+ }++ return ok(c, result)+}+// Disable2FA allows admins to disable 2FA for a user.func (h *AdminHandler) Disable2FA(c *okapi.Context, req *AdminGetUserRequest) error {user, err := h.userRepo.FindByID(uint(req.ID))diff --git a/internal/handlers/analytics_handler.go b/internal/handlers/analytics_handler.goindex 29174ce..a6477e5 100644--- a/internal/handlers/analytics_handler.go+++ b/internal/handlers/analytics_handler.go@@ -21,8 +21,8 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/services/cache"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/services/cache"+ "github.com/goposta/posta/internal/storage/repositories")type AnalyticsHandler struct {@@ -57,11 +57,15 @@ type DashboardAnalyticsResponse struct {}func (h *AnalyticsHandler) UserAnalytics(c *okapi.Context, req *AnalyticsRequest) error {- userID := c.GetInt("user_id")+ scope := getScope(c)ctx := c.Request().Context()// Try cache first- cacheKey := cache.UserAnalyticsKey(userID, req.From, req.To, req.Status)+ scopeKey := int(scope.UserID)+ if scope.WorkspaceID != nil {+ scopeKey = int(*scope.WorkspaceID) + 1000000+ }+ cacheKey := cache.UserAnalyticsKey(scopeKey, req.From, req.To, req.Status)var resp AnalyticsResponseif h.cache.Get(ctx, cacheKey, &resp) {return ok(c, resp)@@ -69,11 +73,23 @@ func (h *AnalyticsHandler) UserAnalytics(c *okapi.Context, req *AnalyticsRequestfrom, to := parseTimeRange(req.From, req.To)- daily, err := h.repo.DailyCounts(uint(userID), from, to, req.Status)- if err != nil {- return c.AbortInternalServerError("failed to fetch analytics")+ var daily []repositories.DailyCount+ var breakdown []repositories.StatusBreakdown+ var err error++ if scope.WorkspaceID != nil {+ daily, err = h.repo.WorkspaceDailyCounts(*scope.WorkspaceID, from, to, req.Status)+ if err != nil {+ return c.AbortInternalServerError("failed to fetch analytics")+ }+ breakdown, err = h.repo.WorkspaceStatusBreakdown(*scope.WorkspaceID, from, to)+ } else {+ daily, err = h.repo.DailyCounts(scope.UserID, from, to, req.Status)+ if err != nil {+ return c.AbortInternalServerError("failed to fetch analytics")+ }+ breakdown, err = h.repo.StatusBreakdown(scope.UserID, from, to)}- breakdown, err := h.repo.StatusBreakdown(uint(userID), from, to)if err != nil {return c.AbortInternalServerError("failed to fetch analytics")}@@ -120,10 +136,14 @@ func (h *AnalyticsHandler) AdminAnalytics(c *okapi.Context, req *AnalyticsReques}func (h *AnalyticsHandler) UserDashboardAnalytics(c *okapi.Context, req *DashboardAnalyticsRequest) error {- userID := c.GetInt("user_id")+ scope := getScope(c)ctx := c.Request().Context()- cacheKey := cache.DashboardAnalyticsKey(userID, req.From, req.To)+ scopeKey := int(scope.UserID)+ if scope.WorkspaceID != nil {+ scopeKey = int(*scope.WorkspaceID) + 1000000+ }+ cacheKey := cache.DashboardAnalyticsKey(scopeKey, req.From, req.To)var resp DashboardAnalyticsResponseif h.cache.Get(ctx, cacheKey, &resp) {return ok(c, resp)@@ -131,22 +151,39 @@ func (h *AnalyticsHandler) UserDashboardAnalytics(c *okapi.Context, req *Dashboafrom, to := parseTimeRange(req.From, req.To)- delivery, err := h.repo.DeliveryRateTrends(uint(userID), from, to)- if err != nil {- return c.AbortInternalServerError("failed to fetch delivery rate trends")- }- bounces, err := h.repo.BounceRateTrends(uint(userID), from, to)- if err != nil {- return c.AbortInternalServerError("failed to fetch bounce rate trends")+ var delivery []repositories.DeliveryRatePoint+ var bouncePoints []repositories.BounceRatePoint+ var latency *repositories.LatencyPercentiles+ var err error++ if scope.WorkspaceID != nil {+ delivery, err = h.repo.WorkspaceDeliveryRateTrends(*scope.WorkspaceID, from, to)+ if err != nil {+ return c.AbortInternalServerError("failed to fetch delivery rate trends")+ }+ bouncePoints, err = h.repo.WorkspaceBounceRateTrends(*scope.WorkspaceID, from, to)+ if err != nil {+ return c.AbortInternalServerError("failed to fetch bounce rate trends")+ }+ latency, err = h.repo.WorkspaceLatencyPercentiles(*scope.WorkspaceID, from, to)+ } else {+ delivery, err = h.repo.DeliveryRateTrends(scope.UserID, from, to)+ if err != nil {+ return c.AbortInternalServerError("failed to fetch delivery rate trends")+ }+ bouncePoints, err = h.repo.BounceRateTrends(scope.UserID, from, to)+ if err != nil {+ return c.AbortInternalServerError("failed to fetch bounce rate trends")+ }+ latency, err = h.repo.LatencyPercentilesForUser(scope.UserID, from, to)}- latency, err := h.repo.LatencyPercentilesForUser(uint(userID), from, to)if err != nil {return c.AbortInternalServerError("failed to fetch latency percentiles")}resp = DashboardAnalyticsResponse{DeliveryRateTrends: delivery,- BounceRateTrends: bounces,+ BounceRateTrends: bouncePoints,LatencyPercentiles: latency,}diff --git a/internal/handlers/api_key_handler.go b/internal/handlers/api_key_handler.goindex cbe1096..01eff1a 100644--- a/internal/handlers/api_key_handler.go+++ b/internal/handlers/api_key_handler.go@@ -21,9 +21,10 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/services/audit"- "github.com/jkaninda/posta/internal/services/auth"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/services/audit"+ "github.com/goposta/posta/internal/services/auth"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm")type APIKeyHandler struct {@@ -31,6 +32,8 @@ type APIKeyHandler struct {repo *repositories.APIKeyRepositoryuserSettingRepo *repositories.UserSettingRepositoryaudit *audit.Logger+ quota QuotaChecker+ db *gorm.DB}type CreateAPIKeyRequest struct {Body struct {@@ -55,8 +58,23 @@ func NewAPIKeyHandler(service *auth.APIKeyService, repo *repositories.APIKeyRepo}}+// SetQuota sets the quota checker for plan-based resource limits.+func (h *APIKeyHandler) SetQuota(q QuotaChecker, db *gorm.DB) {+ h.quota = q+ h.db = db+}+func (h *APIKeyHandler) Create(c *okapi.Context, req *CreateAPIKeyRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ if h.quota != nil {+ if err := h.quota.CheckQuota(h.db, scope.WorkspaceID, "api_keys"); err != nil {+ return c.AbortForbidden(err.Error())+ }+ }// Determine expiration: use provided value, fall back to user setting defaultvar expiresAt *time.Time@@ -69,19 +87,19 @@ func (h *APIKeyHandler) Create(c *okapi.Context, req *CreateAPIKeyRequest) error// days == 0 means never expires (expiresAt stays nil)} else {// Use default from user settings- setting, err := h.userSettingRepo.FindByUserID(uint(userID))+ setting, err := h.userSettingRepo.FindByUserID(scope.UserID)if err == nil && setting.APIKeyExpiryDays > 0 {t := time.Now().AddDate(0, 0, setting.APIKeyExpiryDays)expiresAt = &t}}- rawKey, key, err := h.service.GenerateKey(uint(userID), req.Body.Name, req.Body.AllowedIPs, expiresAt)+ rawKey, key, err := h.service.GenerateKey(scope.UserID, scope.WorkspaceID, req.Body.Name, req.Body.AllowedIPs, expiresAt)if err != nil {return c.AbortInternalServerError("failed to create API key", err)}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "apikey.created", "API key created: "+req.Body.Name, nil)+ h.audit.Log(scope.UserID, c.GetString("email"), c.RealIP(), "apikey.created", "API key created: "+req.Body.Name, nil)return created(c, okapi.M{"key": rawKey,@@ -94,10 +112,9 @@ func (h *APIKeyHandler) Create(c *okapi.Context, req *CreateAPIKeyRequest) error}func (h *APIKeyHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- keys, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ keys, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list API keys")}@@ -106,13 +123,11 @@ func (h *APIKeyHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *APIKeyHandler) Revoke(c *okapi.Context, req *RevokeAPIKeyRequest) error {- userID := c.GetInt("user_id")-- key, err := h.repo.FindByID(uint(req.ID))- if err != nil {- return c.AbortNotFound("API key not found")+ if err := requireEdit(c); err != nil {+ return err}- if key.UserID != uint(userID) {+ key, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, key.UserID, key.WorkspaceID) {return c.AbortNotFound("API key not found")}@@ -120,19 +135,17 @@ func (h *APIKeyHandler) Revoke(c *okapi.Context, req *RevokeAPIKeyRequest) errorreturn c.AbortInternalServerError("failed to revoke API key")}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "apikey.revoked", "API key revoked: "+key.Name, nil)+ h.audit.Log(key.UserID, c.GetString("email"), c.RealIP(), "apikey.revoked", "API key revoked: "+key.Name, nil)return ok(c, okapi.M{"message": "API key revoked"})}func (h *APIKeyHandler) Delete(c *okapi.Context, req *DeleteAPIKeyRequest) error {- userID := c.GetInt("user_id")-- key, err := h.repo.FindByID(uint(req.ID))- if err != nil {- return c.AbortNotFound("API key not found")+ if err := requireEdit(c); err != nil {+ return err}- if key.UserID != uint(userID) {+ key, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, key.UserID, key.WorkspaceID) {return c.AbortNotFound("API key not found")}@@ -145,7 +158,7 @@ func (h *APIKeyHandler) Delete(c *okapi.Context, req *DeleteAPIKeyRequest) errorreturn c.AbortInternalServerError("failed to delete API key")}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "apikey.deleted", "API key deleted: "+key.Name, nil)+ h.audit.Log(key.UserID, c.GetString("email"), c.RealIP(), "apikey.deleted", "API key deleted: "+key.Name, nil)return ok(c, okapi.M{"message": "API key deleted"})}diff --git a/internal/handlers/bounce_handler.go b/internal/handlers/bounce_handler.goindex dc0595c..17d309f 100644--- a/internal/handlers/bounce_handler.go+++ b/internal/handlers/bounce_handler.go@@ -19,9 +19,9 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/metrics"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/metrics"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type BounceHandler struct {@@ -43,7 +43,10 @@ func NewBounceHandler(bounceRepo *repositories.BounceRepository, suppressionRepo}func (h *BounceHandler) Record(c *okapi.Context, req *RecordBounceRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)validTypes := map[string]bool{"hard": true, "soft": true, "complaint": true}if !validTypes[req.Body.Type] {@@ -56,7 +59,8 @@ func (h *BounceHandler) Record(c *okapi.Context, req *RecordBounceRequest) error}bounce := &models.Bounce{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,EmailID: em.ID,Recipient: req.Body.Recipient,Type: models.BounceType(req.Body.Type),@@ -72,9 +76,10 @@ func (h *BounceHandler) Record(c *okapi.Context, req *RecordBounceRequest) error// Auto-suppress on hard bounce or complaintif req.Body.Type == "hard" || req.Body.Type == "complaint" {suppression := &models.Suppression{- UserID: uint(userID),- Email: req.Body.Recipient,- Reason: "auto-suppressed: " + req.Body.Type + " bounce",+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Email: req.Body.Recipient,+ Reason: "auto-suppressed: " + req.Body.Type + " bounce",}// Ignore error if already suppressedif err := h.suppressionRepo.Create(suppression); err == nil {@@ -86,10 +91,9 @@ func (h *BounceHandler) Record(c *okapi.Context, req *RecordBounceRequest) error}func (h *BounceHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- bounces, total, err := h.bounceRepo.FindByUserID(uint(userID), size, offset)+ bounces, total, err := h.bounceRepo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list bounces")}diff --git a/internal/handlers/bounce_webhook_handler.go b/internal/handlers/bounce_webhook_handler.gonew file mode 100644index 0000000..45b5dd1--- /dev/null+++ b/internal/handlers/bounce_webhook_handler.go@@ -0,0 +1,107 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "strings"+ "time"++ "github.com/jkaninda/logger"+ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+)++// BounceWebhookHandler processes inbound bounce notifications.+type BounceWebhookHandler struct {+ subscriberRepo *repositories.SubscriberRepository+ emailRepo *repositories.EmailRepository+ messageRepo *repositories.CampaignMessageRepository+}++func NewBounceWebhookHandler(+ subscriberRepo *repositories.SubscriberRepository,+ emailRepo *repositories.EmailRepository,+ messageRepo *repositories.CampaignMessageRepository,+) *BounceWebhookHandler {+ return &BounceWebhookHandler{+ subscriberRepo: subscriberRepo,+ emailRepo: emailRepo,+ messageRepo: messageRepo,+ }+}++type BounceNotification struct {+ Body struct {+ Email string `json:"email" required:"true" doc:"Bounced email address"`+ Type string `json:"type" doc:"Bounce type: hard or soft" enum:"hard,soft"`+ EmailUUID string `json:"email_id" doc:"UUID of the original email"`+ Reason string `json:"reason" doc:"Bounce reason"`+ } `json:"body"`+}++type BounceResponse struct {+ Processed bool `json:"processed"`+ Action string `json:"action"`+}++func (h *BounceWebhookHandler) HandleBounce(c *okapi.Context, req *BounceNotification) error {+ email := strings.ToLower(strings.TrimSpace(req.Body.Email))+ if email == "" {+ return c.AbortBadRequest("email is required")+ }++ bounceType := req.Body.Type+ if bounceType == "" {+ bounceType = "hard"+ }++ action := "recorded"++ // Mark subscriber as bounced for hard bounces+ if bounceType == "hard" {+ // Find all subscribers with this email (across all scopes)+ var subscribers []models.Subscriber+ if err := h.subscriberRepo.FindAllByEmail(email, &subscribers); err == nil {+ now := time.Now()+ for i := range subscribers {+ if subscribers[i].Status != models.SubscriberStatusBounced {+ subscribers[i].Status = models.SubscriberStatusBounced+ subscribers[i].UpdatedAt = &now+ _ = h.subscriberRepo.Update(&subscribers[i])+ }+ }+ action = "subscriber_bounced"+ }+ }++ // Update campaign message if email UUID is provided+ if req.Body.EmailUUID != "" {+ em, err := h.emailRepo.FindByUUID(req.Body.EmailUUID)+ if err == nil {+ msg, err := h.messageRepo.FindByEmailID(em.ID)+ if err == nil {+ _ = h.messageRepo.UpdateBouncedAt(msg.ID)+ action = "message_bounced"+ }+ }+ }++ logger.Info("bounce processed", "email", email, "type", bounceType, "action", action)+ return ok(c, BounceResponse{Processed: true, Action: action})+}diff --git a/internal/handlers/campaign_handler.go b/internal/handlers/campaign_handler.gonew file mode 100644index 0000000..80d91fe--- /dev/null+++ b/internal/handlers/campaign_handler.go@@ -0,0 +1,452 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/worker"+)++type CampaignHandler struct {+ campaignRepo *repositories.CampaignRepository+ messageRepo *repositories.CampaignMessageRepository+ listRepo *repositories.SubscriberListRepository+ subscriberRepo *repositories.SubscriberRepository+ templateRepo *repositories.TemplateRepository+ producer *worker.Producer+}++func NewCampaignHandler(+ campaignRepo *repositories.CampaignRepository,+ messageRepo *repositories.CampaignMessageRepository,+ listRepo *repositories.SubscriberListRepository,+ subscriberRepo *repositories.SubscriberRepository,+ templateRepo *repositories.TemplateRepository,+ producer *worker.Producer,+) *CampaignHandler {+ return &CampaignHandler{+ campaignRepo: campaignRepo,+ messageRepo: messageRepo,+ listRepo: listRepo,+ subscriberRepo: subscriberRepo,+ templateRepo: templateRepo,+ producer: producer,+ }+}+++type CreateCampaignRequest struct {+ Body struct {+ Name string `json:"name" required:"true"`+ Subject string `json:"subject" required:"true"`+ FromEmail string `json:"from_email" required:"true"`+ FromName string `json:"from_name"`+ TemplateID uint `json:"template_id" required:"true"`+ TemplateVersionID *uint `json:"template_version_id"`+ Language string `json:"language"`+ TemplateData map[string]interface{} `json:"template_data"`+ ListID uint `json:"list_id" required:"true"`+ SendRate int `json:"send_rate"`+ SendAtLocalTime bool `json:"send_at_local_time"`+ ABTestEnabled bool `json:"ab_test_enabled"`+ ABTestVariants []models.ABTestVariant `json:"ab_test_variants"`+ ScheduledAt *time.Time `json:"scheduled_at"`+ } `json:"body"`+}++type UpdateCampaignRequest struct {+ ID int `param:"id"`+ Body struct {+ Name string `json:"name"`+ Subject string `json:"subject"`+ FromEmail string `json:"from_email"`+ FromName string `json:"from_name"`+ TemplateID *uint `json:"template_id"`+ TemplateVersionID *uint `json:"template_version_id"`+ Language string `json:"language"`+ TemplateData map[string]interface{} `json:"template_data"`+ ListID *uint `json:"list_id"`+ SendRate *int `json:"send_rate"`+ SendAtLocalTime *bool `json:"send_at_local_time"`+ ABTestEnabled *bool `json:"ab_test_enabled"`+ ABTestVariants []models.ABTestVariant `json:"ab_test_variants"`+ ScheduledAt *time.Time `json:"scheduled_at"`+ } `json:"body"`+}++type ListCampaignsRequest struct {+ Page int `query:"page" default:"0"`+ Size int `query:"size" default:"20"`+ Status string `query:"status"`+}++type CampaignActionRequest struct {+ ID int `param:"id"`+}++type ListCampaignMessagesRequest struct {+ ID int `param:"id"`+ Page int `query:"page" default:"0"`+ Size int `query:"size" default:"20"`+ Status string `query:"status"`+}+++type CampaignStats struct {+ Total int64 `json:"total"`+ Pending int64 `json:"pending"`+ Queued int64 `json:"queued"`+ Sent int64 `json:"sent"`+ Failed int64 `json:"failed"`+ Skipped int64 `json:"skipped"`+}++type CampaignWithStats struct {+ models.Campaign+ Stats *CampaignStats `json:"stats,omitempty"`+}+++func (h *CampaignHandler) Create(c *okapi.Context, req *CreateCampaignRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ if req.Body.Name == "" || req.Body.Subject == "" || req.Body.FromEmail == "" {+ return c.AbortBadRequest("name, subject, and from_email are required")+ }++ if req.Body.ABTestEnabled {+ if len(req.Body.ABTestVariants) < 2 {+ return c.AbortBadRequest("A/B test requires at least 2 variants")+ }+ totalSplit := 0+ for _, v := range req.Body.ABTestVariants {+ if v.Name == "" || v.SplitPercentage <= 0 {+ return c.AbortBadRequest("each variant must have a name and positive split percentage")+ }+ totalSplit += v.SplitPercentage+ }+ if totalSplit != 100 {+ return c.AbortBadRequest("variant split percentages must sum to 100")+ }+ }++ lang := req.Body.Language+ if lang == "" {+ lang = "en"+ }++ campaign := &models.Campaign{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Name: req.Body.Name,+ Subject: req.Body.Subject,+ FromEmail: req.Body.FromEmail,+ FromName: req.Body.FromName,+ TemplateID: req.Body.TemplateID,+ TemplateVersionID: req.Body.TemplateVersionID,+ Language: lang,+ TemplateData: req.Body.TemplateData,+ Status: models.CampaignStatusDraft,+ ListID: req.Body.ListID,+ SendRate: req.Body.SendRate,+ SendAtLocalTime: req.Body.SendAtLocalTime,+ ABTestEnabled: req.Body.ABTestEnabled,+ ABTestVariants: req.Body.ABTestVariants,+ ScheduledAt: req.Body.ScheduledAt,+ }++ if err := h.campaignRepo.Create(campaign); err != nil {+ return c.AbortInternalServerError("failed to create campaign")+ }+ return created(c, campaign)+}++func (h *CampaignHandler) List(c *okapi.Context, req *ListCampaignsRequest) error {+ page, size, offset := normalizePageParams(req.Page, req.Size)+ items, total, err := h.campaignRepo.FindByScope(getScope(c), req.Status, size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to list campaigns")+ }++ result := make([]CampaignWithStats, len(items))+ for i, item := range items {+ stats := h.buildStats(item.ID)+ result[i] = CampaignWithStats{Campaign: item, Stats: stats}+ }+ return paginated(c, result, total, page, size)+}++func (h *CampaignHandler) Get(c *okapi.Context, req *CampaignActionRequest) error {+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ stats := h.buildStats(campaign.ID)+ return ok(c, CampaignWithStats{Campaign: *campaign, Stats: stats})+}++func (h *CampaignHandler) Update(c *okapi.Context, req *UpdateCampaignRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ if campaign.Status != models.CampaignStatusDraft {+ return c.AbortBadRequest("can only update draft campaigns")+ }++ if req.Body.Name != "" {+ campaign.Name = req.Body.Name+ }+ if req.Body.Subject != "" {+ campaign.Subject = req.Body.Subject+ }+ if req.Body.FromEmail != "" {+ campaign.FromEmail = req.Body.FromEmail+ }+ if req.Body.FromName != "" {+ campaign.FromName = req.Body.FromName+ }+ if req.Body.TemplateID != nil {+ campaign.TemplateID = *req.Body.TemplateID+ }+ if req.Body.TemplateVersionID != nil {+ campaign.TemplateVersionID = req.Body.TemplateVersionID+ }+ if req.Body.Language != "" {+ campaign.Language = req.Body.Language+ }+ if req.Body.TemplateData != nil {+ campaign.TemplateData = req.Body.TemplateData+ }+ if req.Body.ListID != nil {+ campaign.ListID = *req.Body.ListID+ }+ if req.Body.SendRate != nil {+ campaign.SendRate = *req.Body.SendRate+ }+ if req.Body.SendAtLocalTime != nil {+ campaign.SendAtLocalTime = *req.Body.SendAtLocalTime+ }+ if req.Body.ABTestEnabled != nil {+ campaign.ABTestEnabled = *req.Body.ABTestEnabled+ }+ if req.Body.ABTestVariants != nil {+ campaign.ABTestVariants = req.Body.ABTestVariants+ }+ if req.Body.ScheduledAt != nil {+ campaign.ScheduledAt = req.Body.ScheduledAt+ }+ now := time.Now()+ campaign.UpdatedAt = &now++ if err := h.campaignRepo.Update(campaign); err != nil {+ return c.AbortInternalServerError("failed to update campaign")+ }+ return ok(c, campaign)+}++func (h *CampaignHandler) Delete(c *okapi.Context, req *CampaignActionRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ if campaign.Status != models.CampaignStatusDraft && campaign.Status != models.CampaignStatusCancelled {+ return c.AbortBadRequest("can only delete draft or cancelled campaigns")+ }+ if err := h.campaignRepo.Delete(campaign.ID); err != nil {+ return c.AbortInternalServerError("failed to delete campaign")+ }+ return noContent(c)+}++func (h *CampaignHandler) Send(c *okapi.Context, req *CampaignActionRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ if campaign.Status != models.CampaignStatusDraft {+ return c.AbortBadRequest("can only send draft campaigns")+ }++ if campaign.ScheduledAt != nil && campaign.ScheduledAt.After(time.Now()) {+ // Schedule for later+ if err := h.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusScheduled); err != nil {+ return c.AbortInternalServerError("failed to schedule campaign")+ }+ campaign.Status = models.CampaignStatusScheduled+ return ok(c, campaign)+ }++ // Send immediately+ if err := h.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusSending); err != nil {+ return c.AbortInternalServerError("failed to update campaign status")+ }+ if err := h.producer.EnqueueCampaignStart(campaign.ID); err != nil {+ return c.AbortInternalServerError("failed to enqueue campaign")+ }+ campaign.Status = models.CampaignStatusSending+ return ok(c, campaign)+}++func (h *CampaignHandler) Pause(c *okapi.Context, req *CampaignActionRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ if campaign.Status != models.CampaignStatusSending {+ return c.AbortBadRequest("can only pause sending campaigns")+ }+ if err := h.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusPaused); err != nil {+ return c.AbortInternalServerError("failed to pause campaign")+ }+ campaign.Status = models.CampaignStatusPaused+ return ok(c, campaign)+}++func (h *CampaignHandler) Resume(c *okapi.Context, req *CampaignActionRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ if campaign.Status != models.CampaignStatusPaused {+ return c.AbortBadRequest("can only resume paused campaigns")+ }+ if err := h.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusSending); err != nil {+ return c.AbortInternalServerError("failed to resume campaign")+ }+ if err := h.producer.EnqueueCampaignBatch(campaign.ID, 0); err != nil {+ return c.AbortInternalServerError("failed to enqueue campaign batch")+ }+ campaign.Status = models.CampaignStatusSending+ return ok(c, campaign)+}++func (h *CampaignHandler) Cancel(c *okapi.Context, req *CampaignActionRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ if campaign.Status != models.CampaignStatusSending &&+ campaign.Status != models.CampaignStatusPaused &&+ campaign.Status != models.CampaignStatusScheduled {+ return c.AbortBadRequest("can only cancel sending, paused, or scheduled campaigns")+ }+ if err := h.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusCancelled); err != nil {+ return c.AbortInternalServerError("failed to cancel campaign")+ }+ campaign.Status = models.CampaignStatusCancelled+ return ok(c, campaign)+}++func (h *CampaignHandler) Duplicate(c *okapi.Context, req *CampaignActionRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ scope := getScope(c)++ clone := &models.Campaign{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Name: campaign.Name + " (copy)",+ Subject: campaign.Subject,+ FromEmail: campaign.FromEmail,+ FromName: campaign.FromName,+ TemplateID: campaign.TemplateID,+ TemplateVersionID: campaign.TemplateVersionID,+ Language: campaign.Language,+ TemplateData: campaign.TemplateData,+ Status: models.CampaignStatusDraft,+ ListID: campaign.ListID,+ SendRate: campaign.SendRate,+ SendAtLocalTime: campaign.SendAtLocalTime,+ ABTestEnabled: campaign.ABTestEnabled,+ ABTestVariants: campaign.ABTestVariants,+ }++ if err := h.campaignRepo.Create(clone); err != nil {+ return c.AbortInternalServerError("failed to duplicate campaign")+ }+ return created(c, clone)+}++func (h *CampaignHandler) ListMessages(c *okapi.Context, req *ListCampaignMessagesRequest) error {+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }+ page, size, offset := normalizePageParams(req.Page, req.Size)+ items, total, err := h.messageRepo.FindByCampaign(campaign.ID, req.Status, size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to list campaign messages")+ }+ return paginated(c, items, total, page, size)+}++// buildStats computes stats for a campaign from the message counts.+func (h *CampaignHandler) buildStats(campaignID uint) *CampaignStats {+ counts, err := h.messageRepo.CountByStatus(campaignID)+ if err != nil {+ return nil+ }+ stats := &CampaignStats{}+ for status, count := range counts {+ stats.Total += count+ switch status {+ case models.CampaignMsgPending:+ stats.Pending = count+ case models.CampaignMsgQueued:+ stats.Queued = count+ case models.CampaignMsgSent:+ stats.Sent = count+ case models.CampaignMsgFailed:+ stats.Failed = count+ case models.CampaignMsgSkipped:+ stats.Skipped = count+ }+ }+ return stats+}diff --git a/internal/handlers/contact_handler.go b/internal/handlers/contact_handler.goindex cbdbf9b..5eef222 100644--- a/internal/handlers/contact_handler.go+++ b/internal/handlers/contact_handler.go@@ -19,8 +19,8 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type ContactHandler struct {@@ -44,10 +44,10 @@ type ListContactsRequest struct {}func (h *ContactHandler) List(c *okapi.Context, req *ListContactsRequest) error {- userID := c.GetInt("user_id")+ scope := getScope(c)page, size, offset := normalizePageParams(req.Page, req.Size)- contacts, total, err := h.repo.FindByUserID(uint(userID), req.Search, size, offset)+ contacts, total, err := h.repo.FindByScope(scope, req.Search, size, offset)if err != nil {return c.AbortInternalServerError("failed to list contacts")}@@ -60,7 +60,7 @@ func (h *ContactHandler) List(c *okapi.Context, req *ListContactsRequest) errorsuppressedSet := make(map[string]bool)if len(emails) > 0 {- unsuppressed, err := h.suppressionRepo.FilterSuppressed(uint(userID), emails)+ unsuppressed, err := h.suppressionRepo.FilterSuppressed(scope, emails)if err == nil {unsuppressedSet := make(map[string]bool, len(unsuppressed))for _, e := range unsuppressed {@@ -86,16 +86,15 @@ func (h *ContactHandler) List(c *okapi.Context, req *ListContactsRequest) error}func (h *ContactHandler) Get(c *okapi.Context, req *GetByIDRequest) error {- userID := c.GetInt("user_id")-contact, err := h.repo.FindByID(uint(req.ID))- if err != nil || contact.UserID != uint(userID) {+ if err != nil || !ownsResource(c, contact.UserID, contact.WorkspaceID) {return c.AbortNotFound("contact not found")}- // Check suppression status+ // Check suppression status using the contact's own scope+ contactScope := repositories.ResourceScope{UserID: contact.UserID, WorkspaceID: contact.WorkspaceID}suppressed := false- unsuppressed, err := h.suppressionRepo.FilterSuppressed(uint(userID), []string{contact.Email})+ unsuppressed, err := h.suppressionRepo.FilterSuppressed(contactScope, []string{contact.Email})if err == nil {suppressed = len(unsuppressed) == 0}diff --git a/internal/handlers/contact_list_handler.go b/internal/handlers/contact_list_handler.goindex e605ac6..8f70199 100644--- a/internal/handlers/contact_list_handler.go+++ b/internal/handlers/contact_list_handler.go@@ -19,8 +19,8 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type ContactListHandler struct {@@ -73,9 +73,13 @@ type ContactListWithCount struct {}func (h *ContactListHandler) Create(c *okapi.Context, req *CreateContactListRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)list := &models.ContactList{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,Name: req.Body.Name,Description: req.Body.Description,}@@ -86,9 +90,8 @@ func (h *ContactListHandler) Create(c *okapi.Context, req *CreateContactListRequ}func (h *ContactListHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- lists, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ lists, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list contact lists")}@@ -106,9 +109,11 @@ func (h *ContactListHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *ContactListHandler) Update(c *okapi.Context, req *UpdateContactListRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }list, err := h.repo.FindByID(uint(req.ID))- if err != nil || list.UserID != uint(userID) {+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {return c.AbortNotFound("contact list not found")}list.Name = req.Body.Name@@ -120,9 +125,11 @@ func (h *ContactListHandler) Update(c *okapi.Context, req *UpdateContactListRequ}func (h *ContactListHandler) Delete(c *okapi.Context, req *GetByIDRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }list, err := h.repo.FindByID(uint(req.ID))- if err != nil || list.UserID != uint(userID) {+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {return c.AbortNotFound("contact list not found")}if err := h.repo.Delete(list.ID); err != nil {@@ -132,9 +139,11 @@ func (h *ContactListHandler) Delete(c *okapi.Context, req *GetByIDRequest) error}func (h *ContactListHandler) AddMember(c *okapi.Context, req *AddMemberRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }list, err := h.repo.FindByID(uint(req.ID))- if err != nil || list.UserID != uint(userID) {+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {return c.AbortNotFound("contact list not found")}member := &models.ContactListMember{@@ -149,9 +158,11 @@ func (h *ContactListHandler) AddMember(c *okapi.Context, req *AddMemberRequest)}func (h *ContactListHandler) RemoveMember(c *okapi.Context, req *RemoveMemberRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }list, err := h.repo.FindByID(uint(req.ID))- if err != nil || list.UserID != uint(userID) {+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {return c.AbortNotFound("contact list not found")}if err := h.repo.RemoveMember(list.ID, req.Body.Email); err != nil {@@ -161,9 +172,8 @@ func (h *ContactListHandler) RemoveMember(c *okapi.Context, req *RemoveMemberReq}func (h *ContactListHandler) ListMembers(c *okapi.Context, req *ListMembersRequest) error {- userID := c.GetInt("user_id")list, err := h.repo.FindByID(uint(req.ID))- if err != nil || list.UserID != uint(userID) {+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {return c.AbortNotFound("contact list not found")}page, size, offset := normalizePageParams(req.Page, req.Size)diff --git a/internal/handlers/cron_handler.go b/internal/handlers/cron_handler.goindex 4e9d9c1..08d8481 100644--- a/internal/handlers/cron_handler.go+++ b/internal/handlers/cron_handler.go@@ -19,7 +19,7 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/cron"+ "github.com/goposta/posta/internal/cron")// CronHandler exposes cron job status to admin users.diff --git a/internal/handlers/dashboard_handler.go b/internal/handlers/dashboard_handler.goindex 6292c27..1ed0ff8 100644--- a/internal/handlers/dashboard_handler.go+++ b/internal/handlers/dashboard_handler.go@@ -21,9 +21,9 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/cache"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/cache"+ "github.com/goposta/posta/internal/storage/repositories""gorm.io/gorm")@@ -49,7 +49,6 @@ type DashboardStats struct {TotalBounces int64 `json:"total_bounces"`TotalSuppressions int64 `json:"total_suppressions"`TotalWebhooks int64 `json:"total_webhooks"`- TotalContactLists int64 `json:"total_contact_lists"`DailyVolume []DailyVolume `json:"daily_volume"`// Webhook delivery stats@@ -67,38 +66,45 @@ func NewDashboardHandler(db *gorm.DB, c *cache.Cache, whDeliveryRepo *repositori}func (h *DashboardHandler) Stats(c *okapi.Context) error {- userID := c.GetInt("user_id")+ scope := getScope(c)ctx := c.Request().Context()// Try cache first- cacheKey := cache.DashboardKey(userID)+ scopeKey := int(scope.UserID)+ if scope.WorkspaceID != nil {+ scopeKey = int(*scope.WorkspaceID) + 1000000+ }+ cacheKey := cache.DashboardKey(scopeKey)var stats DashboardStatsif h.cache.Get(ctx, cacheKey, &stats) {return ok(c, stats)}+ applyScope := func(model interface{}) *gorm.DB {+ return repositories.ApplyScope(h.db.Model(model), scope)+ }+// Email counts by status- h.db.Model(&models.Email{}).Where("user_id = ?", userID).Count(&stats.TotalEmails)- h.db.Model(&models.Email{}).Where("user_id = ? AND status = ?", userID, models.EmailStatusQueued).Count(&stats.QueuedEmails)- h.db.Model(&models.Email{}).Where("user_id = ? AND status = ?", userID, models.EmailStatusProcessing).Count(&stats.ProcessingEmails)- h.db.Model(&models.Email{}).Where("user_id = ? AND status = ?", userID, models.EmailStatusSent).Count(&stats.SentEmails)- h.db.Model(&models.Email{}).Where("user_id = ? AND status = ?", userID, models.EmailStatusFailed).Count(&stats.FailedEmails)- h.db.Model(&models.Email{}).Where("user_id = ? AND status = ?", userID, models.EmailStatusSuppressed).Count(&stats.SuppressedEmails)+ applyScope(&models.Email{}).Count(&stats.TotalEmails)+ applyScope(&models.Email{}).Where("status = ?", models.EmailStatusQueued).Count(&stats.QueuedEmails)+ applyScope(&models.Email{}).Where("status = ?", models.EmailStatusProcessing).Count(&stats.ProcessingEmails)+ applyScope(&models.Email{}).Where("status = ?", models.EmailStatusSent).Count(&stats.SentEmails)+ applyScope(&models.Email{}).Where("status = ?", models.EmailStatusFailed).Count(&stats.FailedEmails)+ applyScope(&models.Email{}).Where("status = ?", models.EmailStatusSuppressed).Count(&stats.SuppressedEmails)// Infrastructure counts- h.db.Model(&models.Domain{}).Where("user_id = ?", userID).Count(&stats.TotalDomains)- h.db.Model(&models.SMTPServer{}).Where("user_id = ?", userID).Count(&stats.TotalSmtpServers)+ applyScope(&models.Domain{}).Count(&stats.TotalDomains)+ applyScope(&models.SMTPServer{}).Count(&stats.TotalSmtpServers)// API keys- h.db.Model(&models.APIKey{}).Where("user_id = ?", userID).Count(&stats.TotalAPIKeys)- h.db.Model(&models.APIKey{}).Where("user_id = ? AND revoked = false AND (expires_at IS NULL OR expires_at > ?)", userID, time.Now()).Count(&stats.ActiveAPIKeys)+ applyScope(&models.APIKey{}).Count(&stats.TotalAPIKeys)+ applyScope(&models.APIKey{}).Where("revoked = false AND (expires_at IS NULL OR expires_at > ?)", time.Now()).Count(&stats.ActiveAPIKeys)// Contacts & deliverability- h.db.Model(&models.Contact{}).Where("user_id = ?", userID).Count(&stats.TotalContacts)- h.db.Model(&models.Bounce{}).Where("user_id = ?", userID).Count(&stats.TotalBounces)- h.db.Model(&models.Suppression{}).Where("user_id = ?", userID).Count(&stats.TotalSuppressions)- h.db.Model(&models.Webhook{}).Where("user_id = ?", userID).Count(&stats.TotalWebhooks)- h.db.Model(&models.ContactList{}).Where("user_id = ?", userID).Count(&stats.TotalContactLists)+ applyScope(&models.Contact{}).Count(&stats.TotalContacts)+ applyScope(&models.Bounce{}).Count(&stats.TotalBounces)+ applyScope(&models.Suppression{}).Count(&stats.TotalSuppressions)+ applyScope(&models.Webhook{}).Count(&stats.TotalWebhooks)// Failure rateif stats.TotalEmails > 0 {@@ -106,7 +112,7 @@ func (h *DashboardHandler) Stats(c *okapi.Context) error {}// Webhook delivery stats- if whStats, err := h.whDeliveryRepo.StatsByUserID(uint(userID)); err == nil {+ if whStats, err := h.whDeliveryRepo.StatsByScope(scope); err == nil {stats.WebhookDeliveries = whStats}@@ -118,9 +124,9 @@ func (h *DashboardHandler) Stats(c *okapi.Context) error {Count int64}var rows []dailyRow- h.db.Model(&models.Email{}).+ applyScope(&models.Email{}).Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, status, COUNT(*) as count").- Where("user_id = ? AND created_at >= ? AND status IN ?", userID, since, []string{string(models.EmailStatusSent), string(models.EmailStatusFailed)}).+ Where("created_at >= ? AND status IN ?", since, []string{string(models.EmailStatusSent), string(models.EmailStatusFailed)}).Group("date, status").Order("date").Find(&rows)diff --git a/internal/handlers/data_export.go b/internal/handlers/data_export.gonew file mode 100644index 0000000..f96231d--- /dev/null+++ b/internal/handlers/data_export.go@@ -0,0 +1,546 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm"+)++// exportLimit is the maximum number of records to export per resource type.+const exportLimit = 10000+++type ExportStyleSheet struct {+ Name string `json:"name"`+ CSS string `json:"css"`+}++type ExportLanguage struct {+ Code string `json:"code"`+ Name string `json:"name"`+}++type ExportContact struct {+ Email string `json:"email"`+ Name string `json:"name"`+ SentCount int64 `json:"sent_count"`+ FailCount int64 `json:"fail_count"`+}++type ExportContactList struct {+ Name string `json:"name"`+ Description string `json:"description"`+ Members []ExportContactListMember `json:"members"`+}++type ExportContactListMember struct {+ Email string `json:"email"`+ Name string `json:"name"`+ Data string `json:"data,omitempty"`+}++type ExportSuppression struct {+ Email string `json:"email"`+ Reason string `json:"reason"`+}++type ExportWebhook struct {+ URL string `json:"url"`+ Events []string `json:"events"`+ Filters []string `json:"filters,omitempty"`+}++type ExportSMTPServer struct {+ Host string `json:"host"`+ Port int `json:"port"`+ Username string `json:"username"`+ Encryption string `json:"encryption"`+ MaxRetries int `json:"max_retries"`+ AllowedEmails []string `json:"allowed_emails,omitempty"`+}++type ExportDomain struct {+ Domain string `json:"domain"`+}++type ExportSubscriber struct {+ Email string `json:"email"`+ Name string `json:"name"`+ Status string `json:"status"`+ CustomFields map[string]interface{} `json:"custom_fields,omitempty"`+ Timezone string `json:"timezone,omitempty"`+ Language string `json:"language,omitempty"`+}++type ExportSubscriberList struct {+ Name string `json:"name"`+ Description string `json:"description"`+ Type string `json:"type"`+ FilterRules []models.FilterRule `json:"filter_rules,omitempty"`+}++type ExportUserSettings struct {+ Timezone string `json:"timezone"`+ DefaultSenderName string `json:"default_sender_name"`+ DefaultSenderEmail string `json:"default_sender_email"`+ EmailNotifications bool `json:"email_notifications"`+ NotificationEmail string `json:"notification_email"`+ WebhookRetryCount int `json:"webhook_retry_count"`+ APIKeyExpiryDays int `json:"api_key_expiry_days"`+ BounceAutoSuppress bool `json:"bounce_auto_suppress"`+ DailyReport bool `json:"daily_report"`+}++type ExportWorkspaceSettings struct {+ Name string `json:"name"`+ Description string `json:"description"`+ DefaultLanguage string `json:"default_language"`+}+++func exportTemplates(+ templates []models.Template,+ versionRepo *repositories.TemplateVersionRepository,+ localizationRepo *repositories.TemplateLocalizationRepository,+) ([]TemplateExport, error) {+ result := make([]TemplateExport, 0, len(templates))+ for _, tmpl := range templates {+ versions, err := versionRepo.FindByTemplateID(tmpl.ID)+ if err != nil {+ return nil, err+ }++ exportVersions := make([]ExportVersion, 0, len(versions))+ for _, v := range versions {+ localizations, err := localizationRepo.FindByVersionID(v.ID)+ if err != nil {+ return nil, err+ }++ exportLocs := make([]ExportLocalization, 0, len(localizations))+ for _, l := range localizations {+ exportLocs = append(exportLocs, ExportLocalization{+ Language: l.Language,+ SubjectTemplate: l.SubjectTemplate,+ HTMLTemplate: l.HTMLTemplate,+ TextTemplate: l.TextTemplate,+ })+ }++ isActive := tmpl.ActiveVersionID != nil && *tmpl.ActiveVersionID == v.ID+ exportVersions = append(exportVersions, ExportVersion{+ Version: v.Version,+ SampleData: v.SampleData,+ IsActive: isActive,+ Localizations: exportLocs,+ })+ }++ result = append(result, TemplateExport{+ Name: tmpl.Name,+ Description: tmpl.Description,+ DefaultLanguage: tmpl.DefaultLanguage,+ SampleData: tmpl.SampleData,+ Versions: exportVersions,+ })+ }+ return result, nil+}++func exportStylesheets(stylesheets []models.StyleSheet) []ExportStyleSheet {+ result := make([]ExportStyleSheet, 0, len(stylesheets))+ for _, ss := range stylesheets {+ result = append(result, ExportStyleSheet{Name: ss.Name, CSS: ss.CSS})+ }+ return result+}++func exportLanguages(languages []models.Language) []ExportLanguage {+ result := make([]ExportLanguage, 0, len(languages))+ for _, l := range languages {+ result = append(result, ExportLanguage{Code: l.Code, Name: l.Name})+ }+ return result+}++func exportContacts(contacts []models.Contact) []ExportContact {+ result := make([]ExportContact, 0, len(contacts))+ for _, c := range contacts {+ result = append(result, ExportContact{+ Email: c.Email, Name: c.Name,+ SentCount: c.SentCount, FailCount: c.FailCount,+ })+ }+ return result+}++func exportContactLists(contactLists []models.ContactList, db *gorm.DB) []ExportContactList {+ result := make([]ExportContactList, 0, len(contactLists))+ for _, cl := range contactLists {+ var members []models.ContactListMember+ db.Where("list_id = ?", cl.ID).Find(&members)++ exportMembers := make([]ExportContactListMember, 0, len(members))+ for _, m := range members {+ exportMembers = append(exportMembers, ExportContactListMember{+ Email: m.Email, Name: m.Name, Data: m.Data,+ })+ }+ result = append(result, ExportContactList{+ Name: cl.Name, Description: cl.Description, Members: exportMembers,+ })+ }+ return result+}++func exportSuppressions(suppressions []models.Suppression) []ExportSuppression {+ result := make([]ExportSuppression, 0, len(suppressions))+ for _, s := range suppressions {+ result = append(result, ExportSuppression{Email: s.Email, Reason: s.Reason})+ }+ return result+}++func exportWebhooks(webhooks []models.Webhook) []ExportWebhook {+ result := make([]ExportWebhook, 0, len(webhooks))+ for _, wh := range webhooks {+ result = append(result, ExportWebhook{+ URL: wh.URL, Events: wh.Events, Filters: wh.Filters,+ })+ }+ return result+}++func exportSMTPServers(servers []models.SMTPServer) []ExportSMTPServer {+ result := make([]ExportSMTPServer, 0, len(servers))+ for _, s := range servers {+ result = append(result, ExportSMTPServer{+ Host: s.Host, Port: s.Port, Username: s.Username,+ Encryption: s.Encryption, MaxRetries: s.MaxRetries,+ AllowedEmails: s.AllowedEmails,+ })+ }+ return result+}++func exportDomains(domains []models.Domain) []ExportDomain {+ result := make([]ExportDomain, 0, len(domains))+ for _, d := range domains {+ result = append(result, ExportDomain{Domain: d.Domain})+ }+ return result+}++func exportSubscribers(subscribers []models.Subscriber) []ExportSubscriber {+ result := make([]ExportSubscriber, 0, len(subscribers))+ for _, s := range subscribers {+ result = append(result, ExportSubscriber{+ Email: s.Email, Name: s.Name, Status: string(s.Status),+ CustomFields: s.CustomFields, Timezone: s.Timezone, Language: s.Language,+ })+ }+ return result+}++func exportSubscriberLists(lists []models.SubscriberList) []ExportSubscriberList {+ result := make([]ExportSubscriberList, 0, len(lists))+ for _, sl := range lists {+ result = append(result, ExportSubscriberList{+ Name: sl.Name, Description: sl.Description,+ Type: string(sl.Type), FilterRules: sl.FilterRules,+ })+ }+ return result+}+++func importTemplates(+ data []TemplateExport,+ userID uint,+ workspaceID *uint,+ templateRepo *repositories.TemplateRepository,+ versionRepo *repositories.TemplateVersionRepository,+ localizationRepo *repositories.TemplateLocalizationRepository,+) int {+ var count int+ for _, tmplData := range data {+ if tmplData.Name == "" {+ continue+ }++ defaultLang := tmplData.DefaultLanguage+ if defaultLang == "" {+ defaultLang = "en"+ }++ tmpl := &models.Template{+ UserID: userID,+ WorkspaceID: workspaceID,+ Name: tmplData.Name,+ DefaultLanguage: defaultLang,+ Description: tmplData.Description,+ SampleData: tmplData.SampleData,+ }+ if err := templateRepo.Create(tmpl); err != nil {+ continue+ }++ var activeVersionDBID *uint+ for _, ev := range tmplData.Versions {+ nextVersion, err := versionRepo.NextVersion(tmpl.ID)+ if err != nil {+ continue+ }+ v := &models.TemplateVersion{+ TemplateID: tmpl.ID,+ Version: nextVersion,+ SampleData: ev.SampleData,+ }+ if err := versionRepo.Create(v); err != nil {+ continue+ }+ if ev.IsActive {+ activeVersionDBID = &v.ID+ }+ for _, el := range ev.Localizations {+ _ = localizationRepo.Create(&models.TemplateLocalization{+ VersionID: v.ID,+ Language: el.Language,+ SubjectTemplate: el.SubjectTemplate,+ HTMLTemplate: el.HTMLTemplate,+ TextTemplate: el.TextTemplate,+ })+ }+ }++ if len(tmplData.Versions) == 0 {+ v := &models.TemplateVersion{+ TemplateID: tmpl.ID, Version: 1, SampleData: tmplData.SampleData,+ }+ if err := versionRepo.Create(v); err == nil {+ activeVersionDBID = &v.ID+ }+ }++ if activeVersionDBID != nil {+ tmpl.ActiveVersionID = activeVersionDBID+ _ = templateRepo.Update(tmpl)+ }+ count+++ }+ return count+}++func importLanguages(data []ExportLanguage, userID uint, workspaceID *uint, repo *repositories.LanguageRepository) int {+ var count int+ for _, lang := range data {+ if lang.Code == "" || lang.Name == "" {+ continue+ }+ if err := repo.Create(&models.Language{+ UserID: userID, WorkspaceID: workspaceID,+ Code: lang.Code, Name: lang.Name,+ }); err != nil {+ continue+ }+ count+++ }+ return count+}++func importStylesheets(data []ExportStyleSheet, userID uint, workspaceID *uint, repo *repositories.StyleSheetRepository) int {+ var count int+ for _, ss := range data {+ if ss.Name == "" {+ continue+ }+ if err := repo.Create(&models.StyleSheet{+ UserID: userID, WorkspaceID: workspaceID,+ Name: ss.Name, CSS: ss.CSS,+ }); err != nil {+ continue+ }+ count+++ }+ return count+}++func importContacts(data []ExportContact, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, ct := range data {+ if ct.Email == "" {+ continue+ }+ if err := db.Create(&models.Contact{+ UserID: userID, WorkspaceID: workspaceID,+ Email: ct.Email, Name: ct.Name,+ SentCount: ct.SentCount, FailCount: ct.FailCount,+ }).Error; err != nil {+ continue+ }+ count+++ }+ return count+}++func importContactLists(data []ExportContactList, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, cl := range data {+ if cl.Name == "" {+ continue+ }+ list := &models.ContactList{+ UserID: userID, WorkspaceID: workspaceID,+ Name: cl.Name, Description: cl.Description,+ }+ if err := db.Create(list).Error; err != nil {+ continue+ }+ for _, m := range cl.Members {+ if m.Email == "" {+ continue+ }+ db.Create(&models.ContactListMember{+ ListID: list.ID, Email: m.Email, Name: m.Name, Data: m.Data,+ })+ }+ count+++ }+ return count+}++func importSuppressions(data []ExportSuppression, userID uint, workspaceID *uint, repo *repositories.SuppressionRepository) int {+ var count int+ for _, s := range data {+ if s.Email == "" {+ continue+ }+ if err := repo.Create(&models.Suppression{+ UserID: userID, WorkspaceID: workspaceID,+ Email: s.Email, Reason: s.Reason,+ }); err != nil {+ continue+ }+ count+++ }+ return count+}++func importWebhooks(data []ExportWebhook, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, wh := range data {+ if wh.URL == "" {+ continue+ }+ if err := db.Create(&models.Webhook{+ UserID: userID, WorkspaceID: workspaceID,+ URL: wh.URL, Events: wh.Events, Filters: wh.Filters,+ }).Error; err != nil {+ continue+ }+ count+++ }+ return count+}++func importSMTPServers(data []ExportSMTPServer, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, s := range data {+ if s.Host == "" {+ continue+ }+ if err := db.Create(&models.SMTPServer{+ UserID: userID, WorkspaceID: workspaceID,+ Host: s.Host, Port: s.Port, Username: s.Username,+ Encryption: s.Encryption, MaxRetries: s.MaxRetries,+ AllowedEmails: s.AllowedEmails,+ Status: models.SMTPStatusDisabled,+ }).Error; err != nil {+ continue+ }+ count+++ }+ return count+}++func importDomains(data []ExportDomain, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, d := range data {+ if d.Domain == "" {+ continue+ }+ token, err := generateToken()+ if err != nil {+ continue+ }+ if err := db.Create(&models.Domain{+ UserID: userID, WorkspaceID: workspaceID,+ Domain: d.Domain, VerificationToken: token,+ }).Error; err != nil {+ continue+ }+ count+++ }+ return count+}++func importSubscribers(data []ExportSubscriber, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, sub := range data {+ if sub.Email == "" {+ continue+ }+ status := models.SubscriberStatus(sub.Status)+ if status == "" {+ status = models.SubscriberStatusSubscribed+ }+ if err := db.Create(&models.Subscriber{+ UserID: userID, WorkspaceID: workspaceID,+ Email: sub.Email, Name: sub.Name, Status: status,+ CustomFields: sub.CustomFields, Timezone: sub.Timezone, Language: sub.Language,+ }).Error; err != nil {+ continue+ }+ count+++ }+ return count+}++func importSubscriberLists(data []ExportSubscriberList, userID uint, workspaceID *uint, db *gorm.DB) int {+ var count int+ for _, sl := range data {+ if sl.Name == "" {+ continue+ }+ listType := models.SubscriberListType(sl.Type)+ if listType == "" {+ listType = models.SubscriberListTypeStatic+ }+ if err := db.Create(&models.SubscriberList{+ UserID: userID, WorkspaceID: workspaceID,+ Name: sl.Name, Description: sl.Description,+ Type: listType, FilterRules: sl.FilterRules,+ }).Error; err != nil {+ continue+ }+ count+++ }+ return count+}diff --git a/internal/handlers/domain_handler.go b/internal/handlers/domain_handler.goindex 0ec6688..e8c4519 100644--- a/internal/handlers/domain_handler.go+++ b/internal/handlers/domain_handler.go@@ -22,13 +22,16 @@ import ("encoding/hex""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/domain"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/domain"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm")type DomainHandler struct {- repo *repositories.DomainRepository+ repo *repositories.DomainRepository+ quota QuotaChecker+ db *gorm.DB}type CreateDomainRequest struct {Body struct {@@ -53,8 +56,23 @@ func NewDomainHandler(repo *repositories.DomainRepository) *DomainHandler {return &DomainHandler{repo: repo}}+// SetQuota sets the quota checker for plan-based resource limits.+func (h *DomainHandler) SetQuota(q QuotaChecker, db *gorm.DB) {+ h.quota = q+ h.db = db+}+func (h *DomainHandler) Create(c *okapi.Context, req *CreateDomainRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ if h.quota != nil {+ if err := h.quota.CheckQuota(h.db, scope.WorkspaceID, "domains"); err != nil {+ return c.AbortForbidden(err.Error())+ }+ }token, err := generateVerificationToken()if err != nil {@@ -62,7 +80,8 @@ func (h *DomainHandler) Create(c *okapi.Context, req *CreateDomainRequest) error}d := &models.Domain{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,Domain: req.Body.Domain,VerificationToken: token,}@@ -78,10 +97,9 @@ func (h *DomainHandler) Create(c *okapi.Context, req *CreateDomainRequest) error}func (h *DomainHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- domains, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ domains, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list domains")}@@ -90,10 +108,8 @@ func (h *DomainHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *DomainHandler) Get(c *okapi.Context, req *GetDomainRequest) error {- userID := c.GetInt("user_id")-d, err := h.repo.FindByID(uint(req.ID))- if err != nil || d.UserID != uint(userID) {+ if err != nil || !ownsResource(c, d.UserID, d.WorkspaceID) {return c.AbortNotFound("domain not found")}@@ -104,10 +120,11 @@ func (h *DomainHandler) Get(c *okapi.Context, req *GetDomainRequest) error {}func (h *DomainHandler) Delete(c *okapi.Context, req *DeleteDomainRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }d, err := h.repo.FindByID(uint(req.ID))- if err != nil || d.UserID != uint(userID) {+ if err != nil || !ownsResource(c, d.UserID, d.WorkspaceID) {return c.AbortNotFound("domain not found")}@@ -119,10 +136,11 @@ func (h *DomainHandler) Delete(c *okapi.Context, req *DeleteDomainRequest) error}func (h *DomainHandler) Verify(c *okapi.Context, req *VerifyDomainRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }d, err := h.repo.FindByID(uint(req.ID))- if err != nil || d.UserID != uint(userID) {+ if err != nil || !ownsResource(c, d.UserID, d.WorkspaceID) {return c.AbortNotFound("domain not found")}diff --git a/internal/handlers/email_handler.go b/internal/handlers/email_handler.goindex db96efa..641e4f0 100644--- a/internal/handlers/email_handler.go+++ b/internal/handlers/email_handler.go@@ -22,12 +22,12 @@ import ("strings""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/cache"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/services/eventbus"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/cache"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/storage/repositories")type EmailHandler struct {@@ -81,7 +81,8 @@ func (h *EmailHandler) redactContent() bool {type PreviewEmailRequest struct {Body struct {- Template string `json:"template" required:"true" doc:"Template name"`+ TemplateID *uint `json:"template_id,omitempty" doc:"Template ID (preferred)"`+ Template string `json:"template" doc:"Template name (fallback when template_id is not provided)"`Language string `json:"language" doc:"Language code for localization"`TemplateData map[string]any `json:"template_data" doc:"Variables to inject into the template"`} `json:"body"`@@ -94,9 +95,9 @@ type PreviewEmailResponse struct {}func (h *EmailHandler) Preview(c *okapi.Context, req *PreviewEmailRequest) error {- userID := c.GetInt("user_id")+ scope := getScope(c)- rendered, err := h.service.RenderTemplate(uint(userID), req.Body.Template, req.Body.Language, req.Body.TemplateData)+ rendered, err := h.service.RenderTemplate(scope.UserID, scope.WorkspaceID, req.Body.TemplateID, req.Body.Template, req.Body.Language, req.Body.TemplateData)if err != nil {return c.AbortBadRequest(err.Error())}@@ -122,15 +123,19 @@ func redactEmails(emails []models.Email) {}func (h *EmailHandler) Send(c *okapi.Context, req *SendEmailRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }userID := c.GetInt("user_id")userEmail := c.GetString("user_email")+ scope := getScope(c)if req.DryRun {- return h.handleDryRun(c, userID, userEmail, req)+ return h.handleDryRun(c, userID, scope.WorkspaceID, userEmail, req)}apiKeyID := c.GetInt("api_key_id")- resp, err := h.service.Send(c.Request().Context(), uint(userID), uint(apiKeyID), userEmail, &req.Body)+ resp, err := h.service.Send(c.Request().Context(), uint(userID), uint(apiKeyID), scope.WorkspaceID, userEmail, &req.Body)if err != nil {if isRateLimitError(err) {return c.AbortTooManyRequests(err.Error())@@ -154,8 +159,8 @@ func (h *EmailHandler) Send(c *okapi.Context, req *SendEmailRequest) error {return ok(c, resp)}-func (h *EmailHandler) handleDryRun(c *okapi.Context, userID int, userEmail string, req *SendEmailRequest) error {- resp, err := h.service.ValidateSend(c.Request().Context(), uint(userID), userEmail, &req.Body)+func (h *EmailHandler) handleDryRun(c *okapi.Context, userID int, workspaceID *uint, userEmail string, req *SendEmailRequest) error {+ resp, err := h.service.ValidateSend(c.Request().Context(), uint(userID), workspaceID, userEmail, &req.Body)if err != nil {if isRateLimitError(err) {return c.AbortTooManyRequests(err.Error())@@ -169,11 +174,15 @@ func (h *EmailHandler) handleDryRun(c *okapi.Context, userID int, userEmail stri}func (h *EmailHandler) SendWithTemplate(c *okapi.Context, req *SendTemplateEmailRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }userID := c.GetInt("user_id")userEmail := c.GetString("user_email")+ scope := getScope(c)if req.DryRun {- resp, err := h.service.ValidateSendWithTemplate(c.Request().Context(), uint(userID), userEmail, &req.Body)+ resp, err := h.service.ValidateSendWithTemplate(c.Request().Context(), uint(userID), scope.WorkspaceID, userEmail, &req.Body)if err != nil {if isRateLimitError(err) {return c.AbortTooManyRequests(err.Error())@@ -187,7 +196,7 @@ func (h *EmailHandler) SendWithTemplate(c *okapi.Context, req *SendTemplateEmail}apiKeyID := c.GetInt("api_key_id")- resp, err := h.service.SendWithTemplate(c.Request().Context(), uint(userID), uint(apiKeyID), userEmail, &req.Body)+ resp, err := h.service.SendWithTemplate(c.Request().Context(), uint(userID), uint(apiKeyID), scope.WorkspaceID, userEmail, &req.Body)if err != nil {if isRateLimitError(err) {return c.AbortTooManyRequests(err.Error())@@ -211,11 +220,15 @@ func (h *EmailHandler) SendWithTemplate(c *okapi.Context, req *SendTemplateEmail}func (h *EmailHandler) SendBatch(c *okapi.Context, req *SendBatchEmailRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }userID := c.GetInt("user_id")userEmail := c.GetString("user_email")+ scope := getScope(c)if req.DryRun {- resp, err := h.service.ValidateSendBatch(c.Request().Context(), uint(userID), userEmail, &req.Body)+ resp, err := h.service.ValidateSendBatch(c.Request().Context(), uint(userID), scope.WorkspaceID, userEmail, &req.Body)if err != nil {if isRateLimitError(err) {return c.AbortTooManyRequests(err.Error())@@ -226,7 +239,7 @@ func (h *EmailHandler) SendBatch(c *okapi.Context, req *SendBatchEmailRequest) e}apiKeyID := c.GetInt("api_key_id")- resp, err := h.service.SendBatch(c.Request().Context(), uint(userID), uint(apiKeyID), userEmail, &req.Body)+ resp, err := h.service.SendBatch(c.Request().Context(), uint(userID), uint(apiKeyID), scope.WorkspaceID, userEmail, &req.Body)if err != nil {if isRateLimitError(err) {return c.AbortTooManyRequests(err.Error())@@ -261,10 +274,9 @@ func normalizePageParams(page, size int) (int, int, int) {}func (h *EmailHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- emails, total, err := h.emailRepo.FindByUserID(uint(userID), size, offset)+ emails, total, err := h.emailRepo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list emails")}@@ -278,12 +290,7 @@ 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)- if err != nil {- return c.AbortNotFound("email not found")- }-- userID := c.GetInt("user_id")- if em.UserID != uint(userID) {+ if err != nil || !ownsResource(c, em.UserID, em.WorkspaceID) {return c.AbortNotFound("email not found")}@@ -307,12 +314,7 @@ type EmailStatusResponse struct {// GetStatus returns only the delivery status of an email (owner only).func (h *EmailHandler) GetStatus(c *okapi.Context, req *GetEmailRequest) error {em, err := h.emailRepo.FindByUUID(req.ID)- if err != nil {- return c.AbortNotFound("email not found")- }-- userID := c.GetInt("user_id")- if em.UserID != uint(userID) {+ if err != nil || !ownsResource(c, em.UserID, em.WorkspaceID) {return c.AbortNotFound("email not found")}@@ -334,7 +336,8 @@ func (h *EmailHandler) GetStatus(c *okapi.Context, req *GetEmailRequest) error {// Retry re-enqueues a failed email for another delivery attempt.func (h *EmailHandler) Retry(c *okapi.Context, req *GetEmailRequest) error {userID := c.GetInt("user_id")- resp, err := h.service.RetryEmail(req.ID, uint(userID))+ scope := getScope(c)+ resp, err := h.service.RetryEmail(req.ID, uint(userID), scope.WorkspaceID)if err != nil {if err.Error() == "email not found" {return c.AbortNotFound(err.Error())diff --git a/internal/handlers/event_handler.go b/internal/handlers/event_handler.goindex 3fd6fae..fdb5c08 100644--- a/internal/handlers/event_handler.go+++ b/internal/handlers/event_handler.go@@ -21,9 +21,9 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/eventbus"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/storage/repositories")type EventHandler struct {diff --git a/internal/handlers/helper.go b/internal/handlers/helper.goindex 75c77e8..ed5b164 100644--- a/internal/handlers/helper.go+++ b/internal/handlers/helper.go@@ -21,9 +21,18 @@ import ("net/http""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/dto"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm")+// QuotaChecker verifies that creating a resource would not exceed plan limits.+type QuotaChecker interface {+ CheckQuota(db *gorm.DB, workspaceID *uint, resource string) error+ CheckWorkspaceQuota(db *gorm.DB, userID uint) error+}+func ok[T any](c *okapi.Context, data T) error {return c.JSON(http.StatusOK, dto.Response[T]{Success: true,@@ -44,7 +53,52 @@ func noContent(c *okapi.Context) error {})}+// getScope extracts the ResourceScope from the request context.+// If workspace_id is set (via middleware), targets that workspace; otherwise personal.+func getScope(c *okapi.Context) repositories.ResourceScope {+ userID := uint(c.GetInt("user_id"))+ scope := repositories.ResourceScope{UserID: userID}+ wsID := c.GetInt("workspace_id")+ if wsID > 0 {+ wid := uint(wsID)+ scope.WorkspaceID = &wid+ }+ return scope+}++// ownsResource checks whether a resource belongs to the current scope.+func ownsResource(c *okapi.Context, resourceUserID uint, resourceWorkspaceID *uint) bool {+ return repositories.OwnsResource(getScope(c), resourceUserID, resourceWorkspaceID)+}++// workspaceRole returns the workspace role from context, or empty string if personal mode.+func workspaceRole(c *okapi.Context) models.WorkspaceRole {+ return models.WorkspaceRole(c.GetString("workspace_role"))+}++// canEditInWorkspace returns true if the user can create/modify resources.+// In personal mode, always allowed. In workspace mode, requires Editor+ role.+func canEditInWorkspace(c *okapi.Context) bool {+ role := workspaceRole(c)+ if role == "" {+ return true // personal mode+ }+ return role.CanEdit()+}++// requireEdit checks workspace edit permission and aborts with 403 if denied.+// Returns true if the request should be aborted (caller should return).+func requireEdit(c *okapi.Context) error {+ if !canEditInWorkspace(c) {+ return c.AbortForbidden("insufficient workspace permissions: editor role or higher required")+ }+ return nil+}+func paginated[T any](c *okapi.Context, items []T, total int64, page, size int) error {+ if items == nil {+ items = []T{}+ }totalPages := 0if size > 0 {totalPages = int((total + int64(size) - 1) / int64(size))diff --git a/internal/handlers/html_parser.go b/internal/handlers/html_parser.gonew file mode 100644index 0000000..f0da256--- /dev/null+++ b/internal/handlers/html_parser.go@@ -0,0 +1,73 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "regexp"+ "strings"+)++var styleBlockRegex = regexp.MustCompile(`(?is)<style[^>]*>(.*?)</style>`)++// extractStyleAndBody extracts CSS from <style> blocks and returns the cleaned HTML body.+// If the HTML contains a <body> tag, only the body content is returned.+// All <style> blocks are removed from the returned HTML.+func extractStyleAndBody(htmlContent string) (css string, body string) {+ // Extract all <style> block contents+ var cssBlocks []string+ matches := styleBlockRegex.FindAllStringSubmatch(htmlContent, -1)+ for _, m := range matches {+ if len(m) >= 2 {+ trimmed := strings.TrimSpace(m[1])+ if trimmed != "" {+ cssBlocks = append(cssBlocks, trimmed)+ }+ }+ }+ css = strings.Join(cssBlocks, "\n\n")++ // Remove <style> blocks from HTML+ cleaned := styleBlockRegex.ReplaceAllString(htmlContent, "")++ // Extract <body> content if present+ body = extractBody(cleaned)++ return css, body+}++var bodyRegex = regexp.MustCompile(`(?is)<body[^>]*>(.*)</body>`)++// extractBody extracts the inner content of the <body> tag.+// If no <body> tag is found, returns the full HTML (trimmed).+func extractBody(html string) string {+ m := bodyRegex.FindStringSubmatch(html)+ if len(m) >= 2 {+ return strings.TrimSpace(m[1])+ }+ return strings.TrimSpace(html)+}++// extractTitle extracts the content of the <title> tag, if present.+func extractTitle(html string) string {+ re := regexp.MustCompile(`(?is)<title[^>]*>(.*?)</title>`)+ m := re.FindStringSubmatch(html)+ if len(m) >= 2 {+ return strings.TrimSpace(m[1])+ }+ return ""+}diff --git a/internal/handlers/info_handler.go b/internal/handlers/info_handler.goindex fef0c47..4b31b12 100644--- a/internal/handlers/info_handler.go+++ b/internal/handlers/info_handler.go@@ -19,7 +19,7 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/config"+ "github.com/goposta/posta/internal/config")type AppInfo struct {diff --git a/internal/handlers/language_handler.go b/internal/handlers/language_handler.goindex dfe6605..478f7b2 100644--- a/internal/handlers/language_handler.go+++ b/internal/handlers/language_handler.go@@ -19,8 +19,8 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type LanguageHandler struct {@@ -28,15 +28,17 @@ type LanguageHandler struct {}type CreateLanguageRequest struct {Body struct {- Code string `json:"code" required:"true"`- Name string `json:"name" required:"true"`+ Code string `json:"code" required:"true"`+ Name string `json:"name" required:"true"`+ IsDefault bool `json:"is_default"`} `json:"body"`}type UpdateLanguageRequest struct {ID int `param:"id"`Body struct {- Code string `json:"code"`- Name string `json:"name"`+ Code string `json:"code"`+ Name string `json:"name"`+ IsDefault *bool `json:"is_default"`} `json:"body"`}type DeleteLanguageRequest struct {@@ -48,12 +50,22 @@ func NewLanguageHandler(repo *repositories.LanguageRepository) *LanguageHandler}func (h *LanguageHandler) Create(c *okapi.Context, req *CreateLanguageRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ // If marking as default, clear existing default first+ if req.Body.IsDefault {+ _ = h.repo.ClearDefault(scope)+ }l := &models.Language{- UserID: uint(userID),- Code: req.Body.Code,- Name: req.Body.Name,+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Code: req.Body.Code,+ Name: req.Body.Name,+ IsDefault: req.Body.IsDefault,}if err := h.repo.Create(l); err != nil {@@ -64,10 +76,11 @@ func (h *LanguageHandler) Create(c *okapi.Context, req *CreateLanguageRequest) e}func (h *LanguageHandler) Update(c *okapi.Context, req *UpdateLanguageRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }l, err := h.repo.FindByID(uint(req.ID))- if err != nil || l.UserID != uint(userID) {+ if err != nil || !ownsResource(c, l.UserID, l.WorkspaceID) {return c.AbortNotFound("language not found")}@@ -78,6 +91,16 @@ func (h *LanguageHandler) Update(c *okapi.Context, req *UpdateLanguageRequest) el.Name = req.Body.Name}+ // Handle default flag change+ if req.Body.IsDefault != nil {+ if *req.Body.IsDefault && !l.IsDefault {+ // Setting as default — clear others first+ scope := getScope(c)+ _ = h.repo.ClearDefault(scope)+ }+ l.IsDefault = *req.Body.IsDefault+ }+if err := h.repo.Update(l); err != nil {return c.AbortInternalServerError("failed to update language")}@@ -86,10 +109,11 @@ func (h *LanguageHandler) Update(c *okapi.Context, req *UpdateLanguageRequest) e}func (h *LanguageHandler) Delete(c *okapi.Context, req *DeleteLanguageRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }l, err := h.repo.FindByID(uint(req.ID))- if err != nil || l.UserID != uint(userID) {+ if err != nil || !ownsResource(c, l.UserID, l.WorkspaceID) {return c.AbortNotFound("language not found")}@@ -101,10 +125,9 @@ func (h *LanguageHandler) Delete(c *okapi.Context, req *DeleteLanguageRequest) e}func (h *LanguageHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- languages, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ languages, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list languages")}diff --git a/internal/handlers/oauth_admin_handler.go b/internal/handlers/oauth_admin_handler.gonew file mode 100644index 0000000..8f202bb--- /dev/null+++ b/internal/handlers/oauth_admin_handler.go@@ -0,0 +1,263 @@+package handlers++import (+ "strings"+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+)++type OAuthAdminHandler struct {+ providerRepo *repositories.OAuthProviderRepository+ ssoRepo *repositories.WorkspaceSSORepository+}++func NewOAuthAdminHandler(providerRepo *repositories.OAuthProviderRepository, ssoRepo *repositories.WorkspaceSSORepository) *OAuthAdminHandler {+ return &OAuthAdminHandler{providerRepo: providerRepo, ssoRepo: ssoRepo}+}+++type CreateOAuthProviderRequest struct {+ Body struct {+ Name string `json:"name" required:"true"`+ Slug string `json:"slug" required:"true"`+ Type string `json:"type" required:"true"`+ ClientID string `json:"client_id" required:"true"`+ ClientSecret string `json:"client_secret" required:"true"`+ Issuer string `json:"issuer"`+ AuthURL string `json:"auth_url"`+ TokenURL string `json:"token_url"`+ UserInfoURL string `json:"userinfo_url"`+ Scopes string `json:"scopes"`+ AutoRegister *bool `json:"auto_register"`+ AllowedDomains string `json:"allowed_domains"`+ } `json:"body"`+}++type UpdateOAuthProviderRequest struct {+ ID int `param:"id"`+ Body struct {+ Name string `json:"name"`+ ClientID string `json:"client_id"`+ ClientSecret string `json:"client_secret"`+ Issuer string `json:"issuer"`+ AuthURL string `json:"auth_url"`+ TokenURL string `json:"token_url"`+ UserInfoURL string `json:"userinfo_url"`+ Scopes string `json:"scopes"`+ Enabled *bool `json:"enabled"`+ AutoRegister *bool `json:"auto_register"`+ AllowedDomains string `json:"allowed_domains"`+ } `json:"body"`+}++type DeleteOAuthProviderRequest struct {+ ID int `param:"id"`+}++type OAuthProviderResponse struct {+ ID uint `json:"id"`+ Name string `json:"name"`+ Slug string `json:"slug"`+ Type string `json:"type"`+ Issuer string `json:"issuer"`+ Scopes string `json:"scopes"`+ Enabled bool `json:"enabled"`+ AutoRegister bool `json:"auto_register"`+ AllowedDomains string `json:"allowed_domains"`+ CreatedAt string `json:"created_at"`+}++type SetWorkspaceSSORequest struct {+ Body struct {+ ProviderID uint `json:"provider_id" required:"true"`+ EnforceSSO bool `json:"enforce_sso"`+ AutoProvision bool `json:"auto_provision"`+ AllowedDomains string `json:"allowed_domains"`+ } `json:"body"`+}++type WorkspaceSSOResponse struct {+ ProviderID uint `json:"provider_id"`+ ProviderName string `json:"provider_name"`+ EnforceSSO bool `json:"enforce_sso"`+ AutoProvision bool `json:"auto_provision"`+ AllowedDomains string `json:"allowed_domains"`+}+++func (h *OAuthAdminHandler) CreateProvider(c *okapi.Context, req *CreateOAuthProviderRequest) error {+ slug := strings.ToLower(strings.TrimSpace(req.Body.Slug))+ providerType := models.OAuthProviderType(req.Body.Type)+ if providerType != models.OAuthProviderGoogle && providerType != models.OAuthProviderOIDC {+ return c.AbortBadRequest("type must be 'google' or 'oidc'")+ }++ provider := &models.OAuthProvider{+ Name: strings.TrimSpace(req.Body.Name),+ Slug: slug,+ Type: providerType,+ ClientID: req.Body.ClientID,+ ClientSecret: req.Body.ClientSecret,+ Issuer: req.Body.Issuer,+ AuthURL: req.Body.AuthURL,+ TokenURL: req.Body.TokenURL,+ UserInfoURL: req.Body.UserInfoURL,+ Scopes: req.Body.Scopes,+ Enabled: true,+ AutoRegister: true,+ AllowedDomains: req.Body.AllowedDomains,+ }+ if req.Body.AutoRegister != nil {+ provider.AutoRegister = *req.Body.AutoRegister+ }+ if provider.Scopes == "" {+ provider.Scopes = "openid email profile"+ }++ if err := h.providerRepo.Create(provider); err != nil {+ return c.AbortConflict("provider slug already exists")+ }++ return created(c, toProviderResponse(provider))+}++func (h *OAuthAdminHandler) ListProviders(c *okapi.Context) error {+ providers, err := h.providerRepo.FindAll()+ if err != nil {+ return c.AbortInternalServerError("failed to list providers")+ }++ var result []OAuthProviderResponse+ for _, p := range providers {+ result = append(result, toProviderResponse(&p))+ }+ return ok(c, result)+}++func (h *OAuthAdminHandler) UpdateProvider(c *okapi.Context, req *UpdateOAuthProviderRequest) error {+ provider, err := h.providerRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("provider not found")+ }++ if req.Body.Name != "" {+ provider.Name = req.Body.Name+ }+ if req.Body.ClientID != "" {+ provider.ClientID = req.Body.ClientID+ }+ if req.Body.ClientSecret != "" {+ provider.ClientSecret = req.Body.ClientSecret+ }+ if req.Body.Issuer != "" {+ provider.Issuer = req.Body.Issuer+ }+ if req.Body.AuthURL != "" {+ provider.AuthURL = req.Body.AuthURL+ }+ if req.Body.TokenURL != "" {+ provider.TokenURL = req.Body.TokenURL+ }+ if req.Body.UserInfoURL != "" {+ provider.UserInfoURL = req.Body.UserInfoURL+ }+ if req.Body.Scopes != "" {+ provider.Scopes = req.Body.Scopes+ }+ if req.Body.AllowedDomains != "" {+ provider.AllowedDomains = req.Body.AllowedDomains+ }+ if req.Body.Enabled != nil {+ provider.Enabled = *req.Body.Enabled+ }+ if req.Body.AutoRegister != nil {+ provider.AutoRegister = *req.Body.AutoRegister+ }+ provider.UpdatedAt = time.Now()++ if err := h.providerRepo.Update(provider); err != nil {+ return c.AbortInternalServerError("failed to update provider")+ }++ return ok(c, toProviderResponse(provider))+}++func (h *OAuthAdminHandler) DeleteProvider(c *okapi.Context, req *DeleteOAuthProviderRequest) error {+ if err := h.providerRepo.Delete(uint(req.ID)); err != nil {+ return c.AbortNotFound("provider not found")+ }+ return noContent(c)+}+++func (h *OAuthAdminHandler) GetWorkspaceSSO(c *okapi.Context) error {+ wsID := c.GetInt("workspace_id")+ if wsID == 0 {+ return c.AbortBadRequest("workspace context required")+ }++ config, err := h.ssoRepo.FindByWorkspaceID(uint(wsID))+ if err != nil {+ return ok(c, (*WorkspaceSSOResponse)(nil))+ }++ return ok(c, WorkspaceSSOResponse{+ ProviderID: config.ProviderID,+ ProviderName: config.Provider.Name,+ EnforceSSO: config.EnforceSSO,+ AutoProvision: config.AutoProvision,+ AllowedDomains: config.AllowedDomains,+ })+}++func (h *OAuthAdminHandler) SetWorkspaceSSO(c *okapi.Context, req *SetWorkspaceSSORequest) error {+ wsID := c.GetInt("workspace_id")+ if wsID == 0 {+ return c.AbortBadRequest("workspace context required")+ }++ config := &models.WorkspaceSSOConfig{+ WorkspaceID: uint(wsID),+ ProviderID: req.Body.ProviderID,+ EnforceSSO: req.Body.EnforceSSO,+ AutoProvision: req.Body.AutoProvision,+ AllowedDomains: req.Body.AllowedDomains,+ }++ if err := h.ssoRepo.Upsert(config); err != nil {+ return c.AbortInternalServerError("failed to save SSO config")+ }++ return ok(c, okapi.M{"message": "SSO configuration saved"})+}++func (h *OAuthAdminHandler) DeleteWorkspaceSSO(c *okapi.Context) error {+ wsID := c.GetInt("workspace_id")+ if wsID == 0 {+ return c.AbortBadRequest("workspace context required")+ }++ if err := h.ssoRepo.Delete(uint(wsID)); err != nil {+ return c.AbortInternalServerError("failed to delete SSO config")+ }++ return ok(c, okapi.M{"message": "SSO configuration removed"})+}++func toProviderResponse(p *models.OAuthProvider) OAuthProviderResponse {+ return OAuthProviderResponse{+ ID: p.ID,+ Name: p.Name,+ Slug: p.Slug,+ Type: string(p.Type),+ Issuer: p.Issuer,+ Scopes: p.Scopes,+ Enabled: p.Enabled,+ AutoRegister: p.AutoRegister,+ AllowedDomains: p.AllowedDomains,+ CreatedAt: p.CreatedAt.Format(time.RFC3339),+ }+}diff --git a/internal/handlers/oauth_handler.go b/internal/handlers/oauth_handler.gonew file mode 100644index 0000000..3d373d2--- /dev/null+++ b/internal/handlers/oauth_handler.go@@ -0,0 +1,314 @@+package handlers++import (+ "crypto/rand"+ "encoding/hex"+ "encoding/json"+ "fmt"+ "net/http"+ "time"++ "github.com/google/uuid"+ "github.com/jkaninda/logger"+ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/auth"+ "github.com/goposta/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/services/seeder"+ "github.com/goposta/posta/internal/storage/repositories"+ "github.com/redis/go-redis/v9"+)++type OAuthHandler struct {+ oauthService *auth.OAuthService+ providerRepo *repositories.OAuthProviderRepository+ accountRepo *repositories.OAuthAccountRepository+ userRepo *repositories.UserRepository+ sessionRepo *repositories.SessionRepository+ jwtSecret []byte+ bus *eventbus.EventBus+ seeder *seeder.Seeder+ redisClient *redis.Client+ callbackBase string // e.g. "http://localhost:9000"+ appWebURL string // e.g. "http://localhost:9000"+}++func NewOAuthHandler(+ oauthService *auth.OAuthService,+ providerRepo *repositories.OAuthProviderRepository,+ accountRepo *repositories.OAuthAccountRepository,+ userRepo *repositories.UserRepository,+ sessionRepo *repositories.SessionRepository,+ jwtSecret string,+ seeder *seeder.Seeder,+ bus *eventbus.EventBus,+ redisClient *redis.Client,+ callbackBase string,+ appWebURL string,+) *OAuthHandler {+ return &OAuthHandler{+ oauthService: oauthService,+ providerRepo: providerRepo,+ accountRepo: accountRepo,+ userRepo: userRepo,+ sessionRepo: sessionRepo,+ jwtSecret: []byte(jwtSecret),+ seeder: seeder,+ bus: bus,+ redisClient: redisClient,+ callbackBase: callbackBase,+ appWebURL: appWebURL,+ }+}+++type OAuthProviderInfo struct {+ Slug string `json:"slug"`+ Name string `json:"name"`+ Type string `json:"type"`+}++type OAuthLinkedAccount struct {+ ID uint `json:"id"`+ ProviderID uint `json:"provider_id"`+ ProviderName string `json:"provider_name"`+ ProviderType string `json:"provider_type"`+ Email string `json:"email"`+ CreatedAt string `json:"created_at"`+}++type UnlinkOAuthRequest struct {+ ProviderID int `param:"provider_id"`+}++// ListProviders returns enabled OAuth providers for the login page (public).+func (h *OAuthHandler) ListProviders(c *okapi.Context) error {+ providers, err := h.providerRepo.FindEnabled()+ if err != nil {+ return ok(c, okapi.M{"providers": []OAuthProviderInfo{}})+ }++ var result []OAuthProviderInfo+ for _, p := range providers {+ result = append(result, OAuthProviderInfo{+ Slug: p.Slug,+ Name: p.Name,+ Type: string(p.Type),+ })+ }++ return ok(c, okapi.M{"providers": result})+}++// Authorize redirects the user to the OAuth provider's authorization page.+func (h *OAuthHandler) Authorize(c *okapi.Context) error {+ providerSlug := c.Param("provider")+ provider, err := h.providerRepo.FindBySlug(providerSlug)+ if err != nil {+ return c.AbortNotFound("OAuth provider not found")+ }++ // Generate state for CSRF protection+ stateBytes := make([]byte, 16)+ if _, err := rand.Read(stateBytes); err != nil {+ return c.AbortInternalServerError("failed to generate state")+ }+ state := hex.EncodeToString(stateBytes)++ // Store state in Redis with 10-minute TTL+ stateData, _ := json.Marshal(map[string]string{+ "provider_slug": provider.Slug,+ "created_at": time.Now().UTC().Format(time.RFC3339),+ })+ h.redisClient.Set(c.Request().Context(), "oauth:state:"+state, string(stateData), 10*time.Minute)++ redirectURI := fmt.Sprintf("%s/api/v1/auth/oauth/%s/callback", h.callbackBase, provider.Slug)+ oauthCfg, err := h.oauthService.GetOAuthConfig(provider, redirectURI)+ if err != nil {+ return c.AbortBadRequest("OAuth provider misconfigured: " + err.Error())+ }+ authURL := oauthCfg.AuthCodeURL(state)++ c.Redirect(http.StatusFound, authURL)+ return nil+}++// Callback handles the OAuth provider's redirect with authorization code.+func (h *OAuthHandler) Callback(c *okapi.Context) error {+ providerSlug := c.Param("provider")+ code := c.Query("code")+ state := c.Query("state")+ oauthError := c.Query("error")++ redirect := func(errMsg string) error {+ c.Redirect(http.StatusFound, h.appWebURL+"/login?error="+errMsg)+ return nil+ }++ if oauthError != "" {+ return redirect(oauthError)+ }+ if code == "" || state == "" {+ return redirect("missing_params")+ }++ // Validate state+ ctx := c.Request().Context()+ stateKey := "oauth:state:" + state+ stateVal := h.redisClient.Get(ctx, stateKey)+ if stateVal.Err() != nil {+ return redirect("invalid_state")+ }+ h.redisClient.Del(ctx, stateKey)++ // Verify state matches provider+ var stateData map[string]string+ if err := json.Unmarshal([]byte(stateVal.Val()), &stateData); err != nil || stateData["provider_slug"] != providerSlug {+ return redirect("state_mismatch")+ }++ provider, err := h.providerRepo.FindBySlug(providerSlug)+ if err != nil {+ return redirect("provider_not_found")+ }++ redirectURI := fmt.Sprintf("%s/api/v1/auth/oauth/%s/callback", h.callbackBase, provider.Slug)++ // Exchange code for tokens + user info+ userInfo, token, err := h.oauthService.ExchangeCode(ctx, provider, code, redirectURI)+ if err != nil {+ logger.Error("OAuth exchange failed for provider %s: %v", provider.Slug, err)+ return redirect("exchange_failed")+ }++ // Find or create user+ user, isNew, err := h.oauthService.FindOrCreateUser(provider, userInfo, token)+ if err != nil {+ logger.Error("OAuth account resolution failed for provider %s: %v", provider.Slug, err)+ return redirect("account_error")+ }++ if !user.Active {+ return redirect("account_disabled")+ }++ // Seed defaults for new users+ if isNew && h.seeder != nil {+ go h.seeder.SeedUserDefaults(user.ID, user.Name)+ }++ // Generate JWT+ jwtToken, err := h.generateToken(c, user)+ if err != nil {+ return redirect("token_generation_failed")+ }++ // Publish event+ if h.bus != nil {+ action := "user.oauth_login"+ if isNew {+ action = "user.oauth_registered"+ }+ h.bus.PublishSimple(models.EventCategoryUser, action, &user.ID, user.Email, c.RealIP(),+ fmt.Sprintf("User %q authenticated via %s", user.Email, provider.Name), nil)+ }++ // Update last login+ now := time.Now()+ user.LastLoginAt = &now+ _ = h.userRepo.Update(user)++ // Redirect to frontend with token+ c.Redirect(http.StatusFound, fmt.Sprintf("%s/auth/oauth/callback?token=%s", h.appWebURL, jwtToken))+ return nil+}++// ListLinkedAccounts returns OAuth accounts linked to the current user.+func (h *OAuthHandler) ListLinkedAccounts(c *okapi.Context) error {+ userID := c.GetInt("user_id")++ accounts, err := h.accountRepo.FindByUserID(uint(userID))+ if err != nil {+ return c.AbortInternalServerError("failed to list linked accounts")+ }++ var result []OAuthLinkedAccount+ for _, a := range accounts {+ result = append(result, OAuthLinkedAccount{+ ID: a.ID,+ ProviderID: a.ProviderID,+ ProviderName: a.Provider.Name,+ ProviderType: string(a.Provider.Type),+ Email: a.Email,+ CreatedAt: a.CreatedAt.Format(time.RFC3339),+ })+ }++ return ok(c, result)+}++// UnlinkAccount removes an OAuth provider link from the current user.+func (h *OAuthHandler) UnlinkAccount(c *okapi.Context, req *UnlinkOAuthRequest) error {+ userID := c.GetInt("user_id")++ // Check the user has another auth method before unlinking+ user, err := h.userRepo.FindByID(uint(userID))+ if err != nil {+ return c.AbortNotFound("user not found")+ }++ account, err := h.accountRepo.FindByUserAndProvider(uint(userID), uint(req.ProviderID))+ if err != nil {+ return c.AbortNotFound("linked account not found")+ }++ // Count remaining OAuth links+ count, _ := h.accountRepo.CountByUserID(uint(userID))+ hasPassword := user.PasswordHash != "" && user.AuthMethod != "oauth"++ if count <= 1 && !hasPassword {+ return c.AbortBadRequest("cannot unlink the last authentication method — set a password first")+ }++ if err := h.accountRepo.Delete(account.ID); err != nil {+ return c.AbortInternalServerError("failed to unlink account")+ }++ // Update auth method if no more OAuth links+ if count <= 1 && hasPassword {+ user.AuthMethod = "password"+ _ = h.userRepo.Update(user)+ }++ return ok(c, okapi.M{"message": "account unlinked"})+}++// generateToken creates a JWT token for the given user.+func (h *OAuthHandler) generateToken(c *okapi.Context, user *models.User) (string, error) {+ jti := uuid.NewString()++ token, err := okapi.GenerateJwtToken(h.jwtSecret, map[string]any{+ "sub": user.ID,+ "email": user.Email,+ "role": string(user.Role),+ "aud": "posta",+ "jti": jti,+ }, 24*time.Hour)+ if err != nil {+ return "", err+ }++ // Track session+ if h.sessionRepo != nil {+ session := &models.Session{+ UserID: user.ID,+ JTI: jti,+ IPAddress: c.RealIP(),+ UserAgent: c.Request().UserAgent(),+ ExpiresAt: time.Now().Add(24 * time.Hour),+ }+ _ = h.sessionRepo.Create(session)+ }++ return token, nil+}diff --git a/internal/handlers/plan_handler.go b/internal/handlers/plan_handler.gonew file mode 100644index 0000000..f106ad9--- /dev/null+++ b/internal/handlers/plan_handler.go@@ -0,0 +1,337 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "fmt"+ "net/http"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/audit"+ planpkg "github.com/goposta/posta/internal/services/plan"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm"+)++// PlanHandler handles admin management of plans/packages.+type PlanHandler struct {+ planRepo *repositories.PlanRepository+ workspaceRepo *repositories.WorkspaceRepository+ planService *planpkg.Service+ audit *audit.Logger+}++func NewPlanHandler(+ planRepo *repositories.PlanRepository,+ workspaceRepo *repositories.WorkspaceRepository,+ planService *planpkg.Service,+ audit *audit.Logger,+) *PlanHandler {+ return &PlanHandler{+ planRepo: planRepo,+ workspaceRepo: workspaceRepo,+ planService: planService,+ audit: audit,+ }+}++// Request types++type CreatePlanRequest struct {+ Body struct {+ Name string `json:"name" required:"true"`+ Description string `json:"description"`+ IsDefault bool `json:"is_default"`+ DailyRateLimit int `json:"daily_rate_limit"`+ HourlyRateLimit int `json:"hourly_rate_limit"`+ MaxAttachmentSizeMB int `json:"max_attachment_size_mb"`+ MaxBatchSize int `json:"max_batch_size"`+ MaxAPIKeys int `json:"max_api_keys"`+ MaxDomains int `json:"max_domains"`+ MaxSMTPServers int `json:"max_smtp_servers"`+ MaxWorkspaces int `json:"max_workspaces"`+ EmailLogRetentionDays int `json:"email_log_retention_days"`+ } `json:"body"`+}++type UpdatePlanRequest struct {+ ID int `param:"id"`+ Body struct {+ Name *string `json:"name"`+ Description *string `json:"description"`+ IsDefault *bool `json:"is_default"`+ IsActive *bool `json:"is_active"`+ DailyRateLimit *int `json:"daily_rate_limit"`+ HourlyRateLimit *int `json:"hourly_rate_limit"`+ MaxAttachmentSizeMB *int `json:"max_attachment_size_mb"`+ MaxBatchSize *int `json:"max_batch_size"`+ MaxAPIKeys *int `json:"max_api_keys"`+ MaxDomains *int `json:"max_domains"`+ MaxSMTPServers *int `json:"max_smtp_servers"`+ MaxWorkspaces *int `json:"max_workspaces"`+ EmailLogRetentionDays *int `json:"email_log_retention_days"`+ } `json:"body"`+}++type DeletePlanRequest struct {+ ID int `param:"id"`+ Force bool `query:"force"`+}++type PlanIDRequest struct {+ ID int `param:"id"`+}++type AssignWorkspacePlanRequest struct {+ ID int `param:"id"`+ Body struct {+ PlanID uint `json:"plan_id" required:"true"`+ } `json:"body"`+}++type WorkspacePlanRequest struct {+ ID int `param:"id"`+}++// Create creates a new plan.+func (h *PlanHandler) Create(c *okapi.Context, req *CreatePlanRequest) error {+ userID := uint(c.GetInt("user_id"))++ plan := &models.Plan{+ Name: req.Body.Name,+ Description: req.Body.Description,+ IsDefault: req.Body.IsDefault,+ IsActive: true,+ DailyRateLimit: req.Body.DailyRateLimit,+ HourlyRateLimit: req.Body.HourlyRateLimit,+ MaxAttachmentSizeMB: req.Body.MaxAttachmentSizeMB,+ MaxBatchSize: req.Body.MaxBatchSize,+ MaxAPIKeys: req.Body.MaxAPIKeys,+ MaxDomains: req.Body.MaxDomains,+ MaxSMTPServers: req.Body.MaxSMTPServers,+ MaxWorkspaces: req.Body.MaxWorkspaces,+ EmailLogRetentionDays: req.Body.EmailLogRetentionDays,+ }++ if plan.IsDefault {+ if err := h.planRepo.ClearDefault(); err != nil {+ return c.AbortInternalServerError("failed to clear existing default plan", err)+ }+ }++ if err := h.planRepo.Create(plan); err != nil {+ return c.AbortWithError(http.StatusConflict, fmt.Errorf("failed to create plan: %w", err))+ }++ h.audit.Log(userID, c.GetString("email"), c.RealIP(), "plan.created", "Plan created: "+plan.Name, nil)++ return created(c, plan)+}++// List returns all plans with pagination.+func (h *PlanHandler) List(c *okapi.Context, req *ListRequest) error {+ page, size, offset := normalizePageParams(req.Page, req.Size)++ plans, total, err := h.planRepo.FindAll(size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to list plans")+ }++ return paginated(c, plans, total, page, size)+}++// Get returns a single plan by ID.+func (h *PlanHandler) Get(c *okapi.Context, req *PlanIDRequest) error {+ plan, err := h.planRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("plan not found")+ }+ return ok(c, plan)+}++// Update modifies an existing plan.+func (h *PlanHandler) Update(c *okapi.Context, req *UpdatePlanRequest) error {+ userID := uint(c.GetInt("user_id"))++ plan, err := h.planRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("plan not found")+ }++ if req.Body.Name != nil {+ plan.Name = *req.Body.Name+ }+ if req.Body.Description != nil {+ plan.Description = *req.Body.Description+ }+ if req.Body.IsActive != nil {+ plan.IsActive = *req.Body.IsActive+ }+ if req.Body.DailyRateLimit != nil {+ plan.DailyRateLimit = *req.Body.DailyRateLimit+ }+ if req.Body.HourlyRateLimit != nil {+ plan.HourlyRateLimit = *req.Body.HourlyRateLimit+ }+ if req.Body.MaxAttachmentSizeMB != nil {+ plan.MaxAttachmentSizeMB = *req.Body.MaxAttachmentSizeMB+ }+ if req.Body.MaxBatchSize != nil {+ plan.MaxBatchSize = *req.Body.MaxBatchSize+ }+ if req.Body.MaxAPIKeys != nil {+ plan.MaxAPIKeys = *req.Body.MaxAPIKeys+ }+ if req.Body.MaxDomains != nil {+ plan.MaxDomains = *req.Body.MaxDomains+ }+ if req.Body.MaxSMTPServers != nil {+ plan.MaxSMTPServers = *req.Body.MaxSMTPServers+ }+ if req.Body.MaxWorkspaces != nil {+ plan.MaxWorkspaces = *req.Body.MaxWorkspaces+ }+ if req.Body.EmailLogRetentionDays != nil {+ plan.EmailLogRetentionDays = *req.Body.EmailLogRetentionDays+ }++ // Handle default flag change+ if req.Body.IsDefault != nil && *req.Body.IsDefault && !plan.IsDefault {+ if err := h.planRepo.ClearDefault(); err != nil {+ return c.AbortInternalServerError("failed to clear existing default plan", err)+ }+ plan.IsDefault = true+ } else if req.Body.IsDefault != nil && !*req.Body.IsDefault {+ plan.IsDefault = false+ }++ if err := h.planRepo.Update(plan); err != nil {+ return c.AbortInternalServerError("failed to update plan", err)+ }++ h.audit.Log(userID, c.GetString("email"), c.RealIP(), "plan.updated", "Plan updated: "+plan.Name, nil)++ return ok(c, plan)+}++// Delete removes a plan. If the plan is assigned to workspaces, it requires ?force=true.+func (h *PlanHandler) Delete(c *okapi.Context, req *DeletePlanRequest) error {+ userID := uint(c.GetInt("user_id"))++ plan, err := h.planRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("plan not found")+ }++ count, err := h.planRepo.CountWorkspaces(plan.ID)+ if err != nil {+ return c.AbortInternalServerError("failed to check plan usage", err)+ }++ if count > 0 && !req.Force {+ return c.AbortWithError(http.StatusConflict,+ fmt.Errorf("plan is assigned to %d workspace(s); use ?force=true to delete", count))+ }++ if count > 0 {+ if err := h.planRepo.UnassignAllFromPlan(plan.ID); err != nil {+ return c.AbortInternalServerError("failed to unassign workspaces from plan", err)+ }+ }++ if err := h.planRepo.Delete(plan.ID); err != nil {+ return c.AbortInternalServerError("failed to delete plan", err)+ }++ h.audit.Log(userID, c.GetString("email"), c.RealIP(), "plan.deleted", "Plan deleted: "+plan.Name, nil)++ return noContent(c)+}++// SetDefault sets a plan as the default, unsetting any previous default.+func (h *PlanHandler) SetDefault(c *okapi.Context, req *PlanIDRequest) error {+ userID := uint(c.GetInt("user_id"))++ plan, err := h.planRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("plan not found")+ }++ db := h.planRepo.DB()+ if err := db.Transaction(func(tx *gorm.DB) error {+ if err := h.planRepo.ClearDefaultTx(tx); err != nil {+ return err+ }+ return tx.Model(plan).Update("is_default", true).Error+ }); err != nil {+ return c.AbortInternalServerError("failed to set default plan", err)+ }++ plan.IsDefault = true++ h.audit.Log(userID, c.GetString("email"), c.RealIP(), "plan.default_set", "Default plan set: "+plan.Name, nil)++ return ok(c, plan)+}++// AssignToWorkspace assigns a plan to a workspace.+func (h *PlanHandler) AssignToWorkspace(c *okapi.Context, req *AssignWorkspacePlanRequest) error {+ userID := uint(c.GetInt("user_id"))++ ws, err := h.workspaceRepo.FindByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("workspace not found")+ }++ plan, err := h.planRepo.FindByID(req.Body.PlanID)+ if err != nil {+ return c.AbortNotFound("plan not found")+ }++ if !plan.IsActive {+ return c.AbortWithError(http.StatusBadRequest, fmt.Errorf("cannot assign inactive plan"))+ }++ if err := h.planRepo.AssignToWorkspace(ws.ID, plan.ID); err != nil {+ return c.AbortInternalServerError("failed to assign plan to workspace", err)+ }++ h.audit.Log(userID, c.GetString("email"), c.RealIP(), "plan.assigned",+ fmt.Sprintf("Plan '%s' assigned to workspace '%s'", plan.Name, ws.Name), nil)++ return ok(c, dto.MessageData{Message: fmt.Sprintf("plan '%s' assigned to workspace '%s'", plan.Name, ws.Name)})+}++// GetWorkspacePlan returns the effective plan for a workspace.+func (h *PlanHandler) GetWorkspacePlan(c *okapi.Context, req *WorkspacePlanRequest) error {+ wsID := uint(req.ID)++ _, err := h.workspaceRepo.FindByID(wsID)+ if err != nil {+ return c.AbortNotFound("workspace not found")+ }++ plan := h.planService.EffectivePlan(&wsID)+ if plan == nil {+ return ok(c, okapi.M{"plan": nil, "source": "global_settings"})+ }++ return ok(c, plan)+}diff --git a/internal/handlers/server_handler.go b/internal/handlers/server_handler.goindex 201386c..d0d4801 100644--- a/internal/handlers/server_handler.go+++ b/internal/handlers/server_handler.go@@ -22,11 +22,11 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/dto"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/audit"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/audit"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/storage/repositories")// ServerHandler handles admin management of shared SMTP servers.@@ -40,7 +40,6 @@ func NewServerHandler(repo *repositories.ServerRepository, audit *audit.Logger)return &ServerHandler{repo: repo, sender: email.NewSMTPSender(), audit: audit}}-// --- Request types ---type CreateServerRequest struct {Body struct {@@ -80,8 +79,6 @@ type ServerIDRequest struct {ID int `param:"id"`}-// --- Handlers ----func (h *ServerHandler) Create(c *okapi.Context, req *CreateServerRequest) error {userID := uint(c.GetInt("user_id"))diff --git a/internal/handlers/session_handler.go b/internal/handlers/session_handler.goindex e621a00..4850a5b 100644--- a/internal/handlers/session_handler.go+++ b/internal/handlers/session_handler.go@@ -21,8 +21,8 @@ import ("fmt""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/services/session"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/services/session"+ "github.com/goposta/posta/internal/storage/repositories")type SessionHandler struct {diff --git a/internal/handlers/setting_handler.go b/internal/handlers/setting_handler.goindex 76a3b27..1512f4e 100644--- a/internal/handlers/setting_handler.go+++ b/internal/handlers/setting_handler.go@@ -19,9 +19,9 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/audit"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/audit"+ "github.com/goposta/posta/internal/storage/repositories")// SettingHandler handles admin management of platform settings.@@ -34,7 +34,6 @@ func NewSettingHandler(repo *repositories.SettingRepository, audit *audit.Loggerreturn &SettingHandler{repo: repo, audit: audit}}-// --- Request types ---type UpdateSettingsRequest struct {Body struct {@@ -48,8 +47,6 @@ type SettingInput struct {Type string `json:"type"`}-// --- Handlers ----func (h *SettingHandler) GetSettings(c *okapi.Context) error {settings, err := h.repo.FindAll()if err != nil {diff --git a/internal/handlers/smtp_handler.go b/internal/handlers/smtp_handler.goindex 3a2b08e..8bd3b57 100644--- a/internal/handlers/smtp_handler.go+++ b/internal/handlers/smtp_handler.go@@ -23,10 +23,11 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/audit"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/audit"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm")type SMTPHandler struct {@@ -34,6 +35,8 @@ type SMTPHandler struct {domainRepo *repositories.DomainRepositorysender *email.SMTPSenderaudit *audit.Logger+ quota QuotaChecker+ db *gorm.DB}type CreateSMTPRequest struct {Body struct {@@ -73,14 +76,14 @@ func NewSMTPHandler(repo *repositories.SMTPRepository, domainRepo *repositories.return &SMTPHandler{repo: repo, domainRepo: domainRepo, sender: email.NewSMTPSender(), audit: audit}}-// validateAllowedEmails checks that each allowed email's domain belongs to the user's domains.-// If the user has no domains configured, all emails are allowed.-func (h *SMTPHandler) validateAllowedEmails(userID uint, emails []string) error {+// validateAllowedEmails checks that each allowed email's domain belongs to the user's/workspace's domains.+// If no domains are configured, all emails are allowed.+func (h *SMTPHandler) validateAllowedEmails(scope repositories.ResourceScope, emails []string) error {if len(emails) == 0 {return nil}- domains, _, err := h.domainRepo.FindByUserID(userID, 1000, 0)+ domains, _, err := h.domainRepo.FindByScope(scope, 1000, 0)if err != nil {return fmt.Errorf("failed to load domains")}@@ -108,10 +111,25 @@ func (h *SMTPHandler) validateAllowedEmails(userID uint, emails []string) errorreturn nil}+// SetQuota sets the quota checker for plan-based resource limits.+func (h *SMTPHandler) SetQuota(q QuotaChecker, db *gorm.DB) {+ h.quota = q+ h.db = db+}+func (h *SMTPHandler) Create(c *okapi.Context, req *CreateSMTPRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)- if err := h.validateAllowedEmails(uint(userID), req.Body.AllowedEmails); err != nil {+ if h.quota != nil {+ if err := h.quota.CheckQuota(h.db, scope.WorkspaceID, "smtp_servers"); err != nil {+ return c.AbortForbidden(err.Error())+ }+ }++ if err := h.validateAllowedEmails(scope, req.Body.AllowedEmails); err != nil {return c.AbortBadRequest(err.Error())}@@ -121,7 +139,8 @@ func (h *SMTPHandler) Create(c *okapi.Context, req *CreateSMTPRequest) error {}server := &models.SMTPServer{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,Host: req.Body.Host,Port: req.Body.Port,Username: req.Body.Username,@@ -146,16 +165,14 @@ func (h *SMTPHandler) Create(c *okapi.Context, req *CreateSMTPRequest) error {return c.AbortInternalServerError("failed to create SMTP server", err)}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "smtp.created", "SMTP server created: "+req.Body.Host, nil)+ h.audit.Log(scope.UserID, c.GetString("email"), c.RealIP(), "smtp.created", "SMTP server created: "+req.Body.Host, nil)return created(c, server)}func (h *SMTPHandler) Get(c *okapi.Context, req *GetSMTPRequest) error {- userID := c.GetInt("user_id")-server, err := h.repo.FindByID(uint(req.ID))- if err != nil || server.UserID != uint(userID) {+ if err != nil || !ownsResource(c, server.UserID, server.WorkspaceID) {return c.AbortNotFound("SMTP server not found")}@@ -163,10 +180,11 @@ func (h *SMTPHandler) Get(c *okapi.Context, req *GetSMTPRequest) error {}func (h *SMTPHandler) Update(c *okapi.Context, req *UpdateSMTPRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }server, err := h.repo.FindByID(uint(req.ID))- if err != nil || server.UserID != uint(userID) {+ if err != nil || !ownsResource(c, server.UserID, server.WorkspaceID) {return c.AbortNotFound("SMTP server not found")}@@ -197,7 +215,7 @@ func (h *SMTPHandler) Update(c *okapi.Context, req *UpdateSMTPRequest) error {server.MaxRetries = *req.Body.MaxRetries}if req.Body.AllowedEmails != nil {- if err := h.validateAllowedEmails(uint(userID), req.Body.AllowedEmails); err != nil {+ if err := h.validateAllowedEmails(repositories.ResourceScope{UserID: server.UserID, WorkspaceID: server.WorkspaceID}, req.Body.AllowedEmails); err != nil {return c.AbortBadRequest(err.Error())}server.AllowedEmails = req.Body.AllowedEmails@@ -238,16 +256,15 @@ func (h *SMTPHandler) Update(c *okapi.Context, req *UpdateSMTPRequest) error {return c.AbortInternalServerError("failed to update SMTP server")}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "smtp.updated", "SMTP server updated: "+server.Host, nil)+ h.audit.Log(server.UserID, c.GetString("email"), c.RealIP(), "smtp.updated", "SMTP server updated: "+server.Host, nil)return ok(c, server)}func (h *SMTPHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- servers, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ servers, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list SMTP servers")}@@ -256,10 +273,11 @@ func (h *SMTPHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *SMTPHandler) Delete(c *okapi.Context, req *DeleteSMTPRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }server, err := h.repo.FindByID(uint(req.ID))- if err != nil || server.UserID != uint(userID) {+ if err != nil || !ownsResource(c, server.UserID, server.WorkspaceID) {return c.AbortNotFound("SMTP server not found")}@@ -267,16 +285,17 @@ func (h *SMTPHandler) Delete(c *okapi.Context, req *DeleteSMTPRequest) error {return c.AbortInternalServerError("failed to delete SMTP server")}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "smtp.deleted", "SMTP server deleted: "+server.Host, nil)+ h.audit.Log(server.UserID, c.GetString("email"), c.RealIP(), "smtp.deleted", "SMTP server deleted: "+server.Host, nil)return noContent(c)}func (h *SMTPHandler) Test(c *okapi.Context, req *TestSMTPRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }server, err := h.repo.FindByID(uint(req.ID))- if err != nil || server.UserID != uint(userID) {+ if err != nil || !ownsResource(c, server.UserID, server.WorkspaceID) {return c.AbortNotFound("SMTP server not found")}diff --git a/internal/handlers/stylesheet_handler.go b/internal/handlers/stylesheet_handler.goindex fe61083..719a45d 100644--- a/internal/handlers/stylesheet_handler.go+++ b/internal/handlers/stylesheet_handler.go@@ -21,8 +21,8 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type StyleSheetHandler struct {@@ -50,11 +50,15 @@ func NewStyleSheetHandler(repo *repositories.StyleSheetRepository) *StyleSheetHa}func (h *StyleSheetHandler) Create(c *okapi.Context, req *CreateStyleSheetRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)ss := &models.StyleSheet{- UserID: uint(userID),- Name: req.Body.Name,+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Name: req.Body.Name,CSS: req.Body.CSS,}@@ -66,10 +70,11 @@ func (h *StyleSheetHandler) Create(c *okapi.Context, req *CreateStyleSheetReques}func (h *StyleSheetHandler) Update(c *okapi.Context, req *UpdateStyleSheetRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }ss, err := h.repo.FindByID(uint(req.ID))- if err != nil || ss.UserID != uint(userID) {+ if err != nil || !ownsResource(c, ss.UserID, ss.WorkspaceID) {return c.AbortNotFound("stylesheet not found")}@@ -91,10 +96,11 @@ func (h *StyleSheetHandler) Update(c *okapi.Context, req *UpdateStyleSheetReques}func (h *StyleSheetHandler) Delete(c *okapi.Context, req *DeleteStyleSheetRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }ss, err := h.repo.FindByID(uint(req.ID))- if err != nil || ss.UserID != uint(userID) {+ if err != nil || !ownsResource(c, ss.UserID, ss.WorkspaceID) {return c.AbortNotFound("stylesheet not found")}@@ -106,10 +112,9 @@ func (h *StyleSheetHandler) Delete(c *okapi.Context, req *DeleteStyleSheetReques}func (h *StyleSheetHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- sheets, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ sheets, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list stylesheets")}diff --git a/internal/handlers/subscriber_handler.go b/internal/handlers/subscriber_handler.gonew file mode 100644index 0000000..86ebc45--- /dev/null+++ b/internal/handlers/subscriber_handler.go@@ -0,0 +1,334 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "encoding/csv"+ "encoding/json"+ "io"+ "strconv"+ "strings"+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+)++type SubscriberHandler struct {+ repo *repositories.SubscriberRepository+}++func NewSubscriberHandler(repo *repositories.SubscriberRepository) *SubscriberHandler {+ return &SubscriberHandler{repo: repo}+}++type CreateSubscriberRequest struct {+ Body struct {+ Email string `json:"email" required:"true" format:"email"`+ Name string `json:"name"`+ Status string `json:"status"`+ CustomFields map[string]interface{} `json:"custom_fields"`+ Timezone string `json:"timezone"`+ Language string `json:"language"`+ } `json:"body"`+}++type UpdateSubscriberRequest struct {+ ID int `param:"id"`+ Body struct {+ Name string `json:"name"`+ Status string `json:"status"`+ CustomFields map[string]interface{} `json:"custom_fields"`+ Timezone string `json:"timezone"`+ Language string `json:"language"`+ } `json:"body"`+}++type DeleteSubscriberRequest struct {+ ID int `param:"id"`+}++type GetSubscriberRequest struct {+ ID int `param:"id"`+}++type ListSubscribersRequest struct {+ Page int `query:"page" default:"0"`+ Size int `query:"size" default:"20"`+ Search string `query:"search"`+ Status string `query:"status"`+}++type BulkImportSubscribersRequest struct {+ Body struct {+ Subscribers []BulkSubscriberEntry `json:"subscribers" required:"true"`+ } `json:"body"`+}++type BulkSubscriberEntry struct {+ Email string `json:"email"`+ Name string `json:"name"`+ Timezone string `json:"timezone"`+ Language string `json:"language"`+ CustomFields map[string]interface{} `json:"custom_fields"`+}++type BulkImportResult struct {+ Created int `json:"created"`+ Skipped int `json:"skipped"`+ Total int `json:"total"`+}++func (h *SubscriberHandler) Create(c *okapi.Context, req *CreateSubscriberRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ email := strings.ToLower(strings.TrimSpace(req.Body.Email))+ if email == "" {+ return c.AbortBadRequest("email is required")+ }++ status := models.SubscriberStatus(req.Body.Status)+ if status == "" {+ status = models.SubscriberStatusSubscribed+ }++ now := time.Now()+ s := &models.Subscriber{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Email: email,+ Name: strings.TrimSpace(req.Body.Name),+ Status: status,+ CustomFields: req.Body.CustomFields,+ Timezone: strings.TrimSpace(req.Body.Timezone),+ Language: strings.TrimSpace(req.Body.Language),+ SubscribedAt: &now,+ }++ if err := h.repo.Create(s); err != nil {+ return c.AbortConflict("subscriber already exists")+ }+ return created(c, s)+}++func (h *SubscriberHandler) List(c *okapi.Context, req *ListSubscribersRequest) error {+ page, size, offset := normalizePageParams(req.Page, req.Size)+ items, total, err := h.repo.FindByScope(getScope(c), req.Search, req.Status, size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to list subscribers")+ }+ return paginated(c, items, total, page, size)+}++func (h *SubscriberHandler) Get(c *okapi.Context, req *GetSubscriberRequest) error {+ s, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, s.UserID, s.WorkspaceID) {+ return c.AbortNotFound("subscriber not found")+ }+ return ok(c, s)+}++func (h *SubscriberHandler) Update(c *okapi.Context, req *UpdateSubscriberRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ s, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, s.UserID, s.WorkspaceID) {+ return c.AbortNotFound("subscriber not found")+ }++ if req.Body.Name != "" {+ s.Name = req.Body.Name+ }+ if req.Body.Status != "" {+ newStatus := models.SubscriberStatus(req.Body.Status)+ if newStatus == models.SubscriberStatusUnsubscribed && s.Status != models.SubscriberStatusUnsubscribed {+ now := time.Now()+ s.UnsubscribedAt = &now+ }+ s.Status = newStatus+ }+ if req.Body.CustomFields != nil {+ s.CustomFields = req.Body.CustomFields+ }+ if req.Body.Timezone != "" {+ s.Timezone = req.Body.Timezone+ }+ if req.Body.Language != "" {+ s.Language = req.Body.Language+ }+ now := time.Now()+ s.UpdatedAt = &now++ if err := h.repo.Update(s); err != nil {+ return c.AbortInternalServerError("failed to update subscriber")+ }+ return ok(c, s)+}++func (h *SubscriberHandler) Delete(c *okapi.Context, req *DeleteSubscriberRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ s, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, s.UserID, s.WorkspaceID) {+ return c.AbortNotFound("subscriber not found")+ }+ if err := h.repo.Delete(s.ID); err != nil {+ return c.AbortInternalServerError("failed to delete subscriber")+ }+ return noContent(c)+}++func (h *SubscriberHandler) BulkImportJSON(c *okapi.Context, req *BulkImportSubscribersRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ now := time.Now()+ var subscribers []models.Subscriber+ for _, entry := range req.Body.Subscribers {+ email := strings.ToLower(strings.TrimSpace(entry.Email))+ if email == "" {+ continue+ }+ subscribers = append(subscribers, models.Subscriber{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Email: email,+ Name: strings.TrimSpace(entry.Name),+ Timezone: strings.TrimSpace(entry.Timezone),+ Language: strings.TrimSpace(entry.Language),+ Status: models.SubscriberStatusSubscribed,+ CustomFields: entry.CustomFields,+ SubscribedAt: &now,+ })+ }++ created, skipped, err := h.repo.BulkCreate(subscribers)+ if err != nil {+ return c.AbortInternalServerError("import failed: " + err.Error())+ }++ return ok(c, BulkImportResult{+ Created: created,+ Skipped: skipped,+ Total: len(subscribers),+ })+}++func (h *SubscriberHandler) BulkImportCSV(c *okapi.Context) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ file, _, err := c.Request().FormFile("file")+ if err != nil {+ return c.AbortBadRequest("file is required")+ }+ defer file.Close()++ // Parse optional column mapping: {"0":"email","1":"name","2":"custom_fields.company"}+ mappingStr := c.Request().FormValue("column_mapping")+ columnMap := map[int]string{0: "email", 1: "name"} // defaults+ if mappingStr != "" {+ var raw map[string]string+ if err := json.Unmarshal([]byte(mappingStr), &raw); err == nil {+ columnMap = make(map[int]string)+ for k, v := range raw {+ idx, err := strconv.Atoi(k)+ if err != nil {+ continue+ }+ columnMap[idx] = v+ }+ }+ }++ reader := csv.NewReader(file)+ reader.TrimLeadingSpace = true++ // Skip header row+ if _, err := reader.Read(); err != nil {+ return c.AbortBadRequest("failed to read CSV header")+ }++ now := time.Now()+ var subscribers []models.Subscriber+ for {+ record, err := reader.Read()+ if err == io.EOF {+ break+ }+ if err != nil {+ continue // skip bad rows+ }++ s := models.Subscriber{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Status: models.SubscriberStatusSubscribed,+ SubscribedAt: &now,+ CustomFields: make(models.CustomFields),+ }++ for idx, field := range columnMap {+ if idx >= len(record) {+ continue+ }+ val := strings.TrimSpace(record[idx])+ switch field {+ case "email":+ s.Email = strings.ToLower(val)+ case "name":+ s.Name = val+ case "status":+ s.Status = models.SubscriberStatus(val)+ case "language":+ s.Language = val+ default:+ if strings.HasPrefix(field, "custom_fields.") {+ key := strings.TrimPrefix(field, "custom_fields.")+ s.CustomFields[key] = val+ }+ }+ }++ if s.Email == "" {+ continue+ }+ subscribers = append(subscribers, s)+ }++ createdCount, skipped, err := h.repo.BulkCreate(subscribers)+ if err != nil {+ return c.AbortInternalServerError("import failed: " + err.Error())+ }++ return ok(c, BulkImportResult{+ Created: createdCount,+ Skipped: skipped,+ Total: len(subscribers),+ })+}diff --git a/internal/handlers/subscriber_list_handler.go b/internal/handlers/subscriber_list_handler.gonew file mode 100644index 0000000..90c4365--- /dev/null+++ b/internal/handlers/subscriber_list_handler.go@@ -0,0 +1,292 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+)++type SubscriberListHandler struct {+ repo *repositories.SubscriberListRepository+ subscriberRepo *repositories.SubscriberRepository+}++func NewSubscriberListHandler(repo *repositories.SubscriberListRepository, subscriberRepo *repositories.SubscriberRepository) *SubscriberListHandler {+ return &SubscriberListHandler{repo: repo, subscriberRepo: subscriberRepo}+}++type CreateSubscriberListRequest struct {+ Body struct {+ Name string `json:"name" required:"true"`+ Description string `json:"description"`+ Type string `json:"type"`+ FilterRules []models.FilterRule `json:"filter_rules"`+ } `json:"body"`+}++type UpdateSubscriberListRequest struct {+ ID int `param:"id"`+ Body struct {+ Name string `json:"name"`+ Description string `json:"description"`+ FilterRules []models.FilterRule `json:"filter_rules"`+ } `json:"body"`+}++type DeleteSubscriberListRequest struct {+ ID int `param:"id"`+}++type GetSubscriberListRequest struct {+ ID int `param:"id"`+}++type ListSubscriberListMembersRequest struct {+ ID int `param:"id"`+ Page int `query:"page" default:"0"`+ Size int `query:"size" default:"20"`+}++type AddSubscriberToListRequest struct {+ ID int `param:"id"`+ Body struct {+ SubscriberID uint `json:"subscriber_id" required:"true"`+ } `json:"body"`+}++type RemoveSubscriberFromListRequest struct {+ ID int `param:"id"`+ Body struct {+ SubscriberID uint `json:"subscriber_id" required:"true"`+ } `json:"body"`+}++type PreviewSegmentRequest struct {+ Body struct {+ FilterRules []models.FilterRule `json:"filter_rules" required:"true"`+ } `json:"body"`+}++type SubscriberListWithCount struct {+ ID uint `json:"id"`+ Name string `json:"name"`+ Description string `json:"description"`+ Type models.SubscriberListType `json:"type"`+ FilterRules models.FilterRules `json:"filter_rules,omitempty"`+ MemberCount int64 `json:"member_count"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt *time.Time `json:"updated_at"`+}++func (h *SubscriberListHandler) Create(c *okapi.Context, req *CreateSubscriberListRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ listType := models.SubscriberListType(req.Body.Type)+ if listType == "" {+ listType = models.SubscriberListTypeStatic+ }++ list := &models.SubscriberList{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Name: req.Body.Name,+ Description: req.Body.Description,+ Type: listType,+ FilterRules: req.Body.FilterRules,+ }++ if err := h.repo.Create(list); err != nil {+ return c.AbortInternalServerError("failed to create list")+ }+ return created(c, list)+}++func (h *SubscriberListHandler) List(c *okapi.Context, req *ListRequest) error {+ page, size, offset := normalizePageParams(req.Page, req.Size)+ lists, total, err := h.repo.FindByScope(getScope(c), size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to list subscriber lists")+ }++ // Enrich with member counts+ var result []SubscriberListWithCount+ for _, l := range lists {+ count := h.repo.MemberCount(l.ID)+ if l.Type == models.SubscriberListTypeDynamic && l.FilterRules != nil {+ dynCount, _ := h.subscriberRepo.CountByFilterRules(getScope(c), l.FilterRules)+ count = dynCount+ }+ result = append(result, SubscriberListWithCount{+ ID: l.ID,+ Name: l.Name,+ Description: l.Description,+ Type: l.Type,+ FilterRules: l.FilterRules,+ MemberCount: count,+ CreatedAt: l.CreatedAt,+ UpdatedAt: l.UpdatedAt,+ })+ }++ return paginated(c, result, total, page, size)+}++func (h *SubscriberListHandler) Get(c *okapi.Context, req *GetSubscriberListRequest) error {+ list, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {+ return c.AbortNotFound("list not found")+ }++ count := h.repo.MemberCount(list.ID)+ if list.Type == models.SubscriberListTypeDynamic && list.FilterRules != nil {+ dynCount, _ := h.subscriberRepo.CountByFilterRules(getScope(c), list.FilterRules)+ count = dynCount+ }++ return ok(c, SubscriberListWithCount{+ ID: list.ID,+ Name: list.Name,+ Description: list.Description,+ Type: list.Type,+ FilterRules: list.FilterRules,+ MemberCount: count,+ CreatedAt: list.CreatedAt,+ UpdatedAt: list.UpdatedAt,+ })+}++func (h *SubscriberListHandler) Update(c *okapi.Context, req *UpdateSubscriberListRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ list, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {+ return c.AbortNotFound("list not found")+ }++ if req.Body.Name != "" {+ list.Name = req.Body.Name+ }+ if req.Body.Description != "" {+ list.Description = req.Body.Description+ }+ if req.Body.FilterRules != nil {+ list.FilterRules = req.Body.FilterRules+ }+ now := time.Now()+ list.UpdatedAt = &now++ if err := h.repo.Update(list); err != nil {+ return c.AbortInternalServerError("failed to update list")+ }+ return ok(c, list)+}++func (h *SubscriberListHandler) Delete(c *okapi.Context, req *DeleteSubscriberListRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ list, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {+ return c.AbortNotFound("list not found")+ }+ if err := h.repo.Delete(list.ID); err != nil {+ return c.AbortInternalServerError("failed to delete list")+ }+ return noContent(c)+}++func (h *SubscriberListHandler) AddMember(c *okapi.Context, req *AddSubscriberToListRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ list, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {+ return c.AbortNotFound("list not found")+ }+ if list.Type != models.SubscriberListTypeStatic {+ return c.AbortBadRequest("cannot manually add members to a dynamic list")+ }++ // Verify subscriber belongs to the same scope+ sub, err := h.subscriberRepo.FindByID(req.Body.SubscriberID)+ if err != nil || !ownsResource(c, sub.UserID, sub.WorkspaceID) {+ return c.AbortNotFound("subscriber not found")+ }++ member := &models.SubscriberListMember{+ ListID: list.ID,+ SubscriberID: sub.ID,+ }+ if err := h.repo.AddMember(member); err != nil {+ return c.AbortConflict("subscriber already in list")+ }+ return ok(c, okapi.M{"message": "subscriber added to list"})+}++func (h *SubscriberListHandler) RemoveMember(c *okapi.Context, req *RemoveSubscriberFromListRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ list, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {+ return c.AbortNotFound("list not found")+ }+ if err := h.repo.RemoveMember(list.ID, req.Body.SubscriberID); err != nil {+ return c.AbortInternalServerError("failed to remove subscriber")+ }+ return ok(c, okapi.M{"message": "subscriber removed from list"})+}++func (h *SubscriberListHandler) ListMembers(c *okapi.Context, req *ListSubscriberListMembersRequest) error {+ list, err := h.repo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, list.UserID, list.WorkspaceID) {+ return c.AbortNotFound("list not found")+ }++ page, size, offset := normalizePageParams(req.Page, req.Size)++ if list.Type == models.SubscriberListTypeDynamic && list.FilterRules != nil {+ items, total, err := h.subscriberRepo.FindByFilterRules(getScope(c), list.FilterRules, size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to evaluate segment")+ }+ return paginated(c, items, total, page, size)+ }++ items, total, err := h.repo.ListMembers(list.ID, size, offset)+ if err != nil {+ return c.AbortInternalServerError("failed to list members")+ }+ return paginated(c, items, total, page, size)+}++func (h *SubscriberListHandler) PreviewSegment(c *okapi.Context, req *PreviewSegmentRequest) error {+ count, err := h.subscriberRepo.CountByFilterRules(getScope(c), req.Body.FilterRules)+ if err != nil {+ return c.AbortInternalServerError("failed to evaluate segment")+ }+ return ok(c, okapi.M{"count": count})+}diff --git a/internal/handlers/suppression_handler.go b/internal/handlers/suppression_handler.goindex e33abf2..cfdbb0b 100644--- a/internal/handlers/suppression_handler.go+++ b/internal/handlers/suppression_handler.go@@ -19,8 +19,8 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type SuppressionHandler struct {@@ -43,12 +43,16 @@ func NewSuppressionHandler(repo *repositories.SuppressionRepository) *Suppressio}func (h *SuppressionHandler) Create(c *okapi.Context, req *CreateSuppressionRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)suppression := &models.Suppression{- UserID: uint(userID),- Email: req.Body.Email,- Reason: req.Body.Reason,+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Email: req.Body.Email,+ Reason: req.Body.Reason,}if err := h.repo.Create(suppression); err != nil {@@ -59,10 +63,9 @@ func (h *SuppressionHandler) Create(c *okapi.Context, req *CreateSuppressionRequ}func (h *SuppressionHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- suppressions, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ suppressions, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list suppressions")}@@ -71,9 +74,12 @@ func (h *SuppressionHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *SuppressionHandler) Delete(c *okapi.Context, req *DeleteSuppressionRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)- if err := h.repo.Delete(uint(userID), req.Body.Email); err != nil {+ if err := h.repo.Delete(scope, req.Body.Email); err != nil {return c.AbortInternalServerError("failed to remove from suppression list")}diff --git a/internal/handlers/template_handler.go b/internal/handlers/template_handler.goindex 2b6feca..ad8ec85 100644--- a/internal/handlers/template_handler.go+++ b/internal/handlers/template_handler.go@@ -19,13 +19,15 @@ package handlersimport ("fmt"+ "io"+ "strings""time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/config"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/config"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/storage/repositories")type TemplateHandler struct {@@ -33,6 +35,7 @@ type TemplateHandler struct {stylesheetRepo *repositories.StyleSheetRepositoryversionRepo *repositories.TemplateVersionRepositorylocalizationRepo *repositories.TemplateLocalizationRepository+ languageRepo *repositories.LanguageRepositoryemailService *email.Service}type CreateTemplateRequest struct {@@ -74,20 +77,29 @@ type SendTestRequest struct {Body email.SendTestRequest `json:"body"`}-func NewTemplateHandler(repo *repositories.TemplateRepository, ssRepo *repositories.StyleSheetRepository, versionRepo *repositories.TemplateVersionRepository, localizationRepo *repositories.TemplateLocalizationRepository, emailService *email.Service) *TemplateHandler {- return &TemplateHandler{repo: repo, stylesheetRepo: ssRepo, versionRepo: versionRepo, localizationRepo: localizationRepo, emailService: emailService}+func NewTemplateHandler(repo *repositories.TemplateRepository, ssRepo *repositories.StyleSheetRepository, versionRepo *repositories.TemplateVersionRepository, localizationRepo *repositories.TemplateLocalizationRepository, languageRepo *repositories.LanguageRepository, emailService *email.Service) *TemplateHandler {+ return &TemplateHandler{repo: repo, stylesheetRepo: ssRepo, versionRepo: versionRepo, localizationRepo: localizationRepo, languageRepo: languageRepo, emailService: emailService}}func (h *TemplateHandler) Create(c *okapi.Context, req *CreateTemplateRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)defaultLang := req.Body.DefaultLanguageif defaultLang == "" {- defaultLang = "en"+ // Use the scope's default language if one is configured+ if defLang, err := h.languageRepo.FindDefault(scope); err == nil {+ defaultLang = defLang.Code+ } else {+ defaultLang = "en"+ }}tmpl := &models.Template{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,Name: req.Body.Name,DefaultLanguage: defaultLang,Description: req.Body.Description,@@ -117,10 +129,11 @@ func (h *TemplateHandler) Create(c *okapi.Context, req *CreateTemplateRequest) e}func (h *TemplateHandler) Update(c *okapi.Context, req *UpdateTemplateRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.repo.FindByID(uint(req.ID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -148,10 +161,9 @@ func (h *TemplateHandler) Update(c *okapi.Context, req *UpdateTemplateRequest) e}func (h *TemplateHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- templates, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ templates, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list templates")}@@ -160,10 +172,11 @@ func (h *TemplateHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *TemplateHandler) Delete(c *okapi.Context, req *DeleteTemplateRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.repo.FindByID(uint(req.ID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -210,15 +223,18 @@ func (h *TemplateHandler) Preview(c *okapi.Context, req *PreviewTemplateRequest)}func (h *TemplateHandler) SendTest(c *okapi.Context, req *SendTestRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }userEmail := c.GetString("email")+ scope := getScope(c)tmpl, err := h.repo.FindByID(uint(req.ID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}- resp, err := h.emailService.SendTestByTemplateID(c.Request().Context(), uint(userID), userEmail, tmpl.ID, &req.Body)+ resp, err := h.emailService.SendTestByTemplateID(c.Request().Context(), scope.UserID, scope.WorkspaceID, userEmail, tmpl.ID, &req.Body)if err != nil {return c.AbortBadRequest(err.Error())}@@ -226,7 +242,6 @@ func (h *TemplateHandler) SendTest(c *okapi.Context, req *SendTestRequest) errorreturn ok(c, resp)}-// --- Export / Import ---type ExportTemplateRequest struct {ID int `param:"id"`@@ -261,10 +276,8 @@ type ImportTemplateRequest struct {}func (h *TemplateHandler) Export(c *okapi.Context, req *ExportTemplateRequest) error {- userID := c.GetInt("user_id")-tmpl, err := h.repo.FindByID(uint(req.ID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -313,7 +326,10 @@ func (h *TemplateHandler) Export(c *okapi.Context, req *ExportTemplateRequest) e}func (h *TemplateHandler) Import(c *okapi.Context, req *ImportTemplateRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)data := req.Bodyif data.Name == "" {@@ -322,11 +338,16 @@ func (h *TemplateHandler) Import(c *okapi.Context, req *ImportTemplateRequest) edefaultLang := data.DefaultLanguageif defaultLang == "" {- defaultLang = "en"+ if defLang, err := h.languageRepo.FindDefault(scope); err == nil {+ defaultLang = defLang.Code+ } else {+ defaultLang = "en"+ }}tmpl := &models.Template{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,Name: data.Name,DefaultLanguage: defaultLang,Description: data.Description,@@ -394,3 +415,119 @@ func (h *TemplateHandler) Import(c *okapi.Context, req *ImportTemplateRequest) ereturn created(c, tmpl)}++// ImportHTML creates a template from an uploaded .html file.+// It extracts <style> CSS into a separate StyleSheet and uses the HTML body+// as the template localization content.+func (h *TemplateHandler) ImportHTML(c *okapi.Context) error {+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)++ file, header, err := c.Request().FormFile("file")+ if err != nil {+ return c.AbortBadRequest("file is required")+ }+ defer file.Close()++ // Validate file extension+ filename := header.Filename+ lower := strings.ToLower(filename)+ if !strings.HasSuffix(lower, ".html") && !strings.HasSuffix(lower, ".htm") {+ return c.AbortBadRequest("only .html files are accepted")+ }++ // Limit file size to 2MB+ if header.Size > 2*1024*1024 {+ return c.AbortBadRequest("file size must not exceed 2MB")+ }++ // Read file contents+ buf := new(strings.Builder)+ if _, err := io.Copy(buf, file); err != nil {+ return c.AbortBadRequest("failed to read file")+ }+ htmlContent := buf.String()+ if strings.TrimSpace(htmlContent) == "" {+ return c.AbortBadRequest("file is empty")+ }++ // Derive template name from filename+ name := strings.TrimSuffix(lower, ".html")+ name = strings.TrimSuffix(name, ".htm")+ name = strings.TrimSpace(name)+ if name == "" {+ return c.AbortBadRequest("could not derive template name from filename")+ }++ // Extract CSS and HTML body+ css, body := extractStyleAndBody(htmlContent)++ // Try to extract a subject from <title>+ subject := extractTitle(htmlContent)+ if subject == "" {+ subject = name+ }++ // Resolve default language from scope+ defaultLang := "en"+ if defLang, err := h.languageRepo.FindDefault(scope); err == nil {+ defaultLang = defLang.Code+ }++ // Create template+ tmpl := &models.Template{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Name: name,+ DefaultLanguage: defaultLang,+ Description: fmt.Sprintf("Imported from %s", filename),+ }+ if err := h.repo.Create(tmpl); err != nil {+ return c.AbortConflict("template with this name already exists")+ }++ // Create stylesheet from extracted CSS (if any)+ var stylesheetID *uint+ if css != "" {+ ss := &models.StyleSheet{+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,+ Name: name + "-styles",+ CSS: css,+ }+ if err := h.stylesheetRepo.Create(ss); err == nil {+ stylesheetID = &ss.ID+ }+ }++ // Create version v1+ v := &models.TemplateVersion{+ TemplateID: tmpl.ID,+ Version: 1,+ StyleSheetID: stylesheetID,+ }+ if err := h.versionRepo.Create(v); err != nil {+ return c.AbortInternalServerError("failed to create template version")+ }++ // Set active version+ tmpl.ActiveVersionID = &v.ID+ if err := h.repo.Update(tmpl); err != nil {+ return c.AbortInternalServerError("failed to activate version")+ }++ // Create default localization+ loc := &models.TemplateLocalization{+ VersionID: v.ID,+ Language: defaultLang,+ SubjectTemplate: subject,+ HTMLTemplate: body,+ }+ if err := h.localizationRepo.Create(loc); err != nil {+ return c.AbortInternalServerError("failed to create localization")+ }++ return created(c, tmpl)+}diff --git a/internal/handlers/template_localization_handler.go b/internal/handlers/template_localization_handler.goindex 9b083d6..5a41ba0 100644--- a/internal/handlers/template_localization_handler.go+++ b/internal/handlers/template_localization_handler.go@@ -21,9 +21,9 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/storage/repositories")type TemplateLocalizationHandler struct {@@ -44,6 +44,7 @@ type CreateLocalizationRequest struct {SubjectTemplate string `json:"subject_template" required:"true"`HTMLTemplate string `json:"html_template"`TextTemplate string `json:"text_template"`+ BuilderJSON string `json:"builder_json,omitempty"`} `json:"body"`}type UpdateLocalizationRequest struct {@@ -52,6 +53,7 @@ type UpdateLocalizationRequest struct {SubjectTemplate *string `json:"subject_template"`HTMLTemplate *string `json:"html_template"`TextTemplate *string `json:"text_template"`+ BuilderJSON *string `json:"builder_json,omitempty"`} `json:"body"`}type DeleteLocalizationRequest struct {@@ -81,10 +83,8 @@ func NewTemplateLocalizationHandler(}func (h *TemplateLocalizationHandler) List(c *okapi.Context, req *ListLocalizationsRequest) error {- userID := c.GetInt("user_id")-tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -102,10 +102,11 @@ func (h *TemplateLocalizationHandler) List(c *okapi.Context, req *ListLocalizati}func (h *TemplateLocalizationHandler) Create(c *okapi.Context, req *CreateLocalizationRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -120,6 +121,7 @@ func (h *TemplateLocalizationHandler) Create(c *okapi.Context, req *CreateLocaliSubjectTemplate: req.Body.SubjectTemplate,HTMLTemplate: req.Body.HTMLTemplate,TextTemplate: req.Body.TextTemplate,+ BuilderJSON: req.Body.BuilderJSON,}if err := h.localizationRepo.Create(l); err != nil {@@ -130,6 +132,9 @@ func (h *TemplateLocalizationHandler) Create(c *okapi.Context, req *CreateLocali}func (h *TemplateLocalizationHandler) Update(c *okapi.Context, req *UpdateLocalizationRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }l, err := h.localizationRepo.FindByID(uint(req.ID))if err != nil {return c.AbortNotFound("localization not found")@@ -141,11 +146,7 @@ func (h *TemplateLocalizationHandler) Update(c *okapi.Context, req *UpdateLocalireturn c.AbortNotFound("version not found")}tmpl, err := h.templateRepo.FindByID(v.TemplateID)- if err != nil {- return c.AbortNotFound("template not found")- }- userID := c.GetInt("user_id")- if tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("localization not found")}@@ -158,6 +159,9 @@ func (h *TemplateLocalizationHandler) Update(c *okapi.Context, req *UpdateLocaliif req.Body.TextTemplate != nil {l.TextTemplate = *req.Body.TextTemplate}+ if req.Body.BuilderJSON != nil {+ l.BuilderJSON = *req.Body.BuilderJSON+ }now := time.Now()l.UpdatedAt = &now@@ -170,6 +174,9 @@ func (h *TemplateLocalizationHandler) Update(c *okapi.Context, req *UpdateLocali}func (h *TemplateLocalizationHandler) Delete(c *okapi.Context, req *DeleteLocalizationRequest) error {+ if err := requireEdit(c); err != nil {+ return err+ }l, err := h.localizationRepo.FindByID(uint(req.ID))if err != nil {return c.AbortNotFound("localization not found")@@ -180,11 +187,7 @@ func (h *TemplateLocalizationHandler) Delete(c *okapi.Context, req *DeleteLocalireturn c.AbortNotFound("version not found")}tmpl, err := h.templateRepo.FindByID(v.TemplateID)- if err != nil {- return c.AbortNotFound("template not found")- }- userID := c.GetInt("user_id")- if tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("localization not found")}@@ -196,10 +199,8 @@ func (h *TemplateLocalizationHandler) Delete(c *okapi.Context, req *DeleteLocali}func (h *TemplateLocalizationHandler) Preview(c *okapi.Context, req *PreviewLocalizationRequest) error {- userID := c.GetInt("user_id")-tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}diff --git a/internal/handlers/template_version_handler.go b/internal/handlers/template_version_handler.goindex 71484d7..7380351 100644--- a/internal/handlers/template_version_handler.go+++ b/internal/handlers/template_version_handler.go@@ -21,8 +21,8 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type TemplateVersionHandler struct {@@ -66,10 +66,8 @@ func NewTemplateVersionHandler(}func (h *TemplateVersionHandler) List(c *okapi.Context, req *ListVersionsRequest) error {- userID := c.GetInt("user_id")-tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -82,10 +80,11 @@ func (h *TemplateVersionHandler) List(c *okapi.Context, req *ListVersionsRequest}func (h *TemplateVersionHandler) Create(c *okapi.Context, req *CreateVersionRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -110,10 +109,11 @@ func (h *TemplateVersionHandler) Create(c *okapi.Context, req *CreateVersionRequ}func (h *TemplateVersionHandler) Update(c *okapi.Context, req *UpdateVersionRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -134,10 +134,11 @@ func (h *TemplateVersionHandler) Update(c *okapi.Context, req *UpdateVersionRequ}func (h *TemplateVersionHandler) Activate(c *okapi.Context, req *ActivateVersionRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}@@ -159,10 +160,11 @@ func (h *TemplateVersionHandler) Activate(c *okapi.Context, req *ActivateVersion}func (h *TemplateVersionHandler) Delete(c *okapi.Context, req *DeleteVersionRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }tmpl, err := h.templateRepo.FindByID(uint(req.TemplateID))- if err != nil || tmpl.UserID != uint(userID) {+ if err != nil || !ownsResource(c, tmpl.UserID, tmpl.WorkspaceID) {return c.AbortNotFound("template not found")}diff --git a/internal/handlers/tracking_handler.go b/internal/handlers/tracking_handler.gonew file mode 100644index 0000000..fda4ceb--- /dev/null+++ b/internal/handlers/tracking_handler.go@@ -0,0 +1,271 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "encoding/base64"+ "fmt"+ "net/http"+ "strings"+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/tracking"+ "github.com/goposta/posta/internal/storage/repositories"+)++// 1x1 transparent GIF+var transparentPixel, _ = base64.StdEncoding.DecodeString("R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")++type TrackingHandler struct {+ trackingRepo *repositories.TrackingRepository+ messageRepo *repositories.CampaignMessageRepository+ campaignRepo *repositories.CampaignRepository+ subRepo *repositories.SubscriberRepository+ trackingService *tracking.Service+}++func NewTrackingHandler(+ trackingRepo *repositories.TrackingRepository,+ messageRepo *repositories.CampaignMessageRepository,+ campaignRepo *repositories.CampaignRepository,+ subRepo *repositories.SubscriberRepository,+ trackingService *tracking.Service,+) *TrackingHandler {+ return &TrackingHandler{+ trackingRepo: trackingRepo,+ messageRepo: messageRepo,+ campaignRepo: campaignRepo,+ subRepo: subRepo,+ trackingService: trackingService,+ }+}++type TrackingOpenRequest struct {+ MessageID int `param:"message_id"`+}++type TrackingClickRequest struct {+ MessageID int `param:"message_id"`+ Hash string `param:"hash"`+}++type TrackingUnsubscribeRequest struct {+ Token string `param:"token"`+}++// OpenPixel serves a 1x1 transparent GIF and records the open event.+func (h *TrackingHandler) OpenPixel(c *okapi.Context, req *TrackingOpenRequest) error {+ // Record open asynchronously+ go h.recordOpen(uint(req.MessageID), c.RealIP(), c.Request().UserAgent())++ c.ResponseWriter().Header().Set("Content-Type", "image/gif")+ c.ResponseWriter().Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")+ c.ResponseWriter().WriteHeader(http.StatusOK)+ c.ResponseWriter().Write(transparentPixel)+ return nil+}++// ClickRedirect records the click and redirects to the original URL.+func (h *TrackingHandler) ClickRedirect(c *okapi.Context, req *TrackingClickRequest) error {+ link, err := h.trackingRepo.FindLinkByHash(req.Hash)+ if err != nil {+ return c.AbortNotFound("link not found")+ }++ // Validate redirect URL to prevent SSRF+ if !strings.HasPrefix(link.OriginalURL, "http://") && !strings.HasPrefix(link.OriginalURL, "https://") {+ return c.AbortBadRequest("invalid redirect URL")+ }++ // Record click asynchronously+ go h.recordClick(uint(req.MessageID), link.ID, c.RealIP(), c.Request().UserAgent())++ c.Redirect(http.StatusFound, link.OriginalURL)+ return nil+}++// UnsubscribePage shows a simple unsubscribe confirmation page.+func (h *TrackingHandler) UnsubscribePage(c *okapi.Context, req *TrackingUnsubscribeRequest) error {+ messageID, err := h.trackingService.VerifyUnsubscribeToken(req.Token)+ if err != nil {+ return c.AbortNotFound("invalid or expired unsubscribe link")+ }++ msg, err := h.messageRepo.FindByCampaignMessageID(messageID)+ if err != nil {+ return c.AbortNotFound("message not found")+ }++ sub, err := h.subRepo.FindByID(msg.SubscriberID)+ if err != nil {+ return c.AbortNotFound("subscriber not found")+ }++ html := fmt.Sprintf(`<!DOCTYPE html><html><head><meta charset="utf-8"><title>Unsubscribe</title>+<style>body{font-family:sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#f9fafb}+.card{background:#fff;border-radius:12px;padding:40px;max-width:420px;text-align:center;box-shadow:0 2px 8px rgba(0,0,0,0.08)}+h1{font-size:20px;margin-bottom:8px}p{color:#6b7280;font-size:14px;margin-bottom:20px}+button{background:#9333ea;color:#fff;border:none;padding:12px 32px;border-radius:8px;font-size:15px;cursor:pointer}+button:hover{background:#7e22ce}.done{color:#16a34a;font-weight:600}</style></head><body>+<div class="card"><h1>Unsubscribe</h1><p>%s</p>+<form method="POST"><button type="submit">Confirm Unsubscribe</button></form></div></body></html>`, sub.Email)++ c.ResponseWriter().Header().Set("Content-Type", "text/html; charset=utf-8")+ c.ResponseWriter().WriteHeader(http.StatusOK)+ c.ResponseWriter().Write([]byte(html))+ return nil+}++// UnsubscribeConfirm processes the unsubscribe action.+func (h *TrackingHandler) UnsubscribeConfirm(c *okapi.Context, req *TrackingUnsubscribeRequest) error {+ messageID, err := h.trackingService.VerifyUnsubscribeToken(req.Token)+ if err != nil {+ return c.AbortNotFound("invalid or expired unsubscribe link")+ }++ msg, err := h.messageRepo.FindByCampaignMessageID(messageID)+ if err != nil {+ return c.AbortNotFound("message not found")+ }++ // Update subscriber status+ sub, err := h.subRepo.FindByID(msg.SubscriberID)+ if err != nil {+ return c.AbortNotFound("subscriber not found")+ }++ now := time.Now()+ sub.Status = models.SubscriberStatusUnsubscribed+ sub.UnsubscribedAt = &now+ _ = h.subRepo.Update(sub)++ // Update campaign message+ msg.UnsubscribedAt = &now+ _ = h.messageRepo.UpdateUnsubscribedAt(msg.ID)++ // Record event+ h.trackingRepo.CreateEvent(&models.TrackingEvent{+ CampaignMessageID: msg.ID,+ EventType: models.TrackingEventUnsubscribe,+ IP: c.RealIP(),+ UserAgent: c.Request().UserAgent(),+ })++ html := `<!DOCTYPE html><html><head><meta charset="utf-8"><title>Unsubscribed</title>+<style>body{font-family:sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0;background:#f9fafb}+.card{background:#fff;border-radius:12px;padding:40px;max-width:420px;text-align:center;box-shadow:0 2px 8px rgba(0,0,0,0.08)}+h1{font-size:20px;color:#16a34a}p{color:#6b7280;font-size:14px}</style></head><body>+<div class="card"><h1>Unsubscribed</h1><p>You have been successfully unsubscribed.</p></div></body></html>`++ c.ResponseWriter().Header().Set("Content-Type", "text/html; charset=utf-8")+ c.ResponseWriter().WriteHeader(http.StatusOK)+ c.ResponseWriter().Write([]byte(html))+ return nil+}+++type CampaignAnalyticsRequest struct {+ ID int `param:"id"`+}++type CampaignAnalyticsResponse struct {+ Analytics *repositories.CampaignAnalytics `json:"analytics"`+ VariantAnalytics map[string]*repositories.CampaignAnalytics `json:"variant_analytics,omitempty"`+ Links []models.TrackedLink `json:"links"`+ OpenSeries []repositories.TimeSeriesPoint `json:"open_series"`+ ClickSeries []repositories.TimeSeriesPoint `json:"click_series"`+}++func (h *TrackingHandler) CampaignAnalytics(c *okapi.Context, req *CampaignAnalyticsRequest) error {+ campaign, err := h.campaignRepo.FindByID(uint(req.ID))+ if err != nil || !ownsResource(c, campaign.UserID, campaign.WorkspaceID) {+ return c.AbortNotFound("campaign not found")+ }++ analytics, err := h.trackingRepo.CampaignAnalytics(campaign.ID)+ if err != nil {+ return c.AbortInternalServerError("failed to load analytics")+ }++ variantAnalytics, _ := h.trackingRepo.CampaignAnalyticsByVariant(campaign.ID)++ links, _ := h.trackingRepo.FindLinksByCampaign(campaign.ID)+ openSeries, _ := h.trackingRepo.EventTimeSeries(campaign.ID, models.TrackingEventOpen)+ clickSeries, _ := h.trackingRepo.EventTimeSeries(campaign.ID, models.TrackingEventClick)++ return ok(c, CampaignAnalyticsResponse{+ Analytics: analytics,+ VariantAnalytics: variantAnalytics,+ Links: links,+ OpenSeries: openSeries,+ ClickSeries: clickSeries,+ })+}+++func (h *TrackingHandler) recordOpen(messageID uint, ip, userAgent string) {+ msg, err := h.messageRepo.FindByCampaignMessageID(messageID)+ if err != nil {+ return+ }++ // Record first open on the campaign message+ if msg.OpenedAt == nil {+ now := time.Now()+ msg.OpenedAt = &now+ _ = h.messageRepo.UpdateOpenedAt(msg.ID)+ }++ // Always record the event (for total open tracking)+ h.trackingRepo.CreateEvent(&models.TrackingEvent{+ CampaignMessageID: msg.ID,+ EventType: models.TrackingEventOpen,+ IP: ip,+ UserAgent: userAgent,+ })+}++func (h *TrackingHandler) recordClick(messageID uint, linkID uint, ip, userAgent string) {+ msg, err := h.messageRepo.FindByCampaignMessageID(messageID)+ if err != nil {+ return+ }++ // Record first click on the campaign message+ if msg.ClickedAt == nil {+ now := time.Now()+ msg.ClickedAt = &now+ _ = h.messageRepo.UpdateClickedAt(msg.ID)+ }++ // Increment link click count+ h.trackingRepo.IncrementLinkClickCount(linkID)++ // Record event (unique per link per message for deduplication stats)+ if !h.trackingRepo.HasClickEvent(msg.ID, linkID) {+ h.trackingRepo.CreateEvent(&models.TrackingEvent{+ CampaignMessageID: msg.ID,+ EventType: models.TrackingEventClick,+ TrackedLinkID: &linkID,+ IP: ip,+ UserAgent: userAgent,+ })+ }+}diff --git a/internal/handlers/user_data_handler.go b/internal/handlers/user_data_handler.goindex a9964d8..4981f0e 100644--- a/internal/handlers/user_data_handler.go+++ b/internal/handlers/user_data_handler.go@@ -22,9 +22,9 @@ import ("time""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/config"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/config"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories""gorm.io/gorm")@@ -36,7 +36,6 @@ type UserDataHandler struct {stylesheetRepo *repositories.StyleSheetRepositorylanguageRepo *repositories.LanguageRepositorycontactRepo *repositories.ContactRepository- contactListRepo *repositories.ContactListRepositorywebhookRepo *repositories.WebhookRepositorysuppressionRepo *repositories.SuppressionRepositoryuserSettingRepo *repositories.UserSettingRepository@@ -50,7 +49,6 @@ func NewUserDataHandler(stylesheetRepo *repositories.StyleSheetRepository,languageRepo *repositories.LanguageRepository,contactRepo *repositories.ContactRepository,- contactListRepo *repositories.ContactListRepository,webhookRepo *repositories.WebhookRepository,suppressionRepo *repositories.SuppressionRepository,userSettingRepo *repositories.UserSettingRepository,@@ -63,14 +61,12 @@ func NewUserDataHandler(stylesheetRepo: stylesheetRepo,languageRepo: languageRepo,contactRepo: contactRepo,- contactListRepo: contactListRepo,webhookRepo: webhookRepo,suppressionRepo: suppressionRepo,userSettingRepo: userSettingRepo,}}-// --- Export / Import types ---type UserDataExport struct {PostaVersion string `json:"posta_version"`@@ -79,69 +75,15 @@ type UserDataExport struct {Stylesheets []ExportStyleSheet `json:"stylesheets"`Languages []ExportLanguage `json:"languages"`Contacts []ExportContact `json:"contacts"`- ContactLists []ExportContactList `json:"contact_lists"`Suppressions []ExportSuppression `json:"suppressions"`Webhooks []ExportWebhook `json:"webhooks"`Settings *ExportUserSettings `json:"settings,omitempty"`}-type ExportStyleSheet struct {- Name string `json:"name"`- CSS string `json:"css"`-}--type ExportLanguage struct {- Code string `json:"code"`- Name string `json:"name"`-}--type ExportContact struct {- Email string `json:"email"`- Name string `json:"name"`- SentCount int64 `json:"sent_count"`- FailCount int64 `json:"fail_count"`-}--type ExportContactList struct {- Name string `json:"name"`- Description string `json:"description"`- Members []ExportContactMember `json:"members"`-}--type ExportContactMember struct {- Email string `json:"email"`- Name string `json:"name"`- Data string `json:"data,omitempty"`-}--type ExportSuppression struct {- Email string `json:"email"`- Reason string `json:"reason"`-}--type ExportWebhook struct {- URL string `json:"url"`- Events []string `json:"events"`- Filters []string `json:"filters,omitempty"`-}--type ExportUserSettings struct {- Timezone string `json:"timezone"`- DefaultSenderName string `json:"default_sender_name"`- DefaultSenderEmail string `json:"default_sender_email"`- EmailNotifications bool `json:"email_notifications"`- NotificationEmail string `json:"notification_email"`- WebhookRetryCount int `json:"webhook_retry_count"`- APIKeyExpiryDays int `json:"api_key_expiry_days"`- BounceAutoSuppress bool `json:"bounce_auto_suppress"`- DailyReport bool `json:"daily_report"`-}-type ImportUserDataRequest struct {Body UserDataExport `json:"body"`}-// --- GDPR types ---type GDPRDeleteContactsRequest struct {Body struct {@@ -160,371 +102,85 @@ type GDPRDeleteResult struct {Message string `json:"message"`}-// --- Export handler ---func (h *UserDataHandler) Export(c *okapi.Context) error {userID := uint(c.GetInt("user_id"))+ scope := repositories.ResourceScope{UserID: userID}- // Templates (reuse existing TemplateExport struct)- templates, _, err := h.templateRepo.FindByUserID(userID, 10000, 0)+ templates, _, err := h.templateRepo.FindByScope(scope, exportLimit, 0)if err != nil {return c.AbortInternalServerError("failed to load templates")}-- exportTemplates := make([]TemplateExport, 0, len(templates))- for _, tmpl := range templates {- versions, err := h.versionRepo.FindByTemplateID(tmpl.ID)- if err != nil {- return c.AbortInternalServerError("failed to load template versions")- }-- exportVersions := make([]ExportVersion, 0, len(versions))- for _, v := range versions {- localizations, err := h.localizationRepo.FindByVersionID(v.ID)- if err != nil {- return c.AbortInternalServerError("failed to load localizations")- }-- exportLocs := make([]ExportLocalization, 0, len(localizations))- for _, l := range localizations {- exportLocs = append(exportLocs, ExportLocalization{- Language: l.Language,- SubjectTemplate: l.SubjectTemplate,- HTMLTemplate: l.HTMLTemplate,- TextTemplate: l.TextTemplate,- })- }-- isActive := tmpl.ActiveVersionID != nil && *tmpl.ActiveVersionID == v.ID- exportVersions = append(exportVersions, ExportVersion{- Version: v.Version,- SampleData: v.SampleData,- IsActive: isActive,- Localizations: exportLocs,- })- }-- exportTemplates = append(exportTemplates, TemplateExport{- Name: tmpl.Name,- Description: tmpl.Description,- DefaultLanguage: tmpl.DefaultLanguage,- SampleData: tmpl.SampleData,- Versions: exportVersions,- })+ tmplExport, err := exportTemplates(templates, h.versionRepo, h.localizationRepo)+ if err != nil {+ return c.AbortInternalServerError("failed to load template details")}- // Stylesheets- stylesheets, _, err := h.stylesheetRepo.FindByUserID(userID, 10000, 0)+ stylesheets, _, err := h.stylesheetRepo.FindByScope(scope, exportLimit, 0)if err != nil {return c.AbortInternalServerError("failed to load stylesheets")}- exportStylesheets := make([]ExportStyleSheet, 0, len(stylesheets))- for _, ss := range stylesheets {- exportStylesheets = append(exportStylesheets, ExportStyleSheet{- Name: ss.Name,- CSS: ss.CSS,- })- }- // Languages- languages, _, err := h.languageRepo.FindByUserID(userID, 10000, 0)+ languages, _, err := h.languageRepo.FindByScope(scope, exportLimit, 0)if err != nil {return c.AbortInternalServerError("failed to load languages")}- exportLanguages := make([]ExportLanguage, 0, len(languages))- for _, lang := range languages {- exportLanguages = append(exportLanguages, ExportLanguage{- Code: lang.Code,- Name: lang.Name,- })- }- // Contacts- contacts, _, err := h.contactRepo.FindByUserID(userID, "", 10000, 0)+ contacts, _, err := h.contactRepo.FindByScope(scope, "", exportLimit, 0)if err != nil {return c.AbortInternalServerError("failed to load contacts")}- exportContacts := make([]ExportContact, 0, len(contacts))- for _, ct := range contacts {- exportContacts = append(exportContacts, ExportContact{- Email: ct.Email,- Name: ct.Name,- SentCount: ct.SentCount,- FailCount: ct.FailCount,- })- }-- // Contact Lists with members- contactLists, _, err := h.contactListRepo.FindByUserID(userID, 10000, 0)- if err != nil {- return c.AbortInternalServerError("failed to load contact lists")- }- exportContactLists := make([]ExportContactList, 0, len(contactLists))- for _, cl := range contactLists {- members, _, err := h.contactListRepo.ListMembers(cl.ID, 100000, 0)- if err != nil {- return c.AbortInternalServerError("failed to load contact list members")- }- exportMembers := make([]ExportContactMember, 0, len(members))- for _, m := range members {- exportMembers = append(exportMembers, ExportContactMember{- Email: m.Email,- Name: m.Name,- Data: m.Data,- })- }- exportContactLists = append(exportContactLists, ExportContactList{- Name: cl.Name,- Description: cl.Description,- Members: exportMembers,- })- }- // Suppressions- suppressions, _, err := h.suppressionRepo.FindByUserID(userID, 10000, 0)+ suppressions, _, err := h.suppressionRepo.FindByScope(scope, exportLimit, 0)if err != nil {return c.AbortInternalServerError("failed to load suppressions")}- exportSuppressions := make([]ExportSuppression, 0, len(suppressions))- for _, s := range suppressions {- exportSuppressions = append(exportSuppressions, ExportSuppression{- Email: s.Email,- Reason: s.Reason,- })- }- // Webhooks- webhooks, _, err := h.webhookRepo.FindByUserID(userID, 10000, 0)+ webhooks, _, err := h.webhookRepo.FindByScope(scope, exportLimit, 0)if err != nil {return c.AbortInternalServerError("failed to load webhooks")}- exportWebhooks := make([]ExportWebhook, 0, len(webhooks))- for _, wh := range webhooks {- exportWebhooks = append(exportWebhooks, ExportWebhook{- URL: wh.URL,- Events: wh.Events,- Filters: wh.Filters,- })- }- // User settings- var exportSettings *ExportUserSettings- settings, err := h.userSettingRepo.FindByUserID(userID)- if err == nil && settings != nil {- exportSettings = &ExportUserSettings{- Timezone: settings.Timezone,- DefaultSenderName: settings.DefaultSenderName,- DefaultSenderEmail: settings.DefaultSenderEmail,- EmailNotifications: settings.EmailNotifications,- NotificationEmail: settings.NotificationEmail,- WebhookRetryCount: settings.WebhookRetryCount,- APIKeyExpiryDays: settings.APIKeyExpiryDays,- BounceAutoSuppress: settings.BounceAutoSuppress,- DailyReport: settings.DailyReport,+ var settings *ExportUserSettings+ s, err := h.userSettingRepo.FindByUserID(userID)+ if err == nil && s != nil {+ settings = &ExportUserSettings{+ Timezone: s.Timezone,+ DefaultSenderName: s.DefaultSenderName,+ DefaultSenderEmail: s.DefaultSenderEmail,+ EmailNotifications: s.EmailNotifications,+ NotificationEmail: s.NotificationEmail,+ WebhookRetryCount: s.WebhookRetryCount,+ APIKeyExpiryDays: s.APIKeyExpiryDays,+ BounceAutoSuppress: s.BounceAutoSuppress,+ DailyReport: s.DailyReport,}}- export := UserDataExport{+ return ok(c, UserDataExport{PostaVersion: config.Version,ExportedAt: time.Now().UTC().Format(time.RFC3339),- Templates: exportTemplates,- Stylesheets: exportStylesheets,- Languages: exportLanguages,- Contacts: exportContacts,- ContactLists: exportContactLists,- Suppressions: exportSuppressions,- Webhooks: exportWebhooks,- Settings: exportSettings,- }-- return ok(c, export)+ Templates: tmplExport,+ Stylesheets: exportStylesheets(stylesheets),+ Languages: exportLanguages(languages),+ Contacts: exportContacts(contacts),+ Suppressions: exportSuppressions(suppressions),+ Webhooks: exportWebhooks(webhooks),+ Settings: settings,+ })}-// Import-func (h *UserDataHandler) Import(c *okapi.Context, req *ImportUserDataRequest) error {userID := uint(c.GetInt("user_id"))data := req.Body- var importedCount int-- for _, lang := range data.Languages {- if lang.Code == "" || lang.Name == "" {- continue- }- l := &models.Language{- UserID: userID,- Code: lang.Code,- Name: lang.Name,- }- if err := h.languageRepo.Create(l); err != nil {- continue // skip duplicates- }- importedCount++- }-- // Import stylesheets- stylesheetMap := make(map[string]uint) // name -> id for template reference- for _, ss := range data.Stylesheets {- if ss.Name == "" {- continue- }- s := &models.StyleSheet{- UserID: userID,- Name: ss.Name,- CSS: ss.CSS,- }- if err := h.stylesheetRepo.Create(s); err != nil {- continue // skip duplicates- }- stylesheetMap[s.Name] = s.ID- importedCount++- }-- // Import templates (reuse template import logic)- for _, tmplData := range data.Templates {- if tmplData.Name == "" {- continue- }-- defaultLang := tmplData.DefaultLanguage- if defaultLang == "" {- defaultLang = "en"- }-- tmpl := &models.Template{- UserID: userID,- Name: tmplData.Name,- DefaultLanguage: defaultLang,- Description: tmplData.Description,- SampleData: tmplData.SampleData,- }-- if err := h.templateRepo.Create(tmpl); err != nil {- continue // skip duplicates- }-- var activeVersionDBID *uint-- for _, ev := range tmplData.Versions {- nextVersion, err := h.versionRepo.NextVersion(tmpl.ID)- if err != nil {- continue- }-- v := &models.TemplateVersion{- TemplateID: tmpl.ID,- Version: nextVersion,- SampleData: ev.SampleData,- }- if err := h.versionRepo.Create(v); err != nil {- continue- }-- if ev.IsActive {- activeVersionDBID = &v.ID- }-- for _, el := range ev.Localizations {- l := &models.TemplateLocalization{- VersionID: v.ID,- Language: el.Language,- SubjectTemplate: el.SubjectTemplate,- HTMLTemplate: el.HTMLTemplate,- TextTemplate: el.TextTemplate,- }- _ = h.localizationRepo.Create(l)- }- }-- if len(tmplData.Versions) == 0 {- v := &models.TemplateVersion{- TemplateID: tmpl.ID,- Version: 1,- SampleData: tmplData.SampleData,- }- if err := h.versionRepo.Create(v); err == nil {- activeVersionDBID = &v.ID- }- }-- if activeVersionDBID != nil {- tmpl.ActiveVersionID = activeVersionDBID- _ = h.templateRepo.Update(tmpl)- }-- importedCount++- }-- // Import contacts- for _, ct := range data.Contacts {- if ct.Email == "" {- continue- }- contact := &models.Contact{- UserID: userID,- Email: ct.Email,- Name: ct.Name,- SentCount: ct.SentCount,- FailCount: ct.FailCount,- }- if err := h.db.Create(contact).Error; err != nil {- continue // skip duplicates- }- importedCount++- }-- // Import contact lists- for _, cl := range data.ContactLists {- if cl.Name == "" {- continue- }- list := &models.ContactList{- UserID: userID,- Name: cl.Name,- Description: cl.Description,- }- if err := h.contactListRepo.Create(list); err != nil {- continue- }- for _, m := range cl.Members {- member := &models.ContactListMember{- ListID: list.ID,- Email: m.Email,- Name: m.Name,- Data: m.Data,- }- _ = h.contactListRepo.AddMember(member)- }- importedCount++- }-- // Import suppressions- for _, s := range data.Suppressions {- if s.Email == "" {- continue- }- sup := &models.Suppression{- UserID: userID,- Email: s.Email,- Reason: s.Reason,- }- _ = h.suppressionRepo.Create(sup)- }-- // Import webhooks- for _, wh := range data.Webhooks {- if wh.URL == "" {- continue- }- webhook := &models.Webhook{- UserID: userID,- URL: wh.URL,- Events: wh.Events,- Filters: wh.Filters,- }- h.db.Create(webhook)- }+ var total int+ total += importLanguages(data.Languages, userID, nil, h.languageRepo)+ total += importStylesheets(data.Stylesheets, userID, nil, h.stylesheetRepo)+ total += importTemplates(data.Templates, userID, nil, h.templateRepo, h.versionRepo, h.localizationRepo)+ total += importContacts(data.Contacts, userID, nil, h.db)+ total += importSuppressions(data.Suppressions, userID, nil, h.suppressionRepo)+ total += importWebhooks(data.Webhooks, userID, nil, h.db)// Import settingsif data.Settings != nil {@@ -545,18 +201,16 @@ func (h *UserDataHandler) Import(c *okapi.Context, req *ImportUserDataRequest) ereturn ok(c, map[string]any{"message": "Data imported successfully",- "imported_count": importedCount,+ "imported_count": total,})}-// GDPR Delete Contactsfunc (h *UserDataHandler) DeleteContacts(c *okapi.Context, req *GDPRDeleteContactsRequest) error {userID := uint(c.GetInt("user_id"))email := req.Body.Emailif email == "" {- // Delete all contactsresult := h.db.Where("user_id = ?", userID).Delete(&models.Contact{})if result.Error != nil {return c.AbortInternalServerError("failed to delete contacts")@@ -567,16 +221,13 @@ func (h *UserDataHandler) DeleteContacts(c *okapi.Context, req *GDPRDeleteContac})}- // Delete specific contact by emailresult := h.db.Where("user_id = ? AND email = ?", userID, email).Delete(&models.Contact{})if result.Error != nil {return c.AbortInternalServerError("failed to delete contact")}- // Also remove from suppression listh.db.Where("user_id = ? AND email = ?", userID, email).Delete(&models.Suppression{})- // Also remove from contact list membershipsvar listIDs []uinth.db.Model(&models.ContactList{}).Where("user_id = ?", userID).Pluck("id", &listIDs)if len(listIDs) > 0 {@@ -589,14 +240,13 @@ func (h *UserDataHandler) DeleteContacts(c *okapi.Context, req *GDPRDeleteContac})}-// GDPR Delete Email Logsfunc (h *UserDataHandler) DeleteEmailLogs(c *okapi.Context, req *GDPRDeleteEmailLogsRequest) error {userID := uint(c.GetInt("user_id"))days := req.Body.OlderThanDaysif days <= 0 {- days = 0 // delete all+ days = 0}query := h.db.Where("user_id = ?", userID)@@ -605,14 +255,12 @@ func (h *UserDataHandler) DeleteEmailLogs(c *okapi.Context, req *GDPRDeleteEmailquery = query.Where("created_at < ?", before)}- // Delete bounces for matching emails firstvar emailIDs []uintquery.Model(&models.Email{}).Pluck("id", &emailIDs)if len(emailIDs) > 0 {h.db.Where("email_id IN ?", emailIDs).Delete(&models.Bounce{})}- // Delete the emailsresult := query.Delete(&models.Email{})if result.Error != nil {return c.AbortInternalServerError("failed to delete email logs")diff --git a/internal/handlers/user_handler.go b/internal/handlers/user_handler.goindex 8e76e67..96b09cc 100644--- a/internal/handlers/user_handler.go+++ b/internal/handlers/user_handler.go@@ -26,13 +26,13 @@ import ("github.com/google/uuid""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/dto"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/eventbus"- "github.com/jkaninda/posta/internal/services/seeder"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/services/twofactor"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/services/seeder"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/services/twofactor"+ "github.com/goposta/posta/internal/storage/repositories""golang.org/x/crypto/bcrypt")@@ -67,7 +67,7 @@ func (h *UserHandler) SetSettings(s *settings.Provider) {type LoginRequest struct {Body struct {Email string `json:"email" required:"true" format:"email"`- Password string `json:"password" required:"true"`+ Password string `json:"password" required:"true" minLength:"4"`TwoFactorCode string `json:"two_factor_code"`} `json:"body"`}@@ -89,6 +89,7 @@ type UserProfile struct {Role models.UserRole `json:"role"`TwoFactorEnabled bool `json:"two_factor_enabled"`RequireVerifiedDomain bool `json:"require_verified_domain"`+ ScheduledDeletionAt *time.Time `json:"scheduled_deletion_at"`CreatedAt time.Time `json:"created_at"`}@@ -234,6 +235,7 @@ func (h *UserHandler) UpdateProfile(c *okapi.Context, req *UpdateProfileRequest)Role: user.Role,TwoFactorEnabled: user.TwoFactorEnabled,RequireVerifiedDomain: user.RequireVerifiedDomain,+ ScheduledDeletionAt: user.ScheduledDeletionAt,CreatedAt: user.CreatedAt,})}@@ -338,6 +340,7 @@ func (h *UserHandler) Me(c *okapi.Context) error {Role: user.Role,TwoFactorEnabled: user.TwoFactorEnabled,RequireVerifiedDomain: user.RequireVerifiedDomain,+ ScheduledDeletionAt: user.ScheduledDeletionAt,CreatedAt: user.CreatedAt,})}@@ -453,3 +456,67 @@ func (h *UserHandler) generateTokenWithSession(c *okapi.Context, user *models.Usreturn token, jti, nil}++// RequestAccountDeletion schedules the current user's account for deletion in 7 days.+func (h *UserHandler) RequestAccountDeletion(c *okapi.Context) error {+ userID := c.GetInt("user_id")+ user, err := h.repo.FindByID(uint(userID))+ if err != nil {+ return c.AbortNotFound("user not found")+ }++ if user.Role == models.UserRoleAdmin {+ return c.AbortBadRequest("admin accounts cannot be self-deleted")+ }++ 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.repo.Update(user); err != nil {+ return c.AbortInternalServerError("failed to schedule account deletion")+ }++ if h.bus != nil {+ uid := user.ID+ h.bus.PublishSimple(models.EventCategoryUser, "user.deletion_requested", &uid, user.Email, c.RealIP(),+ fmt.Sprintf("Account deletion scheduled for %s", deletionDate.Format("2006-01-02")), nil)+ }++ return ok(c, map[string]any{+ "message": "Account scheduled for deletion",+ "scheduled_deletion_at": deletionDate,+ })+}++// CancelAccountDeletion cancels a previously scheduled account deletion.+func (h *UserHandler) CancelAccountDeletion(c *okapi.Context) error {+ userID := c.GetInt("user_id")+ user, err := h.repo.FindByID(uint(userID))+ if err != nil {+ return c.AbortNotFound("user not found")+ }++ if user.ScheduledDeletionAt == nil {+ return c.AbortBadRequest("no deletion is scheduled")+ }++ user.ScheduledDeletionAt = nil+ user.Active = true++ if err := h.repo.Update(user); err != nil {+ return c.AbortInternalServerError("failed to cancel account deletion")+ }++ if h.bus != nil {+ uid := user.ID+ h.bus.PublishSimple(models.EventCategoryUser, "user.deletion_cancelled", &uid, user.Email, c.RealIP(),+ "Account deletion cancelled", nil)+ }++ return ok(c, map[string]any{"message": "Account deletion cancelled"})+}diff --git a/internal/handlers/user_setting_handler.go b/internal/handlers/user_setting_handler.goindex 2fd006a..ba4c3f5 100644--- a/internal/handlers/user_setting_handler.go+++ b/internal/handlers/user_setting_handler.go@@ -19,7 +19,7 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/storage/repositories")// UserSettingHandler handles per-user settings.@@ -31,7 +31,6 @@ func NewUserSettingHandler(repo *repositories.UserSettingRepository) *UserSettinreturn &UserSettingHandler{repo: repo}}-// --- Request types ---type UpdateUserSettingsRequest struct {Body struct {@@ -44,12 +43,11 @@ type UpdateUserSettingsRequest struct {DefaultTemplateID *uint `json:"default_template_id"`APIKeyExpiryDays *int `json:"api_key_expiry_days"`BounceAutoSuppress *bool `json:"bounce_auto_suppress"`+ DefaultLanguage *string `json:"default_language"`DailyReport *bool `json:"daily_report"`} `json:"body"`}-// --- Handlers ----func (h *UserSettingHandler) GetSettings(c *okapi.Context) error {userID := uint(c.GetInt("user_id"))@@ -95,6 +93,9 @@ func (h *UserSettingHandler) UpdateSettings(c *okapi.Context, req *UpdateUserSetif req.Body.BounceAutoSuppress != nil {settings.BounceAutoSuppress = *req.Body.BounceAutoSuppress}+ if req.Body.DefaultLanguage != nil {+ settings.DefaultLanguage = *req.Body.DefaultLanguage+ }if req.Body.DailyReport != nil {settings.DailyReport = *req.Body.DailyReport}diff --git a/internal/handlers/webhook_delivery_handler.go b/internal/handlers/webhook_delivery_handler.goindex 503716c..eb90f8b 100644--- a/internal/handlers/webhook_delivery_handler.go+++ b/internal/handlers/webhook_delivery_handler.go@@ -19,7 +19,7 @@ package handlersimport ("github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/storage/repositories")type WebhookDeliveryHandler struct {@@ -31,10 +31,9 @@ func NewWebhookDeliveryHandler(repo *repositories.WebhookDeliveryRepository) *We}func (h *WebhookDeliveryHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- deliveries, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ deliveries, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list webhook deliveries")}diff --git a/internal/handlers/webhook_handler.go b/internal/handlers/webhook_handler.goindex 0c4648e..87f9302 100644--- a/internal/handlers/webhook_handler.go+++ b/internal/handlers/webhook_handler.go@@ -22,9 +22,9 @@ import ("encoding/hex""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/audit"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/audit"+ "github.com/goposta/posta/internal/storage/repositories")type WebhookHandler struct {@@ -47,7 +47,10 @@ func NewWebhookHandler(repo *repositories.WebhookRepository, audit *audit.Logger}func (h *WebhookHandler) Create(c *okapi.Context, req *CreateWebhookRequest) error {- userID := c.GetInt("user_id")+ if err := requireEdit(c); err != nil {+ return err+ }+ scope := getScope(c)// Validate event namesvalidEvents := map[string]bool{"email.sent": true, "email.failed": true}@@ -65,7 +68,8 @@ func (h *WebhookHandler) Create(c *okapi.Context, req *CreateWebhookRequest) errsecret := hex.EncodeToString(secretBytes)wh := &models.Webhook{- UserID: uint(userID),+ UserID: scope.UserID,+ WorkspaceID: scope.WorkspaceID,URL: req.Body.URL,Events: req.Body.Events,Filters: req.Body.Filters,@@ -76,16 +80,15 @@ func (h *WebhookHandler) Create(c *okapi.Context, req *CreateWebhookRequest) errreturn c.AbortInternalServerError("failed to create webhook", err)}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "webhook.created", "Webhook created: "+req.Body.URL, nil)+ h.audit.Log(scope.UserID, c.GetString("email"), c.RealIP(), "webhook.created", "Webhook created: "+req.Body.URL, nil)return created(c, wh)}func (h *WebhookHandler) List(c *okapi.Context, req *ListRequest) error {- userID := c.GetInt("user_id")page, size, offset := normalizePageParams(req.Page, req.Size)- webhooks, total, err := h.repo.FindByUserID(uint(userID), size, offset)+ webhooks, total, err := h.repo.FindByScope(getScope(c), size, offset)if err != nil {return c.AbortInternalServerError("failed to list webhooks")}@@ -94,10 +97,11 @@ func (h *WebhookHandler) List(c *okapi.Context, req *ListRequest) error {}func (h *WebhookHandler) Delete(c *okapi.Context, req *DeleteWebhookRequest) error {- userID := c.GetInt("user_id")-+ if err := requireEdit(c); err != nil {+ return err+ }wh, err := h.repo.FindByID(uint(req.ID))- if err != nil || wh.UserID != uint(userID) {+ if err != nil || !ownsResource(c, wh.UserID, wh.WorkspaceID) {return c.AbortNotFound("webhook not found")}@@ -105,7 +109,7 @@ func (h *WebhookHandler) Delete(c *okapi.Context, req *DeleteWebhookRequest) errreturn c.AbortInternalServerError("failed to delete webhook")}- h.audit.Log(uint(userID), c.GetString("email"), c.RealIP(), "webhook.deleted", "Webhook deleted: "+wh.URL, nil)+ h.audit.Log(wh.UserID, c.GetString("email"), c.RealIP(), "webhook.deleted", "Webhook deleted: "+wh.URL, nil)return noContent(c)}diff --git a/internal/handlers/workspace_data_handler.go b/internal/handlers/workspace_data_handler.gonew file mode 100644index 0000000..2f25ce9--- /dev/null+++ b/internal/handlers/workspace_data_handler.go@@ -0,0 +1,235 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/config"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm"+)++type WorkspaceDataHandler struct {+ db *gorm.DB+ workspaceRepo *repositories.WorkspaceRepository+ templateRepo *repositories.TemplateRepository+ versionRepo *repositories.TemplateVersionRepository+ localizationRepo *repositories.TemplateLocalizationRepository+ stylesheetRepo *repositories.StyleSheetRepository+ languageRepo *repositories.LanguageRepository+ contactRepo *repositories.ContactRepository+ contactListRepo *repositories.ContactListRepository+ webhookRepo *repositories.WebhookRepository+ suppressionRepo *repositories.SuppressionRepository+ smtpRepo *repositories.SMTPRepository+ domainRepo *repositories.DomainRepository+ subscriberRepo *repositories.SubscriberRepository+ subscriberListRepo *repositories.SubscriberListRepository+}++func NewWorkspaceDataHandler(+ db *gorm.DB,+ workspaceRepo *repositories.WorkspaceRepository,+ templateRepo *repositories.TemplateRepository,+ versionRepo *repositories.TemplateVersionRepository,+ localizationRepo *repositories.TemplateLocalizationRepository,+ stylesheetRepo *repositories.StyleSheetRepository,+ languageRepo *repositories.LanguageRepository,+ contactRepo *repositories.ContactRepository,+ contactListRepo *repositories.ContactListRepository,+ webhookRepo *repositories.WebhookRepository,+ suppressionRepo *repositories.SuppressionRepository,+ smtpRepo *repositories.SMTPRepository,+ domainRepo *repositories.DomainRepository,+ subscriberRepo *repositories.SubscriberRepository,+ subscriberListRepo *repositories.SubscriberListRepository,+) *WorkspaceDataHandler {+ return &WorkspaceDataHandler{+ db: db,+ workspaceRepo: workspaceRepo,+ templateRepo: templateRepo,+ versionRepo: versionRepo,+ localizationRepo: localizationRepo,+ stylesheetRepo: stylesheetRepo,+ languageRepo: languageRepo,+ contactRepo: contactRepo,+ contactListRepo: contactListRepo,+ webhookRepo: webhookRepo,+ suppressionRepo: suppressionRepo,+ smtpRepo: smtpRepo,+ domainRepo: domainRepo,+ subscriberRepo: subscriberRepo,+ subscriberListRepo: subscriberListRepo,+ }+}+++type WorkspaceDataExport struct {+ PostaVersion string `json:"posta_version"`+ ExportedAt string `json:"exported_at"`+ WorkspaceSettings ExportWorkspaceSettings `json:"workspace_settings"`+ Templates []TemplateExport `json:"templates"`+ Stylesheets []ExportStyleSheet `json:"stylesheets"`+ Languages []ExportLanguage `json:"languages"`+ Contacts []ExportContact `json:"contacts"`+ ContactLists []ExportContactList `json:"contact_lists"`+ Suppressions []ExportSuppression `json:"suppressions"`+ Webhooks []ExportWebhook `json:"webhooks"`+ SMTPServers []ExportSMTPServer `json:"smtp_servers"`+ Domains []ExportDomain `json:"domains"`+ Subscribers []ExportSubscriber `json:"subscribers"`+ SubscriberLists []ExportSubscriberList `json:"subscriber_lists"`+}++type ImportWorkspaceDataRequest struct {+ Body WorkspaceDataExport `json:"body"`+}++func (h *WorkspaceDataHandler) Export(c *okapi.Context) error {+ wsID := uint(c.GetInt("workspace_id"))+ scope := repositories.ResourceScope{WorkspaceID: &wsID}++ ws, err := h.workspaceRepo.FindByID(wsID)+ if err != nil {+ return c.AbortNotFound("workspace not found")+ }++ templates, _, err := h.templateRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load templates")+ }+ tmplExport, err := exportTemplates(templates, h.versionRepo, h.localizationRepo)+ if err != nil {+ return c.AbortInternalServerError("failed to load template details")+ }++ stylesheets, _, err := h.stylesheetRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load stylesheets")+ }++ languages, _, err := h.languageRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load languages")+ }++ contacts, _, err := h.contactRepo.FindByScope(scope, "", exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load contacts")+ }++ contactLists, _, err := h.contactListRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load contact lists")+ }++ suppressions, _, err := h.suppressionRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load suppressions")+ }++ webhooks, _, err := h.webhookRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load webhooks")+ }++ smtpServers, _, err := h.smtpRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load SMTP servers")+ }++ domains, _, err := h.domainRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load domains")+ }++ subscribers, _, err := h.subscriberRepo.FindByScope(scope, "", "", exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load subscribers")+ }++ subscriberLists, _, err := h.subscriberListRepo.FindByScope(scope, exportLimit, 0)+ if err != nil {+ return c.AbortInternalServerError("failed to load subscriber lists")+ }++ return ok(c, WorkspaceDataExport{+ PostaVersion: config.Version,+ ExportedAt: time.Now().UTC().Format(time.RFC3339),+ WorkspaceSettings: ExportWorkspaceSettings{+ Name: ws.Name,+ Description: ws.Description,+ DefaultLanguage: ws.DefaultLanguage,+ },+ Templates: tmplExport,+ Stylesheets: exportStylesheets(stylesheets),+ Languages: exportLanguages(languages),+ Contacts: exportContacts(contacts),+ ContactLists: exportContactLists(contactLists, h.db),+ Suppressions: exportSuppressions(suppressions),+ Webhooks: exportWebhooks(webhooks),+ SMTPServers: exportSMTPServers(smtpServers),+ Domains: exportDomains(domains),+ Subscribers: exportSubscribers(subscribers),+ SubscriberLists: exportSubscriberLists(subscriberLists),+ })+}++func (h *WorkspaceDataHandler) Import(c *okapi.Context, req *ImportWorkspaceDataRequest) error {+ userID := uint(c.GetInt("user_id"))+ wsID := uint(c.GetInt("workspace_id"))+ data := req.Body++ // Import workspace settings+ if data.WorkspaceSettings.Name != "" || data.WorkspaceSettings.Description != "" || data.WorkspaceSettings.DefaultLanguage != "" {+ ws, err := h.workspaceRepo.FindByID(wsID)+ if err == nil {+ if data.WorkspaceSettings.Name != "" {+ ws.Name = data.WorkspaceSettings.Name+ }+ if data.WorkspaceSettings.Description != "" {+ ws.Description = data.WorkspaceSettings.Description+ }+ if data.WorkspaceSettings.DefaultLanguage != "" {+ ws.DefaultLanguage = data.WorkspaceSettings.DefaultLanguage+ }+ ws.UpdatedAt = time.Now()+ _ = h.workspaceRepo.Update(ws)+ }+ }++ var total int+ total += importLanguages(data.Languages, userID, &wsID, h.languageRepo)+ total += importStylesheets(data.Stylesheets, userID, &wsID, h.stylesheetRepo)+ total += importTemplates(data.Templates, userID, &wsID, h.templateRepo, h.versionRepo, h.localizationRepo)+ total += importContacts(data.Contacts, userID, &wsID, h.db)+ total += importContactLists(data.ContactLists, userID, &wsID, h.db)+ total += importSuppressions(data.Suppressions, userID, &wsID, h.suppressionRepo)+ total += importWebhooks(data.Webhooks, userID, &wsID, h.db)+ total += importSMTPServers(data.SMTPServers, userID, &wsID, h.db)+ total += importDomains(data.Domains, userID, &wsID, h.db)+ total += importSubscribers(data.Subscribers, userID, &wsID, h.db)+ total += importSubscriberLists(data.SubscriberLists, userID, &wsID, h.db)++ return ok(c, map[string]any{+ "message": "Workspace data imported successfully",+ "imported_count": total,+ })+}diff --git a/internal/handlers/workspace_handler.go b/internal/handlers/workspace_handler.gonew file mode 100644index 0000000..6769495--- /dev/null+++ b/internal/handlers/workspace_handler.go@@ -0,0 +1,750 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package handlers++import (+ "crypto/rand"+ "encoding/hex"+ "fmt"+ "regexp"+ "strings"+ "time"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm"+)++type WorkspaceHandler struct {+ workspaceRepo *repositories.WorkspaceRepository+ userRepo *repositories.UserRepository+ db *gorm.DB+ planService planService+}++// planService is an optional interface for resolving workspace plans and quotas.+type planService interface {+ EffectivePlan(workspaceID *uint) *models.Plan+ CheckWorkspaceQuota(db *gorm.DB, userID uint) error+}++func NewWorkspaceHandler(workspaceRepo *repositories.WorkspaceRepository, userRepo *repositories.UserRepository, db *gorm.DB) *WorkspaceHandler {+ return &WorkspaceHandler{+ workspaceRepo: workspaceRepo,+ userRepo: userRepo,+ db: db,+ }+}+++type CreateWorkspaceRequest struct {+ Body struct {+ Name string `json:"name" required:"true" minLength:"1"`+ Slug string `json:"slug"`+ Description string `json:"description"`+ DefaultLanguage string `json:"default_language"`+ } `json:"body"`+}++type UpdateWorkspaceRequest struct {+ Body struct {+ Name string `json:"name"`+ Description string `json:"description"`+ DefaultLanguage string `json:"default_language"`+ } `json:"body"`+}++type InviteMemberRequest struct {+ Body struct {+ Email string `json:"email" required:"true" format:"email"`+ Role models.WorkspaceRole `json:"role" required:"true"`+ } `json:"body"`+}++type UpdateMemberRoleRequest struct {+ MemberID int `param:"member_id"`+ Body struct {+ Role models.WorkspaceRole `json:"role" required:"true"`+ } `json:"body"`+}++type RemoveWorkspaceMemberRequest struct {+ MemberID int `param:"member_id"`+}++type AcceptInvitationRequest struct {+ Body struct {+ Token string `json:"token" required:"true"`+ } `json:"body"`+}++type DeclineInvitationRequest struct {+ Body struct {+ Token string `json:"token" required:"true"`+ } `json:"body"`+}++type WorkspaceResponse struct {+ ID uint `json:"id"`+ Name string `json:"name"`+ Slug string `json:"slug"`+ Description string `json:"description"`+ OwnerID uint `json:"owner_id"`+ Role string `json:"role"`+ CreatedAt time.Time `json:"created_at"`+}++type WorkspaceMemberResponse struct {+ ID uint `json:"id"`+ UserID uint `json:"user_id"`+ Name string `json:"name"`+ Email string `json:"email"`+ Role string `json:"role"`+ CreatedAt time.Time `json:"created_at"`+}++type InvitationResponse struct {+ ID uint `json:"id"`+ WorkspaceID uint `json:"workspace_id"`+ Workspace string `json:"workspace"`+ Email string `json:"email"`+ Role string `json:"role"`+ Status string `json:"status"`+ ExpiresAt time.Time `json:"expires_at"`+ CreatedAt time.Time `json:"created_at"`+}++func (h *WorkspaceHandler) Create(c *okapi.Context, req *CreateWorkspaceRequest) error {+ userID := c.GetInt("user_id")++ if h.planService != nil {+ if err := h.planService.CheckWorkspaceQuota(h.db, uint(userID)); err != nil {+ return c.AbortForbidden(err.Error())+ }+ }++ slug := req.Body.Slug+ if slug == "" {+ slug = slugify(req.Body.Name)+ }++ // Validate slug format+ if !isValidSlug(slug) {+ return c.AbortBadRequest("slug must contain only lowercase letters, numbers, and hyphens")+ }++ // Check slug uniqueness+ if _, err := h.workspaceRepo.FindBySlug(slug); err == nil {+ return c.AbortConflict("workspace slug already exists")+ }++ defaultLang := strings.TrimSpace(req.Body.DefaultLanguage)+ if defaultLang == "" {+ defaultLang = "en"+ }++ ws := &models.Workspace{+ Name: strings.TrimSpace(req.Body.Name),+ Slug: slug,+ Description: req.Body.Description,+ DefaultLanguage: defaultLang,+ OwnerID: uint(userID),+ }++ if err := h.workspaceRepo.Create(ws); err != nil {+ return c.AbortInternalServerError("failed to create workspace")+ }++ // Add creator as owner+ member := &models.WorkspaceMember{+ WorkspaceID: ws.ID,+ UserID: uint(userID),+ Role: models.WorkspaceRoleOwner,+ }+ if err := h.workspaceRepo.AddMember(member); err != nil {+ return c.AbortInternalServerError("failed to add workspace member")+ }++ return created(c, WorkspaceResponse{+ ID: ws.ID,+ Name: ws.Name,+ Slug: ws.Slug,+ Description: ws.Description,+ OwnerID: ws.OwnerID,+ Role: string(models.WorkspaceRoleOwner),+ CreatedAt: ws.CreatedAt,+ })+}++func (h *WorkspaceHandler) List(c *okapi.Context) error {+ userID := c.GetInt("user_id")++ workspaces, err := h.workspaceRepo.FindByUserID(uint(userID))+ if err != nil {+ return c.AbortInternalServerError("failed to list workspaces")+ }++ var result []WorkspaceResponse+ for _, ws := range workspaces {+ member, _ := h.workspaceRepo.FindMember(ws.ID, uint(userID))+ role := ""+ if member != nil {+ role = string(member.Role)+ }+ result = append(result, WorkspaceResponse{+ ID: ws.ID,+ Name: ws.Name,+ Slug: ws.Slug,+ Description: ws.Description,+ OwnerID: ws.OwnerID,+ Role: role,+ CreatedAt: ws.CreatedAt,+ })+ }++ return ok(c, result)+}++func (h *WorkspaceHandler) Get(c *okapi.Context) error {+ wsID := c.GetInt("workspace_id")++ ws, err := h.workspaceRepo.FindByID(uint(wsID))+ if err != nil {+ return c.AbortNotFound("workspace not found")+ }++ role := c.GetString("workspace_role")++ return ok(c, WorkspaceResponse{+ ID: ws.ID,+ Name: ws.Name,+ Slug: ws.Slug,+ Description: ws.Description,+ OwnerID: ws.OwnerID,+ Role: role,+ CreatedAt: ws.CreatedAt,+ })+}++func (h *WorkspaceHandler) Update(c *okapi.Context, req *UpdateWorkspaceRequest) error {+ wsID := c.GetInt("workspace_id")++ ws, err := h.workspaceRepo.FindByID(uint(wsID))+ if err != nil {+ return c.AbortNotFound("workspace not found")+ }++ if req.Body.Name != "" {+ ws.Name = strings.TrimSpace(req.Body.Name)+ }+ if req.Body.Description != "" {+ ws.Description = req.Body.Description+ }+ if req.Body.DefaultLanguage != "" {+ ws.DefaultLanguage = req.Body.DefaultLanguage+ }+ ws.UpdatedAt = time.Now()++ if err := h.workspaceRepo.Update(ws); err != nil {+ return c.AbortInternalServerError("failed to update workspace")+ }++ role := c.GetString("workspace_role")++ return ok(c, WorkspaceResponse{+ ID: ws.ID,+ Name: ws.Name,+ Slug: ws.Slug,+ Description: ws.Description,+ OwnerID: ws.OwnerID,+ Role: role,+ CreatedAt: ws.CreatedAt,+ })+}++func (h *WorkspaceHandler) Delete(c *okapi.Context) error {+ wsID := c.GetInt("workspace_id")++ if err := h.workspaceRepo.Delete(uint(wsID)); err != nil {+ return c.AbortInternalServerError("failed to delete workspace")+ }++ return noContent(c)+}+++func (h *WorkspaceHandler) ListMembers(c *okapi.Context) error {+ wsID := c.GetInt("workspace_id")++ members, err := h.workspaceRepo.ListMembers(uint(wsID))+ if err != nil {+ return c.AbortInternalServerError("failed to list members")+ }++ var result []WorkspaceMemberResponse+ for _, m := range members {+ result = append(result, WorkspaceMemberResponse{+ ID: m.ID,+ UserID: m.UserID,+ Name: m.User.Name,+ Email: m.User.Email,+ Role: string(m.Role),+ CreatedAt: m.CreatedAt,+ })+ }++ return ok(c, result)+}++func (h *WorkspaceHandler) UpdateMemberRole(c *okapi.Context, req *UpdateMemberRoleRequest) error {+ wsID := c.GetInt("workspace_id")++ // Cannot change owner role+ member, err := h.workspaceRepo.FindMember(uint(wsID), uint(req.MemberID))+ if err != nil {+ return c.AbortNotFound("member not found")+ }++ if member.Role == models.WorkspaceRoleOwner {+ return c.AbortBadRequest("cannot change the owner's role")+ }++ if req.Body.Role == models.WorkspaceRoleOwner {+ return c.AbortBadRequest("cannot assign owner role")+ }++ if err := h.workspaceRepo.UpdateMemberRole(uint(wsID), uint(req.MemberID), req.Body.Role); err != nil {+ return c.AbortInternalServerError("failed to update member role")+ }++ return ok(c, okapi.M{"message": "member role updated"})+}++func (h *WorkspaceHandler) RemoveMember(c *okapi.Context, req *RemoveWorkspaceMemberRequest) error {+ wsID := c.GetInt("workspace_id")++ // Cannot remove the owner+ member, err := h.workspaceRepo.FindMember(uint(wsID), uint(req.MemberID))+ if err != nil {+ return c.AbortNotFound("member not found")+ }++ if member.Role == models.WorkspaceRoleOwner {+ return c.AbortBadRequest("cannot remove the workspace owner")+ }++ if err := h.workspaceRepo.RemoveMember(uint(wsID), uint(req.MemberID)); err != nil {+ return c.AbortInternalServerError("failed to remove member")+ }++ return noContent(c)+}+++func (h *WorkspaceHandler) InviteMember(c *okapi.Context, req *InviteMemberRequest) error {+ wsID := c.GetInt("workspace_id")+ inviterID := c.GetInt("user_id")++ email := strings.TrimSpace(strings.ToLower(req.Body.Email))++ // Validate role+ if req.Body.Role == models.WorkspaceRoleOwner {+ return c.AbortBadRequest("cannot invite as owner")+ }++ // Check if user is already a member+ user, _ := h.userRepo.FindByEmail(email)+ if user != nil {+ if _, err := h.workspaceRepo.FindMember(uint(wsID), user.ID); err == nil {+ return c.AbortConflict("user is already a member of this workspace")+ }+ }++ // Generate invitation token+ token, err := generateToken()+ if err != nil {+ return c.AbortInternalServerError("failed to generate invitation token")+ }++ inv := &models.WorkspaceInvitation{+ WorkspaceID: uint(wsID),+ Email: email,+ Role: req.Body.Role,+ Token: token,+ Status: models.InvitationStatusPending,+ InvitedBy: uint(inviterID),+ ExpiresAt: time.Now().Add(7 * 24 * time.Hour), // 7 days+ }++ if err := h.workspaceRepo.CreateInvitation(inv); err != nil {+ return c.AbortInternalServerError("failed to create invitation")+ }++ return created(c, InvitationResponse{+ ID: inv.ID,+ WorkspaceID: inv.WorkspaceID,+ Email: inv.Email,+ Role: string(inv.Role),+ Status: string(inv.Status),+ ExpiresAt: inv.ExpiresAt,+ CreatedAt: inv.CreatedAt,+ })+}++func (h *WorkspaceHandler) ListInvitations(c *okapi.Context) error {+ wsID := c.GetInt("workspace_id")++ invitations, err := h.workspaceRepo.ListPendingInvitations(uint(wsID))+ if err != nil {+ return c.AbortInternalServerError("failed to list invitations")+ }++ var result []InvitationResponse+ for _, inv := range invitations {+ result = append(result, InvitationResponse{+ ID: inv.ID,+ WorkspaceID: inv.WorkspaceID,+ Email: inv.Email,+ Role: string(inv.Role),+ Status: string(inv.Status),+ ExpiresAt: inv.ExpiresAt,+ CreatedAt: inv.CreatedAt,+ })+ }++ return ok(c, result)+}++type DeleteInvitationRequest struct {+ InvitationID int `param:"invitation_id"`+}++func (h *WorkspaceHandler) DeleteInvitation(c *okapi.Context, req *DeleteInvitationRequest) error {+ if err := h.workspaceRepo.DeleteInvitation(uint(req.InvitationID)); err != nil {+ return c.AbortNotFound("invitation not found")+ }++ return noContent(c)+}+++func (h *WorkspaceHandler) MyInvitations(c *okapi.Context) error {+ userEmail := c.GetString("email")++ invitations, err := h.workspaceRepo.FindPendingInvitationsByEmail(userEmail)+ if err != nil {+ return c.AbortInternalServerError("failed to list invitations")+ }++ var result []InvitationResponse+ for _, inv := range invitations {+ result = append(result, InvitationResponse{+ ID: inv.ID,+ WorkspaceID: inv.WorkspaceID,+ Workspace: inv.Workspace.Name,+ Email: inv.Email,+ Role: string(inv.Role),+ Status: string(inv.Status),+ ExpiresAt: inv.ExpiresAt,+ CreatedAt: inv.CreatedAt,+ })+ }++ return ok(c, result)+}++func (h *WorkspaceHandler) AcceptInvitation(c *okapi.Context, req *AcceptInvitationRequest) error {+ userID := c.GetInt("user_id")++ inv, err := h.workspaceRepo.FindInvitationByToken(req.Body.Token)+ if err != nil {+ return c.AbortNotFound("invitation not found or expired")+ }++ if inv.Status != models.InvitationStatusPending {+ return c.AbortBadRequest("invitation is no longer pending")+ }++ if time.Now().After(inv.ExpiresAt) {+ return c.AbortBadRequest("invitation has expired")+ }++ // Verify the invitation email matches the current user+ user, err := h.userRepo.FindByID(uint(userID))+ if err != nil {+ return c.AbortInternalServerError("user not found")+ }++ if strings.ToLower(user.Email) != strings.ToLower(inv.Email) {+ return c.AbortForbidden("invitation is for a different email address")+ }++ // Check not already a member+ if _, err := h.workspaceRepo.FindMember(inv.WorkspaceID, uint(userID)); err == nil {+ inv.Status = models.InvitationStatusAccepted+ _ = h.workspaceRepo.UpdateInvitation(inv)+ return c.AbortConflict("you are already a member of this workspace")+ }++ // Add as member+ member := &models.WorkspaceMember{+ WorkspaceID: inv.WorkspaceID,+ UserID: uint(userID),+ Role: inv.Role,+ }+ if err := h.workspaceRepo.AddMember(member); err != nil {+ return c.AbortInternalServerError("failed to join workspace")+ }++ inv.Status = models.InvitationStatusAccepted+ _ = h.workspaceRepo.UpdateInvitation(inv)++ return ok(c, okapi.M{+ "message": fmt.Sprintf("joined workspace %q", inv.Workspace.Name),+ "workspace_id": inv.WorkspaceID,+ })+}++type AcceptInvitationByIDRequest struct {+ ID int `param:"id"`+}++type DeclineInvitationByIDRequest struct {+ ID int `param:"id"`+}++// AcceptInvitationByID accepts an invitation by its ID (for logged-in users viewing their invitations).+func (h *WorkspaceHandler) AcceptInvitationByID(c *okapi.Context, req *AcceptInvitationByIDRequest) error {+ userID := c.GetInt("user_id")++ inv, err := h.workspaceRepo.FindInvitationByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("invitation not found")+ }++ if inv.Status != models.InvitationStatusPending {+ return c.AbortBadRequest("invitation is no longer pending")+ }++ if time.Now().After(inv.ExpiresAt) {+ return c.AbortBadRequest("invitation has expired")+ }++ // Verify the invitation email matches the current user+ user, err := h.userRepo.FindByID(uint(userID))+ if err != nil {+ return c.AbortInternalServerError("user not found")+ }++ if strings.ToLower(user.Email) != strings.ToLower(inv.Email) {+ return c.AbortForbidden("invitation is for a different email address")+ }++ // Check not already a member+ if _, err := h.workspaceRepo.FindMember(inv.WorkspaceID, uint(userID)); err == nil {+ inv.Status = models.InvitationStatusAccepted+ _ = h.workspaceRepo.UpdateInvitation(inv)+ return c.AbortConflict("you are already a member of this workspace")+ }++ member := &models.WorkspaceMember{+ WorkspaceID: inv.WorkspaceID,+ UserID: uint(userID),+ Role: inv.Role,+ }+ if err := h.workspaceRepo.AddMember(member); err != nil {+ return c.AbortInternalServerError("failed to join workspace")+ }++ inv.Status = models.InvitationStatusAccepted+ _ = h.workspaceRepo.UpdateInvitation(inv)++ return ok(c, okapi.M{+ "message": fmt.Sprintf("joined workspace %q", inv.Workspace.Name),+ "workspace_id": inv.WorkspaceID,+ })+}++// DeclineInvitationByID declines an invitation by its ID.+func (h *WorkspaceHandler) DeclineInvitationByID(c *okapi.Context, req *DeclineInvitationByIDRequest) error {+ userID := c.GetInt("user_id")++ inv, err := h.workspaceRepo.FindInvitationByID(uint(req.ID))+ if err != nil {+ return c.AbortNotFound("invitation not found")+ }++ if inv.Status != models.InvitationStatusPending {+ return c.AbortBadRequest("invitation is no longer pending")+ }++ // Verify belongs to current user+ user, err := h.userRepo.FindByID(uint(userID))+ if err != nil {+ return c.AbortInternalServerError("user not found")+ }+ if strings.ToLower(user.Email) != strings.ToLower(inv.Email) {+ return c.AbortForbidden("invitation is for a different email address")+ }++ inv.Status = models.InvitationStatusDeclined+ _ = h.workspaceRepo.UpdateInvitation(inv)++ return ok(c, okapi.M{"message": "invitation declined"})+}++func (h *WorkspaceHandler) DeclineInvitation(c *okapi.Context, req *DeclineInvitationRequest) error {+ inv, err := h.workspaceRepo.FindInvitationByToken(req.Body.Token)+ if err != nil {+ return c.AbortNotFound("invitation not found or expired")+ }++ if inv.Status != models.InvitationStatusPending {+ return c.AbortBadRequest("invitation is no longer pending")+ }++ inv.Status = models.InvitationStatusDeclined+ _ = h.workspaceRepo.UpdateInvitation(inv)++ return ok(c, okapi.M{"message": "invitation declined"})+}+++type TransferDataRequest struct {+ Body struct {+ Resources []string `json:"resources" required:"true"`+ } `json:"body"`+}++type TransferResult struct {+ Resource string `json:"resource"`+ Count int64 `json:"count"`+}++type TransferResponse struct {+ Message string `json:"message"`+ Results []TransferResult `json:"results"`+ Total int64 `json:"total"`+}++// TransferData moves the current user's personal data into the workspace.+func (h *WorkspaceHandler) TransferData(c *okapi.Context, req *TransferDataRequest) error {+ userID := c.GetInt("user_id")+ wsID := c.GetInt("workspace_id")+ if wsID == 0 {+ return c.AbortBadRequest("workspace context required")+ }++ allowedResources := map[string]string{+ "templates": "templates",+ "stylesheets": "style_sheets",+ "languages": "languages",+ "smtp_servers": "smtp_servers",+ "domains": "domains",+ "webhooks": "webhooks",+ "contacts": "contacts",+ "subscribers": "subscribers",+ "subscriber_lists": "subscriber_lists",+ "suppressions": "suppressions",+ "api_keys": "api_keys",+ "bounces": "bounces",+ "emails": "emails",+ }++ var results []TransferResult+ var totalMoved int64++ wsIDVal := uint(wsID)++ err := h.db.Transaction(func(tx *gorm.DB) error {+ for _, res := range req.Body.Resources {+ table, ok := allowedResources[res]+ if !ok {+ continue+ }+ result := tx.Exec(+ fmt.Sprintf(`UPDATE %s SET workspace_id = ? WHERE user_id = ? AND workspace_id IS NULL`, table),+ wsIDVal, userID,+ )+ if result.Error != nil {+ return result.Error+ }+ results = append(results, TransferResult{+ Resource: res,+ Count: result.RowsAffected,+ })+ totalMoved += result.RowsAffected+ }+ return nil+ })++ if err != nil {+ return c.AbortInternalServerError("failed to transfer data: " + err.Error())+ }++ return ok(c, TransferResponse{+ Message: fmt.Sprintf("transferred %d records to workspace", totalMoved),+ Results: results,+ Total: totalMoved,+ })+}+++var slugRegex = regexp.MustCompile(`^[a-z0-9]+(?:-[a-z0-9]+)*$`)++func isValidSlug(s string) bool {+ return slugRegex.MatchString(s)+}++func slugify(name string) string {+ s := strings.ToLower(strings.TrimSpace(name))+ s = regexp.MustCompile(`[^a-z0-9\s-]`).ReplaceAllString(s, "")+ s = regexp.MustCompile(`[\s]+`).ReplaceAllString(s, "-")+ s = strings.Trim(s, "-")+ if s == "" {+ s = "workspace"+ }+ return s+}++func generateToken() (string, error) {+ b := make([]byte, 32)+ if _, err := rand.Read(b); err != nil {+ return "", err+ }+ return hex.EncodeToString(b), nil+}++// SetPlanService sets the plan service for workspace plan resolution.+func (h *WorkspaceHandler) SetPlanService(ps planService) {+ h.planService = ps+}++// GetPlan returns the effective plan for the current workspace.+func (h *WorkspaceHandler) GetPlan(c *okapi.Context) error {+ wsID := uint(c.GetInt("workspace_id"))+ if h.planService == nil {+ return ok(c, okapi.M{"plan": nil, "source": "global_settings"})+ }+ plan := h.planService.EffectivePlan(&wsID)+ if plan == nil {+ return ok(c, okapi.M{"plan": nil, "source": "global_settings"})+ }+ return ok(c, plan)+}diff --git a/internal/middlewares/middleware.go b/internal/middlewares/middleware.goindex aa898ee..dfb3471 100644--- a/internal/middlewares/middleware.go+++ b/internal/middlewares/middleware.go@@ -24,11 +24,11 @@ import ("github.com/golang-jwt/jwt/v5""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/config"- "github.com/jkaninda/posta/internal/services/auth"- "github.com/jkaninda/posta/internal/services/ratelimit"- sessionpkg "github.com/jkaninda/posta/internal/services/session"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/config"+ "github.com/goposta/posta/internal/services/auth"+ "github.com/goposta/posta/internal/services/ratelimit"+ sessionpkg "github.com/goposta/posta/internal/services/session"+ "github.com/goposta/posta/internal/storage/repositories")func baseJWTAuth(cfg *config.Config) okapi.JWTAuth {@@ -158,6 +158,9 @@ func APIKeyAuthMiddleware(keyService *auth.APIKeyService, userRepo *repositoriesc.Set("user_id", int(apiKey.UserID))c.Set("api_key_id", int(apiKey.ID))c.Set("user_email", user.Email)+ if apiKey.WorkspaceID != nil {+ c.Set("workspace_id", int(*apiKey.WorkspaceID))+ }go func() { _ = keyRepo.UpdateLastUsed(apiKey.ID) }()diff --git a/internal/middlewares/workspace.go b/internal/middlewares/workspace.gonew file mode 100644index 0000000..ad1f0b8--- /dev/null+++ b/internal/middlewares/workspace.go@@ -0,0 +1,120 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package middlewares++import (+ "strconv"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+)++// OptionalWorkspaceMiddleware reads the X-Posta-Workspace-Id header if present.+// If absent, the request operates in personal mode (workspace_id stays 0).+// If present, validates membership and sets workspace_id + workspace_role.+func OptionalWorkspaceMiddleware(workspaceRepo *repositories.WorkspaceRepository) okapi.Middleware {+ return func(c *okapi.Context) error {+ wsHeader := c.Header("X-Posta-Workspace-Id")+ if wsHeader == "" {+ // Personal mode — no workspace context+ return c.Next()+ }++ userID := c.GetInt("user_id")+ if userID == 0 {+ return c.AbortUnauthorized("authentication required")+ }++ wsID, err := strconv.Atoi(wsHeader)+ if err != nil || wsID <= 0 {+ return c.AbortBadRequest("invalid X-Posta-Workspace-Id")+ }++ member, err := workspaceRepo.FindMember(uint(wsID), uint(userID))+ if err != nil {+ return c.AbortForbidden("you are not a member of this workspace")+ }++ c.Set("workspace_id", wsID)+ c.Set("workspace_role", string(member.Role))++ return c.Next()+ }+}++// RequireWorkspaceMiddleware is like OptionalWorkspaceMiddleware but requires+// the header to be present (for workspace-only endpoints like member management).+func RequireWorkspaceMiddleware(workspaceRepo *repositories.WorkspaceRepository) okapi.Middleware {+ return func(c *okapi.Context) error {+ wsHeader := c.Header("X-Posta-Workspace-Id")+ if wsHeader == "" {+ return c.AbortBadRequest("X-Posta-Workspace-Id header is required")+ }++ userID := c.GetInt("user_id")+ if userID == 0 {+ return c.AbortUnauthorized("authentication required")+ }++ wsID, err := strconv.Atoi(wsHeader)+ if err != nil || wsID <= 0 {+ return c.AbortBadRequest("invalid X-Posta-Workspace-Id")+ }++ member, err := workspaceRepo.FindMember(uint(wsID), uint(userID))+ if err != nil {+ return c.AbortForbidden("you are not a member of this workspace")+ }++ c.Set("workspace_id", wsID)+ c.Set("workspace_role", string(member.Role))++ return c.Next()+ }+}++// RequireWorkspaceRole returns a middleware that enforces a minimum workspace role.+func RequireWorkspaceRole(minRole models.WorkspaceRole) okapi.Middleware {+ return func(c *okapi.Context) error {+ roleStr := c.GetString("workspace_role")+ if roleStr == "" {+ return c.AbortForbidden("workspace context required")+ }++ role := models.WorkspaceRole(roleStr)+ allowed := false++ switch minRole {+ case models.WorkspaceRoleViewer:+ allowed = role.CanView()+ case models.WorkspaceRoleEditor:+ allowed = role.CanEdit()+ case models.WorkspaceRoleAdmin:+ allowed = role.CanManageMembers()+ case models.WorkspaceRoleOwner:+ allowed = role.IsOwner()+ }++ if !allowed {+ return c.AbortForbidden("insufficient workspace permissions")+ }++ return c.Next()+ }+}diff --git a/internal/models/abtest.go b/internal/models/abtest.gonew file mode 100644index 0000000..e25f85a--- /dev/null+++ b/internal/models/abtest.go@@ -0,0 +1,57 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import (+ "database/sql/driver"+ "encoding/json"+)++// ABTestVariant represents a single variant in an A/B test campaign.+type ABTestVariant struct {+ Name string `json:"name"`+ Subject string `json:"subject"`+ TemplateID *uint `json:"template_id,omitempty"`+ SplitPercentage int `json:"split_percentage"`+}++// ABTestVariants is a JSON array of A/B test variants stored as TEXT.+type ABTestVariants []ABTestVariant++func (v ABTestVariants) Value() (driver.Value, error) {+ if v == nil {+ return "[]", nil+ }+ return json.Marshal(v)+}++func (v *ABTestVariants) Scan(value interface{}) error {+ if value == nil {+ *v = ABTestVariants{}+ return nil+ }+ bytes, ok := value.([]byte)+ if !ok {+ s, ok := value.(string)+ if !ok {+ return nil+ }+ bytes = []byte(s)+ }+ return json.Unmarshal(bytes, v)+}diff --git a/internal/models/api_key.go b/internal/models/api_key.goindex bff9262..cdbd858 100644--- a/internal/models/api_key.go+++ b/internal/models/api_key.go@@ -24,16 +24,17 @@ import ()type APIKey struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"index;not null"`- Name string `json:"name" gorm:"not null"`- KeyHash string `json:"-" gorm:"not null"`- KeyPrefix string `json:"key_prefix" gorm:"not null"`- CreatedAt time.Time `json:"created_at"`- ExpiresAt *time.Time `json:"expires_at"`- LastUsedAt *time.Time `json:"last_used_at"`- Revoked bool `json:"revoked" gorm:"default:false"`- AllowedIPs pq.StringArray `json:"allowed_ips" gorm:"type:text[]"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Name string `json:"name" gorm:"not null"`+ KeyHash string `json:"-" gorm:"not null"`+ KeyPrefix string `json:"key_prefix" gorm:"not null"`+ CreatedAt time.Time `json:"created_at"`+ ExpiresAt *time.Time `json:"expires_at"`+ LastUsedAt *time.Time `json:"last_used_at"`+ Revoked bool `json:"revoked" gorm:"default:false"`+ AllowedIPs pq.StringArray `json:"allowed_ips" gorm:"type:text[]"`User User `json:"-" gorm:"foreignKey:UserID"`}diff --git a/internal/models/bounce.go b/internal/models/bounce.goindex 31f25f7..21583c7 100644--- a/internal/models/bounce.go+++ b/internal/models/bounce.go@@ -28,8 +28,9 @@ const ()type Bounce struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"index;not null"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`EmailID uint `json:"email_id" gorm:"index;not null"`Recipient string `json:"recipient" gorm:"not null"`Type BounceType `json:"type" gorm:"not null"`diff --git a/internal/models/campaign.go b/internal/models/campaign.gonew file mode 100644index 0000000..29daaa7--- /dev/null+++ b/internal/models/campaign.go@@ -0,0 +1,88 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import (+ "database/sql/driver"+ "encoding/json"+ "time"+)++type CampaignStatus string++const (+ CampaignStatusDraft CampaignStatus = "draft"+ CampaignStatusScheduled CampaignStatus = "scheduled"+ CampaignStatusSending CampaignStatus = "sending"+ CampaignStatusSent CampaignStatus = "sent"+ CampaignStatusPaused CampaignStatus = "paused"+ CampaignStatusCancelled CampaignStatus = "cancelled"+)++// TemplateData is a JSON map for template variable substitution.+type TemplateData map[string]interface{}++func (td TemplateData) Value() (driver.Value, error) {+ if td == nil {+ return "{}", nil+ }+ return json.Marshal(td)+}++func (td *TemplateData) Scan(value interface{}) error {+ if value == nil {+ *td = make(TemplateData)+ return nil+ }+ bytes, ok := value.([]byte)+ if !ok {+ s, ok := value.(string)+ if !ok {+ return nil+ }+ bytes = []byte(s)+ }+ return json.Unmarshal(bytes, td)+}++type Campaign struct {+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Name string `json:"name" gorm:"not null"`+ Subject string `json:"subject" gorm:"not null"`+ FromEmail string `json:"from_email" gorm:"not null"`+ FromName string `json:"from_name"`+ TemplateID uint `json:"template_id" gorm:"index;not null"`+ TemplateVersionID *uint `json:"template_version_id,omitempty" gorm:"index"`+ Language string `json:"language" gorm:"default:'en'"`+ TemplateData TemplateData `json:"template_data,omitempty" gorm:"type:text"`+ Status CampaignStatus `json:"status" gorm:"type:varchar(20);default:'draft';not null;index"`+ ListID uint `json:"list_id" gorm:"index;not null"`+ SendRate int `json:"send_rate" gorm:"default:0"`+ SendAtLocalTime bool `json:"send_at_local_time" gorm:"default:false"`+ ABTestEnabled bool `json:"ab_test_enabled" gorm:"default:false"`+ ABTestVariants ABTestVariants `json:"ab_test_variants,omitempty" gorm:"type:text"`+ ABTestWinner string `json:"ab_test_winner,omitempty"`+ ScheduledAt *time.Time `json:"scheduled_at,omitempty"`+ StartedAt *time.Time `json:"started_at,omitempty"`+ CompletedAt *time.Time `json:"completed_at,omitempty"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt *time.Time `json:"updated_at,omitempty"`+ User User `json:"-" gorm:"foreignKey:UserID"`+}diff --git a/internal/models/campaign_message.go b/internal/models/campaign_message.gonew file mode 100644index 0000000..544ea23--- /dev/null+++ b/internal/models/campaign_message.go@@ -0,0 +1,49 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++type CampaignMessageStatus string++const (+ CampaignMsgPending CampaignMessageStatus = "pending"+ CampaignMsgQueued CampaignMessageStatus = "queued"+ CampaignMsgSent CampaignMessageStatus = "sent"+ CampaignMsgFailed CampaignMessageStatus = "failed"+ CampaignMsgSkipped CampaignMessageStatus = "skipped"+)++type CampaignMessage struct {+ ID uint `json:"id" gorm:"primaryKey"`+ CampaignID uint `json:"campaign_id" gorm:"uniqueIndex:idx_campaign_sub;not null;index"`+ SubscriberID uint `json:"subscriber_id" gorm:"uniqueIndex:idx_campaign_sub;not null;index"`+ EmailID *uint `json:"email_id,omitempty" gorm:"index"`+ Status CampaignMessageStatus `json:"status" gorm:"type:varchar(20);default:'pending';not null;index"`+ ErrorMessage string `json:"error_message,omitempty"`+ Variant string `json:"variant,omitempty" gorm:"size:50"`+ SentAt *time.Time `json:"sent_at,omitempty"`+ OpenedAt *time.Time `json:"opened_at,omitempty"`+ ClickedAt *time.Time `json:"clicked_at,omitempty"`+ BouncedAt *time.Time `json:"bounced_at,omitempty"`+ UnsubscribedAt *time.Time `json:"unsubscribed_at,omitempty"`+ CreatedAt time.Time `json:"created_at"`++ Campaign Campaign `json:"-" gorm:"foreignKey:CampaignID"`+ Subscriber Subscriber `json:"-" gorm:"foreignKey:SubscriberID"`+}diff --git a/internal/models/contact.go b/internal/models/contact.goindex 324f833..f7251fc 100644--- a/internal/models/contact.go+++ b/internal/models/contact.go@@ -20,9 +20,10 @@ package modelsimport "time"type Contact struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_email;not null"`- Email string `json:"email" gorm:"uniqueIndex:idx_user_email;not null"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Email string `json:"email" gorm:"not null"`Name string `json:"name" gorm:"default:''"`SentCount int64 `json:"sent_count" gorm:"default:0;not null"`FailCount int64 `json:"fail_count" gorm:"default:0;not null"`diff --git a/internal/models/contact_list.go b/internal/models/contact_list.goindex 8e76da3..9b521bf 100644--- a/internal/models/contact_list.go+++ b/internal/models/contact_list.go@@ -22,6 +22,7 @@ import "time"type ContactList struct {ID uint `json:"id" gorm:"primaryKey"`UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`Name string `json:"name" gorm:"not null"`Description string `json:"description"`CreatedAt time.Time `json:"created_at"`diff --git a/internal/models/domain.go b/internal/models/domain.goindex d073442..a826854 100644--- a/internal/models/domain.go+++ b/internal/models/domain.go@@ -21,8 +21,9 @@ import "time"type Domain struct {ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_domain;not null"`- Domain string `json:"domain" gorm:"uniqueIndex:idx_user_domain;not null"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Domain string `json:"domain" gorm:"not null"`OwnershipVerified bool `json:"ownership_verified" gorm:"default:false"`SPFVerified bool `json:"spf_verified" gorm:"default:false"`DKIMVerified bool `json:"dkim_verified" gorm:"default:false"`diff --git a/internal/models/email.go b/internal/models/email.goindex a91c718..9653b87 100644--- a/internal/models/email.go+++ b/internal/models/email.go@@ -39,6 +39,7 @@ type Email struct {ID uint `json:"id" gorm:"primaryKey"`UUID string `json:"uuid" gorm:"type:uuid;default:gen_random_uuid();uniqueIndex;not null"`UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`APIKeyID *uint `json:"api_key_id" gorm:"index"`Sender string `json:"sender" gorm:"not null"`Recipients pq.StringArray `json:"recipients" gorm:"type:text[];not null"`@@ -65,6 +66,10 @@ type Email struct {// Attachment represents a file attachment in an email.type Attachment struct {Filename string `json:"filename"`- Content string `json:"content"`+ Content string `json:"content,omitempty"`ContentType string `json:"content_type"`+ // StorageKey is set when the attachment content is stored in blob storage+ // (S3 or filesystem). When present, Content may be empty and the actual+ // bytes should be fetched from the blob store using this key.+ StorageKey string `json:"storage_key,omitempty"`}diff --git a/internal/models/event.go b/internal/models/event.goindex 912b28d..f9ba090 100644--- a/internal/models/event.go+++ b/internal/models/event.go@@ -29,10 +29,11 @@ const ()type Event struct {- ID uint `json:"id" gorm:"primaryKey"`- Category EventCategory `json:"category" gorm:"index;not null"`- Type string `json:"type" gorm:"index;not null"`- ActorID *uint `json:"actor_id" gorm:"index"`+ ID uint `json:"id" gorm:"primaryKey"`+ Category EventCategory `json:"category" gorm:"index;not null"`+ Type string `json:"type" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ ActorID *uint `json:"actor_id" gorm:"index"`ActorName string `json:"actor_name"`ClientIP string `json:"client_ip,omitempty" gorm:"size:45"`Message string `json:"message" gorm:"not null"`diff --git a/internal/models/language.go b/internal/models/language.goindex 6399187..7a72534 100644--- a/internal/models/language.go+++ b/internal/models/language.go@@ -20,10 +20,12 @@ package modelsimport "time"type Language struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_language;not null"`- Code string `json:"code" gorm:"uniqueIndex:idx_user_language;not null;size:10"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Code string `json:"code" gorm:"not null;size:10"`Name string `json:"name" gorm:"not null"`+ IsDefault bool `json:"is_default" gorm:"default:false"`CreatedAt time.Time `json:"created_at"`User User `json:"-" gorm:"foreignKey:UserID"`diff --git a/internal/models/oauth_account.go b/internal/models/oauth_account.gonew file mode 100644index 0000000..03c1833--- /dev/null+++ b/internal/models/oauth_account.go@@ -0,0 +1,39 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++// OAuthAccount links an external OAuth identity to a local user.+type OAuthAccount struct {+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_provider;not null"`+ ProviderID uint `json:"provider_id" gorm:"uniqueIndex:idx_user_provider;not null"`+ ProviderUserID string `json:"provider_user_id" gorm:"uniqueIndex:idx_provider_ext_id;not null"`+ Email string `json:"email"`+ Name string `json:"name"`+ AvatarURL string `json:"avatar_url"`+ AccessToken string `json:"-" gorm:"type:text"`+ RefreshToken string `json:"-" gorm:"type:text"`+ TokenExpiresAt *time.Time `json:"-"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt time.Time `json:"updated_at"`++ User User `json:"-" gorm:"foreignKey:UserID"`+ Provider OAuthProvider `json:"-" gorm:"foreignKey:ProviderID"`+}diff --git a/internal/models/oauth_provider.go b/internal/models/oauth_provider.gonew file mode 100644index 0000000..7de3369--- /dev/null+++ b/internal/models/oauth_provider.go@@ -0,0 +1,48 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++type OAuthProviderType string++const (+ OAuthProviderGoogle OAuthProviderType = "google"+ OAuthProviderOIDC OAuthProviderType = "oidc"+)++// OAuthProvider stores configuration for an OAuth/OIDC identity provider.+type OAuthProvider struct {+ ID uint `json:"id" gorm:"primaryKey"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Name string `json:"name" gorm:"not null"`+ Slug string `json:"slug" gorm:"uniqueIndex;not null"`+ Type OAuthProviderType `json:"type" gorm:"not null"`+ ClientID string `json:"-" gorm:"not null"`+ ClientSecret string `json:"-" gorm:"not null"`+ Issuer string `json:"issuer"`+ AuthURL string `json:"auth_url"`+ TokenURL string `json:"token_url"`+ UserInfoURL string `json:"userinfo_url"`+ Scopes string `json:"scopes" gorm:"default:'openid email profile'"`+ Enabled bool `json:"enabled" gorm:"default:true;not null"`+ AutoRegister bool `json:"auto_register" gorm:"default:true"`+ AllowedDomains string `json:"allowed_domains"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt time.Time `json:"updated_at"`+}diff --git a/internal/models/plan.go b/internal/models/plan.gonew file mode 100644index 0000000..1f37016--- /dev/null+++ b/internal/models/plan.go@@ -0,0 +1,42 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++// Plan defines a usage package that can be assigned to workspaces.+// Each plan specifies rate limits, resource quotas, and retention policies.+// A value of 0 for any limit field means unlimited.+type Plan struct {+ ID uint `json:"id" gorm:"primaryKey"`+ Name string `json:"name" gorm:"uniqueIndex;not null"`+ Description string `json:"description"`+ IsDefault bool `json:"is_default" gorm:"default:false"`+ IsActive bool `json:"is_active" gorm:"default:true"`+ DailyRateLimit int `json:"daily_rate_limit" gorm:"default:0"`+ HourlyRateLimit int `json:"hourly_rate_limit" gorm:"default:0"`+ MaxAttachmentSizeMB int `json:"max_attachment_size_mb" gorm:"default:0"`+ MaxBatchSize int `json:"max_batch_size" gorm:"default:0"`+ MaxAPIKeys int `json:"max_api_keys" gorm:"default:0"`+ MaxDomains int `json:"max_domains" gorm:"default:0"`+ MaxSMTPServers int `json:"max_smtp_servers" gorm:"default:0"`+ MaxWorkspaces int `json:"max_workspaces" gorm:"default:0"`+ EmailLogRetentionDays int `json:"email_log_retention_days" gorm:"default:0"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt time.Time `json:"updated_at"`+}diff --git a/internal/models/smtp_server.go b/internal/models/smtp_server.goindex ef65691..8ec9942 100644--- a/internal/models/smtp_server.go+++ b/internal/models/smtp_server.go@@ -42,6 +42,7 @@ const (type SMTPServer struct {ID uint `json:"id" gorm:"primaryKey"`UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`Host string `json:"host" gorm:"not null"`Port int `json:"port" gorm:"not null"`Username string `json:"username"`diff --git a/internal/models/stylesheet.go b/internal/models/stylesheet.goindex 33624dc..b4129d6 100644--- a/internal/models/stylesheet.go+++ b/internal/models/stylesheet.go@@ -20,9 +20,10 @@ package modelsimport "time"type StyleSheet struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_stylesheet;not null"`- Name string `json:"name" gorm:"uniqueIndex:idx_user_stylesheet;not null"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Name string `json:"name" gorm:"not null"`CSS string `json:"css"`CreatedAt time.Time `json:"created_at"`UpdatedAt *time.Time `json:"updated_at,omitempty"`diff --git a/internal/models/subscriber.go b/internal/models/subscriber.gonew file mode 100644index 0000000..05c1336--- /dev/null+++ b/internal/models/subscriber.go@@ -0,0 +1,76 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import (+ "database/sql/driver"+ "encoding/json"+ "time"+)++type SubscriberStatus string++const (+ SubscriberStatusSubscribed SubscriberStatus = "subscribed"+ SubscriberStatusUnsubscribed SubscriberStatus = "unsubscribed"+ SubscriberStatusBounced SubscriberStatus = "bounced"+ SubscriberStatusComplained SubscriberStatus = "complained"+)++// CustomFields is a JSON map stored as TEXT in the database.+type CustomFields map[string]interface{}++func (cf CustomFields) Value() (driver.Value, error) {+ if cf == nil {+ return "{}", nil+ }+ return json.Marshal(cf)+}++func (cf *CustomFields) Scan(value interface{}) error {+ if value == nil {+ *cf = make(CustomFields)+ return nil+ }+ bytes, ok := value.([]byte)+ if !ok {+ s, ok := value.(string)+ if !ok {+ return nil+ }+ bytes = []byte(s)+ }+ return json.Unmarshal(bytes, cf)+}++type Subscriber struct {+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"uniqueIndex:idx_sub_scope_email;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"uniqueIndex:idx_sub_scope_email;index"`+ Email string `json:"email" gorm:"uniqueIndex:idx_sub_scope_email;not null"`+ Name string `json:"name" gorm:"default:''"`+ Status SubscriberStatus `json:"status" gorm:"type:varchar(20);default:'subscribed';not null;index"`+ CustomFields CustomFields `json:"custom_fields" gorm:"type:text"`+ Timezone string `json:"timezone" gorm:"size:50;default:''"`+ Language string `json:"language" gorm:"size:10;default:''"`+ SubscribedAt *time.Time `json:"subscribed_at"`+ UnsubscribedAt *time.Time `json:"unsubscribed_at"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt *time.Time `json:"updated_at"`+ User User `json:"-" gorm:"foreignKey:UserID"`+}diff --git a/internal/models/subscriber_list.go b/internal/models/subscriber_list.gonew file mode 100644index 0000000..01825da--- /dev/null+++ b/internal/models/subscriber_list.go@@ -0,0 +1,85 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import (+ "database/sql/driver"+ "encoding/json"+ "time"+)++type SubscriberListType string++const (+ SubscriberListTypeStatic SubscriberListType = "static"+ SubscriberListTypeDynamic SubscriberListType = "dynamic"+)++type FilterRule struct {+ Field string `json:"field"`+ Operator string `json:"operator"`+ Value any `json:"value"`+}++type FilterRules []FilterRule++func (fr FilterRules) Value() (driver.Value, error) {+ if fr == nil {+ return "[]", nil+ }+ return json.Marshal(fr)+}++func (fr *FilterRules) Scan(value interface{}) error {+ if value == nil {+ *fr = FilterRules{}+ return nil+ }+ bytes, ok := value.([]byte)+ if !ok {+ s, ok := value.(string)+ if !ok {+ return nil+ }+ bytes = []byte(s)+ }+ return json.Unmarshal(bytes, fr)+}++type SubscriberList struct {+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Name string `json:"name" gorm:"not null"`+ Description string `json:"description"`+ Type SubscriberListType `json:"type" gorm:"type:varchar(10);default:'static';not null"`+ FilterRules FilterRules `json:"filter_rules,omitempty" gorm:"type:text"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt *time.Time `json:"updated_at"`+ User User `json:"-" gorm:"foreignKey:UserID"`+}++type SubscriberListMember struct {+ ID uint `json:"id" gorm:"primaryKey"`+ ListID uint `json:"list_id" gorm:"uniqueIndex:idx_sublist_sub;not null"`+ SubscriberID uint `json:"subscriber_id" gorm:"uniqueIndex:idx_sublist_sub;not null;index"`+ CreatedAt time.Time `json:"created_at"`++ List SubscriberList `json:"-" gorm:"foreignKey:ListID"`+ Subscriber Subscriber `json:"-" gorm:"foreignKey:SubscriberID"`+}diff --git a/internal/models/suppression.go b/internal/models/suppression.goindex cad4238..d422faa 100644--- a/internal/models/suppression.go+++ b/internal/models/suppression.go@@ -20,9 +20,10 @@ package modelsimport "time"type Suppression struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_suppression;not null"`- Email string `json:"email" gorm:"uniqueIndex:idx_user_suppression;not null"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Email string `json:"email" gorm:"not null"`Reason string `json:"reason"`CreatedAt time.Time `json:"created_at"`diff --git a/internal/models/template.go b/internal/models/template.goindex a33ba7c..d4c7221 100644--- a/internal/models/template.go+++ b/internal/models/template.go@@ -21,8 +21,9 @@ import "time"type Template struct {ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"uniqueIndex:idx_user_template;not null"`- Name string `json:"name" gorm:"uniqueIndex:idx_user_template;not null"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`+ Name string `json:"name" gorm:"not null"`DefaultLanguage string `json:"default_language" gorm:"default:en;not null"`ActiveVersionID *uint `json:"active_version_id,omitempty" gorm:"uniqueIndex"`Description string `json:"description"`diff --git a/internal/models/template_localization.go b/internal/models/template_localization.goindex d1fc477..aa5e5ee 100644--- a/internal/models/template_localization.go+++ b/internal/models/template_localization.go@@ -26,6 +26,7 @@ type TemplateLocalization struct {SubjectTemplate string `json:"subject_template" gorm:"not null"`HTMLTemplate string `json:"html_template"`TextTemplate string `json:"text_template"`+ BuilderJSON string `json:"builder_json,omitempty" gorm:"type:text"`CreatedAt time.Time `json:"created_at"`UpdatedAt *time.Time `json:"updated_at,omitempty"`diff --git a/internal/models/tracking.go b/internal/models/tracking.gonew file mode 100644index 0000000..fd807ff--- /dev/null+++ b/internal/models/tracking.go@@ -0,0 +1,54 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++type TrackingEventType string++const (+ TrackingEventOpen TrackingEventType = "open"+ TrackingEventClick TrackingEventType = "click"+ TrackingEventUnsubscribe TrackingEventType = "unsubscribe"+)++// TrackedLink stores rewritten links for click tracking.+type TrackedLink struct {+ ID uint `json:"id" gorm:"primaryKey"`+ CampaignID uint `json:"campaign_id" gorm:"index;not null"`+ OriginalURL string `json:"original_url" gorm:"type:text;not null"`+ Hash string `json:"hash" gorm:"uniqueIndex;not null"`+ ClickCount int64 `json:"click_count" gorm:"default:0;not null"`+ CreatedAt time.Time `json:"created_at"`++ Campaign Campaign `json:"-" gorm:"foreignKey:CampaignID"`+}++// TrackingEvent records individual open/click/unsubscribe events.+type TrackingEvent struct {+ ID uint `json:"id" gorm:"primaryKey"`+ CampaignMessageID uint `json:"campaign_message_id" gorm:"index;not null"`+ EventType TrackingEventType `json:"event_type" gorm:"type:varchar(20);not null;index"`+ TrackedLinkID *uint `json:"tracked_link_id,omitempty" gorm:"index"`+ IP string `json:"ip" gorm:"size:45"`+ UserAgent string `json:"user_agent" gorm:"type:text"`+ CreatedAt time.Time `json:"created_at" gorm:"index"`++ CampaignMessage CampaignMessage `json:"-" gorm:"foreignKey:CampaignMessageID"`+ TrackedLink *TrackedLink `json:"-" gorm:"foreignKey:TrackedLinkID"`+}diff --git a/internal/models/user.go b/internal/models/user.goindex 2d49c6b..dad0b31 100644--- a/internal/models/user.go+++ b/internal/models/user.go@@ -36,6 +36,9 @@ type User struct {TwoFactorEnabled bool `json:"two_factor_enabled" gorm:"default:false"`Active bool `json:"active" gorm:"default:true;not null"`RequireVerifiedDomain bool `json:"require_verified_domain" gorm:"default:false"`+ AuthMethod string `json:"auth_method" gorm:"default:'password';not null"`+ AvatarURL string `json:"avatar_url"`+ ScheduledDeletionAt *time.Time `json:"scheduled_deletion_at"`CreatedAt time.Time `json:"created_at"`LastLoginAt *time.Time `json:"last_login_at"`}diff --git a/internal/models/user_setting.go b/internal/models/user_setting.goindex bb49a0a..3499eae 100644--- a/internal/models/user_setting.go+++ b/internal/models/user_setting.go@@ -32,6 +32,7 @@ type UserSetting struct {DefaultTemplateID *uint `json:"default_template_id"`APIKeyExpiryDays int `json:"api_key_expiry_days" gorm:"default:90"`BounceAutoSuppress bool `json:"bounce_auto_suppress" gorm:"default:true"`+ DefaultLanguage string `json:"default_language" gorm:"size:10;default:'en'"`DailyReport bool `json:"daily_report" gorm:"default:false"`CreatedAt time.Time `json:"created_at"`UpdatedAt time.Time `json:"updated_at"`diff --git a/internal/models/webhook.go b/internal/models/webhook.goindex c7b8767..29c1dc7 100644--- a/internal/models/webhook.go+++ b/internal/models/webhook.go@@ -24,8 +24,9 @@ import ()type Webhook struct {- ID uint `json:"id" gorm:"primaryKey"`- UserID uint `json:"user_id" gorm:"index;not null"`+ ID uint `json:"id" gorm:"primaryKey"`+ UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`URL string `json:"url" gorm:"not null"`Events pq.StringArray `json:"events" gorm:"type:text[];not null"`Filters pq.StringArray `json:"filters" gorm:"type:text[]"`diff --git a/internal/models/webhook_delivery.go b/internal/models/webhook_delivery.goindex 0e02114..4db6c40 100644--- a/internal/models/webhook_delivery.go+++ b/internal/models/webhook_delivery.go@@ -32,6 +32,7 @@ type WebhookDelivery struct {ID uint `json:"id" gorm:"primaryKey"`WebhookID uint `json:"webhook_id" gorm:"index;not null"`UserID uint `json:"user_id" gorm:"index;not null"`+ WorkspaceID *uint `json:"workspace_id,omitempty" gorm:"index"`Event string `json:"event" gorm:"not null"`Status WebhookDeliveryStatus `json:"status" gorm:"type:varchar(16);not null;index"`HTTPStatusCode int `json:"http_status_code"`diff --git a/internal/models/workspace.go b/internal/models/workspace.gonew file mode 100644index 0000000..fbbf441--- /dev/null+++ b/internal/models/workspace.go@@ -0,0 +1,99 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++type WorkspaceRole string++const (+ WorkspaceRoleOwner WorkspaceRole = "owner"+ WorkspaceRoleAdmin WorkspaceRole = "admin"+ WorkspaceRoleEditor WorkspaceRole = "editor"+ WorkspaceRoleViewer WorkspaceRole = "viewer"+)++type InvitationStatus string++const (+ InvitationStatusPending InvitationStatus = "pending"+ InvitationStatusAccepted InvitationStatus = "accepted"+ InvitationStatusDeclined InvitationStatus = "declined"+)++type Workspace struct {+ ID uint `json:"id" gorm:"primaryKey"`+ Name string `json:"name" gorm:"not null"`+ Slug string `json:"slug" gorm:"uniqueIndex;not null"`+ Description string `json:"description"`+ OwnerID uint `json:"owner_id" gorm:"index;not null"`+ PlanID *uint `json:"plan_id" gorm:"index"`+ DefaultLanguage string `json:"default_language" gorm:"size:10;default:'en'"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt time.Time `json:"updated_at"`++ Owner User `json:"-" gorm:"foreignKey:OwnerID"`+ Plan Plan `json:"-" gorm:"foreignKey:PlanID"`+ Members []WorkspaceMember `json:"-" gorm:"foreignKey:WorkspaceID"`+}++type WorkspaceMember struct {+ ID uint `json:"id" gorm:"primaryKey"`+ WorkspaceID uint `json:"workspace_id" gorm:"uniqueIndex:idx_workspace_user;not null"`+ UserID uint `json:"user_id" gorm:"uniqueIndex:idx_workspace_user;not null"`+ Role WorkspaceRole `json:"role" gorm:"not null;default:viewer"`+ CreatedAt time.Time `json:"created_at"`++ Workspace Workspace `json:"-" gorm:"foreignKey:WorkspaceID"`+ User User `json:"-" gorm:"foreignKey:UserID"`+}++type WorkspaceInvitation struct {+ ID uint `json:"id" gorm:"primaryKey"`+ WorkspaceID uint `json:"workspace_id" gorm:"index;not null"`+ Email string `json:"email" gorm:"not null"`+ Role WorkspaceRole `json:"role" gorm:"not null;default:viewer"`+ Token string `json:"-" gorm:"uniqueIndex;not null"`+ Status InvitationStatus `json:"status" gorm:"not null;default:pending"`+ InvitedBy uint `json:"invited_by" gorm:"not null"`+ ExpiresAt time.Time `json:"expires_at" gorm:"not null"`+ CreatedAt time.Time `json:"created_at"`++ Workspace Workspace `json:"-" gorm:"foreignKey:WorkspaceID"`+ Inviter User `json:"-" gorm:"foreignKey:InvitedBy"`+}++// CanManageMembers returns true if the role can invite/remove members.+func (r WorkspaceRole) CanManageMembers() bool {+ return r == WorkspaceRoleOwner || r == WorkspaceRoleAdmin+}++// CanEdit returns true if the role can create/modify resources.+func (r WorkspaceRole) CanEdit() bool {+ return r == WorkspaceRoleOwner || r == WorkspaceRoleAdmin || r == WorkspaceRoleEditor+}++// CanView returns true if the role has any access.+func (r WorkspaceRole) CanView() bool {+ return r == WorkspaceRoleOwner || r == WorkspaceRoleAdmin || r == WorkspaceRoleEditor || r == WorkspaceRoleViewer+}++// IsOwner returns true if the role is owner.+func (r WorkspaceRole) IsOwner() bool {+ return r == WorkspaceRoleOwner+}diff --git a/internal/models/workspace_sso.go b/internal/models/workspace_sso.gonew file mode 100644index 0000000..5d28b32--- /dev/null+++ b/internal/models/workspace_sso.go@@ -0,0 +1,35 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package models++import "time"++// WorkspaceSSOConfig controls SSO enforcement for a workspace.+type WorkspaceSSOConfig struct {+ ID uint `json:"id" gorm:"primaryKey"`+ WorkspaceID uint `json:"workspace_id" gorm:"uniqueIndex;not null"`+ ProviderID uint `json:"provider_id" gorm:"not null"`+ EnforceSSO bool `json:"enforce_sso" gorm:"default:false"`+ AutoProvision bool `json:"auto_provision" gorm:"default:true"`+ AllowedDomains string `json:"allowed_domains"`+ CreatedAt time.Time `json:"created_at"`+ UpdatedAt time.Time `json:"updated_at"`++ Workspace Workspace `json:"-" gorm:"foreignKey:WorkspaceID"`+ Provider OAuthProvider `json:"-" gorm:"foreignKey:ProviderID"`+}diff --git a/internal/routes/admin_routes.go b/internal/routes/admin_routes.goindex d249c20..5d2e72c 100644--- a/internal/routes/admin_routes.go+++ b/internal/routes/admin_routes.go@@ -21,10 +21,10 @@ import ("net/http""github.com/jkaninda/okapi"- cronpkg "github.com/jkaninda/posta/internal/cron"- "github.com/jkaninda/posta/internal/dto"- "github.com/jkaninda/posta/internal/handlers"- "github.com/jkaninda/posta/internal/models"+ cronpkg "github.com/goposta/posta/internal/cron"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/handlers"+ "github.com/goposta/posta/internal/models")// adminRoutes returns route definitions for admin endpoints.@@ -110,6 +110,19 @@ func (r *Router) adminRoutes() []okapi.RouteDefinition {okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),},},+ {+ Method: http.MethodGet,+ Path: "/users/{id:int}/workspaces",+ Handler: okapi.H(r.h.admin.UserWorkspaces),+ Group: adminGroup,+ Summary: "List user workspaces",+ Description: "Returns all workspaces a user belongs to with plan info",+ Response: &dto.Response[[]handlers.AdminWorkspace]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "User ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },// ==================== All API Keys ===================={@@ -208,6 +221,111 @@ func (r *Router) adminRoutes() []okapi.RouteDefinition {Response: &dto.Response[[]models.Setting]{},},+ // ==================== Plans ====================+ {+ Method: http.MethodPost,+ Path: "/plans",+ Handler: okapi.H(r.h.plan.Create),+ Group: adminGroup,+ Summary: "Create plan",+ Description: "Create a new usage plan/package",+ Request: &handlers.CreatePlanRequest{},+ Options: []okapi.RouteOption{+ okapi.DocResponse(201, &dto.Response[models.Plan]{}),+ okapi.DocErrorResponse(409, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodGet,+ Path: "/plans",+ Handler: okapi.H(r.h.plan.List),+ Group: adminGroup,+ Summary: "List plans",+ Request: &handlers.ListRequest{},+ Response: &dto.PageableResponse[models.Plan]{},+ },+ {+ Method: http.MethodGet,+ Path: "/plans/{id:int}",+ Handler: okapi.H(r.h.plan.Get),+ Group: adminGroup,+ Summary: "Get plan",+ Response: &dto.Response[models.Plan]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Plan ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodPut,+ Path: "/plans/{id:int}",+ Handler: okapi.H(r.h.plan.Update),+ Group: adminGroup,+ Summary: "Update plan",+ Description: "Update a plan's configuration and limits",+ Request: &handlers.UpdatePlanRequest{},+ Response: &dto.Response[models.Plan]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Plan ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodDelete,+ Path: "/plans/{id:int}",+ Handler: okapi.H(r.h.plan.Delete),+ Group: adminGroup,+ Summary: "Delete plan",+ Description: "Delete a plan. Use ?force=true to delete a plan assigned to workspaces.",+ Request: &handlers.DeletePlanRequest{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Plan ID"),+ okapi.DocResponse(204, nil),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ okapi.DocErrorResponse(409, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodPatch,+ Path: "/plans/{id:int}/default",+ Handler: okapi.H(r.h.plan.SetDefault),+ Group: adminGroup,+ Summary: "Set plan as default",+ Description: "Set this plan as the default plan, unsetting any previous default",+ Response: &dto.Response[models.Plan]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Plan ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodPost,+ Path: "/workspaces/{id:int}/plan",+ Handler: okapi.H(r.h.plan.AssignToWorkspace),+ Group: adminGroup,+ Summary: "Assign plan to workspace",+ Description: "Assign a usage plan to a workspace",+ Request: &handlers.AssignWorkspacePlanRequest{},+ Response: &dto.Response[dto.MessageData]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Workspace ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodGet,+ Path: "/workspaces/{id:int}/plan",+ Handler: okapi.H(r.h.plan.GetWorkspacePlan),+ Group: adminGroup,+ Summary: "Get workspace plan",+ Description: "Get the effective plan for a workspace",+ Response: &dto.Response[models.Plan]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Workspace ID"),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },+// ==================== Shared SMTP Servers ===================={Method: http.MethodPost,diff --git a/internal/routes/auth_routes.go b/internal/routes/auth_routes.goindex c612726..e18c5d7 100644--- a/internal/routes/auth_routes.go+++ b/internal/routes/auth_routes.go@@ -21,9 +21,9 @@ import ("net/http""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/dto"- "github.com/jkaninda/posta/internal/handlers"- "github.com/jkaninda/posta/internal/services/email"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/handlers"+ "github.com/goposta/posta/internal/services/email")// healthRoutes returns route definitions for health check endpoints.@@ -181,5 +181,19 @@ func (r *Router) apiAuthRoutes() []okapi.RouteDefinition {okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),},},+ {+ Method: http.MethodPost,+ Path: "/emails/{id}/retry",+ Handler: okapi.H(r.h.email.Retry),+ Group: apiAuth,+ Summary: "Retry failed email",+ Description: "Re-enqueue a failed email for another delivery attempt. Subject to the SMTP server's max retry limit.",+ Response: &dto.Response[email.SendResponse]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "string", "Email UUID"),+ okapi.DocErrorResponse(400, &dto.ErrorResponseBody{}),+ okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),+ },+ },}}diff --git a/internal/routes/oauth_routes.go b/internal/routes/oauth_routes.gonew file mode 100644index 0000000..b0dd13b--- /dev/null+++ b/internal/routes/oauth_routes.go@@ -0,0 +1,162 @@+package routes++import (+ "net/http"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/handlers"+)++// oauthRoutes returns route definitions for OAuth authentication.+func (r *Router) oauthRoutes() []okapi.RouteDefinition {+ // Public OAuth routes (no auth required)+ oauthPublic := r.v1.Group("/auth/oauth").WithTags([]string{"OAuth"})++ routes := []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "/providers",+ Handler: r.h.oauth.ListProviders,+ Group: oauthPublic,+ Summary: "List OAuth providers",+ Description: "Returns enabled OAuth providers for the login page",+ Response: &dto.Response[okapi.M]{},+ },+ {+ Method: http.MethodGet,+ Path: "/{provider}/authorize",+ Handler: r.h.oauth.Authorize,+ Group: oauthPublic,+ Summary: "Initiate OAuth flow",+ Description: "Redirects to the OAuth provider's authorization page",+ Options: []okapi.RouteOption{+ okapi.DocPathParam("provider", "string", "Provider slug"),+ },+ },+ {+ Method: http.MethodGet,+ Path: "/{provider}/callback",+ Handler: r.h.oauth.Callback,+ Group: oauthPublic,+ Summary: "OAuth callback",+ Description: "Handles the OAuth provider's redirect after authorization",+ Options: []okapi.RouteOption{+ okapi.DocPathParam("provider", "string", "Provider slug"),+ okapi.DocHide(),+ },+ },+ }++ // Authenticated OAuth routes (linked accounts)+ oauthUser := r.v1.Group("/users/me/oauth", r.mw.jwtAuth.Middleware).WithTags([]string{"OAuth"})+ oauthUser.WithBearerAuth()++ routes = append(routes, []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "",+ Handler: r.h.oauth.ListLinkedAccounts,+ Group: oauthUser,+ Summary: "List linked OAuth accounts",+ Response: &dto.Response[[]handlers.OAuthLinkedAccount]{},+ },+ {+ Method: http.MethodDelete,+ Path: "/{provider_id:int}",+ Handler: okapi.H(r.h.oauth.UnlinkAccount),+ Group: oauthUser,+ Summary: "Unlink OAuth account",+ Options: []okapi.RouteOption{+ okapi.DocPathParam("provider_id", "integer", "Provider ID"),+ },+ Response: &dto.Response[okapi.M]{},+ },+ }...)++ // Admin OAuth provider management+ oauthAdmin := r.v1.Group("/admin/oauth/providers", r.mw.jwtAdminAuth.Middleware).WithTags([]string{"Admin", "OAuth"})+ oauthAdmin.WithBearerAuth()++ routes = append(routes, []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "",+ Handler: r.h.oauthAdmin.ListProviders,+ Group: oauthAdmin,+ Summary: "List all OAuth providers (admin)",+ Response: &dto.Response[[]handlers.OAuthProviderResponse]{},+ },+ {+ Method: http.MethodPost,+ Path: "",+ Handler: okapi.H(r.h.oauthAdmin.CreateProvider),+ Group: oauthAdmin,+ Summary: "Create OAuth provider",+ Request: &handlers.CreateOAuthProviderRequest{},+ Options: []okapi.RouteOption{+ okapi.DocResponse(201, &dto.Response[handlers.OAuthProviderResponse]{}),+ },+ },+ {+ Method: http.MethodPut,+ Path: "/{id:int}",+ Handler: okapi.H(r.h.oauthAdmin.UpdateProvider),+ Group: oauthAdmin,+ Summary: "Update OAuth provider",+ Request: &handlers.UpdateOAuthProviderRequest{},+ Response: &dto.Response[handlers.OAuthProviderResponse]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Provider ID"),+ },+ },+ {+ Method: http.MethodDelete,+ Path: "/{id:int}",+ Handler: okapi.H(r.h.oauthAdmin.DeleteProvider),+ Group: oauthAdmin,+ Summary: "Delete OAuth provider",+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Provider ID"),+ okapi.DocResponse(204, nil),+ },+ },+ }...)++ // Workspace SSO config+ wsSSO := r.v1.Group("/workspaces/current/sso", r.mw.jwtAuth.Middleware, r.mw.workspace).WithTags([]string{"Workspaces", "OAuth"})+ wsSSO.WithBearerAuth()++ routes = append(routes, []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "",+ Handler: r.h.oauthAdmin.GetWorkspaceSSO,+ Group: wsSSO,+ Summary: "Get workspace SSO config",+ Response: &dto.Response[handlers.WorkspaceSSOResponse]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodPut,+ Path: "",+ Handler: okapi.H(r.h.oauthAdmin.SetWorkspaceSSO),+ Group: wsSSO,+ Summary: "Set workspace SSO config",+ Request: &handlers.SetWorkspaceSSORequest{},+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodDelete,+ Path: "",+ Handler: r.h.oauthAdmin.DeleteWorkspaceSSO,+ Group: wsSSO,+ Summary: "Delete workspace SSO config",+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ }...)++ return routes+}diff --git a/internal/routes/routes.go b/internal/routes/routes.goindex 55175be..1ebf222 100644--- a/internal/routes/routes.go+++ b/internal/routes/routes.go@@ -27,24 +27,28 @@ import ("github.com/hibiken/asynq""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/config"- cronpkg "github.com/jkaninda/posta/internal/cron"- "github.com/jkaninda/posta/internal/handlers"- "github.com/jkaninda/posta/internal/metrics"- "github.com/jkaninda/posta/internal/middlewares"- "github.com/jkaninda/posta/internal/services/audit"- "github.com/jkaninda/posta/internal/services/auth"- "github.com/jkaninda/posta/internal/services/cache"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/services/eventbus"- "github.com/jkaninda/posta/internal/services/ratelimit"- "github.com/jkaninda/posta/internal/services/seeder"- sessionpkg "github.com/jkaninda/posta/internal/services/session"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/services/webhook"- "github.com/jkaninda/posta/internal/services/workermon"- "github.com/jkaninda/posta/internal/storage/repositories"- "github.com/jkaninda/posta/internal/worker"+ "github.com/goposta/posta/internal/config"+ cronpkg "github.com/goposta/posta/internal/cron"+ "github.com/goposta/posta/internal/handlers"+ "github.com/goposta/posta/internal/metrics"+ "github.com/goposta/posta/internal/middlewares"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/audit"+ "github.com/goposta/posta/internal/services/auth"+ "github.com/goposta/posta/internal/services/cache"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/services/eventbus"+ planpkg "github.com/goposta/posta/internal/services/plan"+ "github.com/goposta/posta/internal/services/ratelimit"+ "github.com/goposta/posta/internal/storage/blob"+ "github.com/goposta/posta/internal/services/seeder"+ sessionpkg "github.com/goposta/posta/internal/services/session"+ "github.com/goposta/posta/internal/services/tracking"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/services/webhook"+ "github.com/goposta/posta/internal/services/workermon"+ "github.com/goposta/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/worker""github.com/redis/go-redis/v9""gorm.io/gorm")@@ -63,6 +67,8 @@ type routerMiddleware struct {jwtAdminQueryAuth okapi.JWTAuthloginLimiter okapi.MiddlewareapiKey okapi.Middleware+ workspace okapi.Middleware+ optionalWorkspace okapi.Middleware}type routerHandlers struct {@@ -83,8 +89,8 @@ type routerHandlers struct {bounce *handlers.BounceHandlersuppression *handlers.SuppressionHandlercontact *handlers.ContactHandler- contactList *handlers.ContactListHandleradmin *handlers.AdminHandler+ workspace *handlers.WorkspaceHandlerserver *handlers.ServerHandlerevent *handlers.EventHandleranalytics *handlers.AnalyticsHandler@@ -93,9 +99,18 @@ type routerHandlers struct {userData *handlers.UserDataHandlersession *handlers.SessionHandlercron *handlers.CronHandler+ oauth *handlers.OAuthHandler+ oauthAdmin *handlers.OAuthAdminHandler+ subscriber *handlers.SubscriberHandler+ subscriberList *handlers.SubscriberListHandler+ campaign *handlers.CampaignHandler+ tracking *handlers.TrackingHandler+ bounceWebhook *handlers.BounceWebhookHandler+ workspaceData *handlers.WorkspaceDataHandler+ plan *handlers.PlanHandler}-func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *config.Config, producer *worker.Producer, cronManager *cronpkg.Manager, ctx context.Context) {+func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *config.Config, producer *worker.Producer, cronManager *cronpkg.Manager, blobStore blob.Store, ctx context.Context) {// RepositoriesuserRepo := repositories.NewUserRepository(db)apiKeyRepo := repositories.NewAPIKeyRepository(db)@@ -117,6 +132,7 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *csettingRepo := repositories.NewSettingRepository(db)userSettingRepo := repositories.NewUserSettingRepository(db)sessionRepo := repositories.NewSessionRepository(db)+ workspaceRepo := repositories.NewWorkspaceRepository(db)// Session store (Redis-backed blacklist)sessionStore := sessionpkg.NewStore(redisClient)@@ -126,6 +142,8 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *cauditLogger := audit.NewLogger(bus)apiKeyService := auth.NewAPIKeyService(apiKeyRepo)settingsProvider := settings.NewProvider(settingRepo)+ planRepo := repositories.NewPlanRepository(db)+ planService := planpkg.NewService(planRepo, settingsProvider)limiter := ratelimit.NewRedisLimiter(redisClient, cfg.RateLimitHourly, cfg.RateLimitDaily)limiter.SetSettings(settingsProvider)webhookDeliveryRepo := repositories.NewWebhookDeliveryRepository(db)@@ -140,12 +158,16 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *cdispatcher.OnDeliveryDone(metrics.ObserveWebhookDeliveryDuration)emailService := email.NewService(emailRepo, smtpRepo, templateRepo, suppressionRepo, limiter, dispatcher, cfg.DevMode)emailService.SetSettings(settingsProvider)+ emailService.SetPlanLimits(&emailPlanAdapter{planService})emailService.SetVersionRepos(versionRepo, localizationRepo)emailService.SetContactRepo(contactRepo)emailService.SetDomainVerification(domainRepo, userRepo)if producer != nil {emailService.SetEnqueuer(producer)}+ if blobStore != nil {+ emailService.SetBlobStore(blobStore)+ }emailService.OnSent(metrics.IncrementEmailSent)emailService.OnFailed(metrics.IncrementEmailFailed)emailService.OnQueued(metrics.IncrementEmailQueued)@@ -177,15 +199,17 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *cjwtAuth: middlewares.JWTAuth(cfg, sessionStore),jwtAdminAuth: middlewares.JWTAdminAuth(cfg, sessionStore),jwtAdminQueryAuth: middlewares.JWTAdminQueryAuth(cfg, sessionStore),- loginLimiter: middlewares.LoginRateLimitMiddleware(limiter),+ loginLimiter: loginLimiterMiddleware(cfg, limiter),apiKey: middlewares.APIKeyAuthMiddleware(apiKeyService, userRepo, apiKeyRepo),+ workspace: middlewares.RequireWorkspaceMiddleware(workspaceRepo),+ optionalWorkspace: middlewares.OptionalWorkspaceMiddleware(workspaceRepo),},h: routerHandlers{health: handlers.NewHealthHandler(db, redisClient),user: userHandler,email: handlers.NewEmailHandler(emailService, emailRepo, bus, statsCache),apiKey: handlers.NewAPIKeyHandler(apiKeyService, apiKeyRepo, userSettingRepo, auditLogger),- template: handlers.NewTemplateHandler(templateRepo, stylesheetRepo, versionRepo, localizationRepo, emailService),+ template: handlers.NewTemplateHandler(templateRepo, stylesheetRepo, versionRepo, localizationRepo, languageRepo, emailService),version: handlers.NewTemplateVersionHandler(templateRepo, versionRepo),localization: handlers.NewTemplateLocalizationHandler(templateRepo, versionRepo, localizationRepo, stylesheetRepo),language: handlers.NewLanguageHandler(languageRepo),@@ -198,14 +222,14 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *cbounce: handlers.NewBounceHandler(bounceRepo, suppressionRepo, emailRepo),suppression: handlers.NewSuppressionHandler(suppressionRepo),contact: handlers.NewContactHandler(contactRepo, suppressionRepo),- contactList: handlers.NewContactListHandler(contactListRepo),admin: handlers.NewAdminHandler(db, statsCache, userRepo, apiKeyRepo, emailRepo, webhookDeliveryRepo, inspector, bus, userSeeder, cfg.EmbeddedWorker),+ workspace: handlers.NewWorkspaceHandler(workspaceRepo, userRepo, db),server: handlers.NewServerHandler(serverRepo, auditLogger),event: handlers.NewEventHandler(eventRepo, bus),analytics: handlers.NewAnalyticsHandler(repositories.NewAnalyticsRepository(db), statsCache),setting: handlers.NewSettingHandler(settingRepo, auditLogger),userSetting: handlers.NewUserSettingHandler(userSettingRepo),- userData: handlers.NewUserDataHandler(db, templateRepo, versionRepo, localizationRepo, stylesheetRepo, languageRepo, contactRepo, contactListRepo, webhookRepo, suppressionRepo, userSettingRepo),+ userData: handlers.NewUserDataHandler(db, templateRepo, versionRepo, localizationRepo, stylesheetRepo, languageRepo, contactRepo, webhookRepo, suppressionRepo, userSettingRepo),session: handlers.NewSessionHandler(sessionRepo, sessionStore),},}@@ -213,6 +237,14 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *c// Session managementr.h.user.SetSessionRepo(sessionRepo)+ // Plans+ r.h.plan = handlers.NewPlanHandler(planRepo, workspaceRepo, planService, auditLogger)+ r.h.admin.SetWorkspaceRepo(workspaceRepo, planRepo)+ r.h.workspace.SetPlanService(planService)+ r.h.apiKey.SetQuota(planService, db)+ r.h.domain.SetQuota(planService, db)+ r.h.smtp.SetQuota(planService, db)+// Email content privacyr.h.email.SetSettings(settingsProvider)r.h.admin.SetEmailSettings(settingsProvider)@@ -221,9 +253,105 @@ func InitRoutes(app *okapi.Okapi, db *gorm.DB, redisClient *redis.Client, cfg *cr.h.cron = handlers.NewCronHandler(cronManager)}+ // OAuth+ oauthProviderRepo := repositories.NewOAuthProviderRepository(db)+ oauthAccountRepo := repositories.NewOAuthAccountRepository(db)+ ssoRepo := repositories.NewWorkspaceSSORepository(db)+ oauthService := auth.NewOAuthService(oauthProviderRepo, oauthAccountRepo, userRepo)++ callbackBase := cfg.OAuthCallbackBaseURL+ if callbackBase == "" {+ callbackBase = cfg.AppWebURL+ }++ r.h.oauth = handlers.NewOAuthHandler(+ oauthService, oauthProviderRepo, oauthAccountRepo,+ userRepo, sessionRepo, cfg.JWTSecret,+ userSeeder, bus, redisClient, callbackBase, cfg.AppWebURL,+ )+ r.h.oauthAdmin = handlers.NewOAuthAdminHandler(oauthProviderRepo, ssoRepo)++ // Subscribers+ subscriberRepo := repositories.NewSubscriberRepository(db)+ subscriberListRepo := repositories.NewSubscriberListRepository(db)+ r.h.subscriber = handlers.NewSubscriberHandler(subscriberRepo)+ r.h.subscriberList = handlers.NewSubscriberListHandler(subscriberListRepo, subscriberRepo)++ // Campaigns+ campaignRepo := repositories.NewCampaignRepository(db)+ campaignMessageRepo := repositories.NewCampaignMessageRepository(db)+ r.h.campaign = handlers.NewCampaignHandler(+ campaignRepo, campaignMessageRepo,+ subscriberListRepo, subscriberRepo, templateRepo, producer,+ )++ // Tracking+ trackingRepo := repositories.NewTrackingRepository(db)+ trackingService := tracking.NewService(trackingRepo, cfg.AppWebURL, []byte(cfg.JWTSecret))+ r.h.tracking = handlers.NewTrackingHandler(trackingRepo, campaignMessageRepo, campaignRepo, subscriberRepo, trackingService)++ // Bounce webhook+ r.h.bounceWebhook = handlers.NewBounceWebhookHandler(subscriberRepo, emailRepo, campaignMessageRepo)++ // Workspace data export/import+ r.h.workspaceData = handlers.NewWorkspaceDataHandler(+ db, workspaceRepo, templateRepo, versionRepo, localizationRepo,+ stylesheetRepo, languageRepo, contactRepo, contactListRepo,+ webhookRepo, suppressionRepo, smtpRepo, domainRepo,+ subscriberRepo, subscriberListRepo,+ )++ // Auto-seed Google provider if configured+ if cfg.GoogleOAuthClientID != "" {+ if _, err := oauthProviderRepo.FindBySlug("google"); err != nil {+ _ = oauthProviderRepo.Create(&models.OAuthProvider{+ Name: "Google",+ Slug: "google",+ Type: models.OAuthProviderGoogle,+ ClientID: cfg.GoogleOAuthClientID,+ ClientSecret: cfg.GoogleOAuthClientSecret,+ Scopes: "openid email profile",+ Enabled: true,+ AutoRegister: true,+ })+ }+ }+r.registerRoutes()}+// emailPlanAdapter adapts planpkg.Service to the email.PlanLimitsProvider interface.+type emailPlanAdapter struct {+ svc *planpkg.Service+}++func (a *emailPlanAdapter) EffectiveLimits(workspaceID *uint) *email.PlanLimits {+ l := a.svc.EffectiveLimits(workspaceID)+ return &email.PlanLimits{+ HourlyRateLimit: l.HourlyRateLimit,+ DailyRateLimit: l.DailyRateLimit,+ MaxAttachmentSizeMB: l.MaxAttachmentSizeMB,+ MaxBatchSize: l.MaxBatchSize,+ }+}++// workspaceHeaderRequired is a reusable route option documenting the required workspace header.+var workspaceHeaderRequired = okapi.DocHeader("X-Posta-Workspace-Id", "integer", "Workspace ID (required for workspace-scoped endpoints)", true)++// workspaceHeaderOptional is a reusable route option documenting the optional workspace header.+var workspaceHeaderOptional = okapi.DocHeader("X-Posta-Workspace-Id", "integer", "Workspace ID (optional, omit for personal mode)", false)++// loginLimiterMiddleware returns the login rate limit middleware when enabled,+// or a pass-through middleware when disabled.+func loginLimiterMiddleware(cfg *config.Config, limiter *ratelimit.RedisLimiter) okapi.Middleware {+ if !cfg.AuthRateLimitEnabled {+ return func(c *okapi.Context) error {+ return c.Next()+ }+ }+ return middlewares.LoginRateLimitMiddleware(limiter)+}+func (r *Router) registerRoutes() {// Request ID middlewarer.app.Use(okapi.RequestID())@@ -240,6 +368,11 @@ func (r *Router) registerRoutes() {r.app.Register(r.authRoutes()...)r.app.Register(r.apiAuthRoutes()...)r.app.Register(r.userRoutes()...)+ r.app.Register(r.workspaceRoutes()...)+ r.app.Register(r.oauthRoutes()...)+ r.app.Register(r.trackingRoutes()...)+ r.app.Register(r.trackingAnalyticsRoutes()...)+ r.app.Register(r.bounceWebhookRoutes()...)r.app.Register(r.adminRoutes()...)r.app.Register(r.adminSSERoutes()...)diff --git a/internal/routes/tracking_routes.go b/internal/routes/tracking_routes.gonew file mode 100644index 0000000..d8d4b25--- /dev/null+++ b/internal/routes/tracking_routes.go@@ -0,0 +1,97 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package routes++import (+ "net/http"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/handlers"+)++// trackingRoutes returns public (no auth) route definitions for open/click/unsubscribe tracking.+func (r *Router) trackingRoutes() []okapi.RouteDefinition {+ return []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "/t/o/{message_id:int}.png",+ Handler: okapi.H(r.h.tracking.OpenPixel),+ Tags: []string{"Tracking"},+ Summary: "Open tracking pixel",+ Options: []okapi.RouteOption{okapi.DocHide()},+ },+ {+ Method: http.MethodGet,+ Path: "/t/c/{message_id:int}/{hash}",+ Handler: okapi.H(r.h.tracking.ClickRedirect),+ Tags: []string{"Tracking"},+ Summary: "Click tracking redirect",+ Options: []okapi.RouteOption{okapi.DocHide()},+ },+ {+ Method: http.MethodGet,+ Path: "/t/u/{token}",+ Handler: okapi.H(r.h.tracking.UnsubscribePage),+ Tags: []string{"Tracking"},+ Summary: "Unsubscribe page",+ Options: []okapi.RouteOption{okapi.DocHide()},+ },+ {+ Method: http.MethodPost,+ Path: "/t/u/{token}",+ Handler: okapi.H(r.h.tracking.UnsubscribeConfirm),+ Tags: []string{"Tracking"},+ Summary: "Confirm unsubscribe",+ Options: []okapi.RouteOption{okapi.DocHide()},+ },+ }+}++// bounceWebhookRoutes returns the bounce webhook route (authenticated via API key).+func (r *Router) bounceWebhookRoutes() []okapi.RouteDefinition {+ bounceGroup := r.app.Group("/webhooks/bounce", r.mw.apiKey).WithTags([]string{"Webhooks"})+ return []okapi.RouteDefinition{+ {+ Method: http.MethodPost,+ Path: "",+ Handler: okapi.H(r.h.bounceWebhook.HandleBounce),+ Group: bounceGroup,+ Summary: "Bounce notification webhook",+ Request: &handlers.BounceNotification{},+ Response: &handlers.BounceResponse{},+ },+ }+}++// trackingAnalyticsRoutes returns the authenticated campaign analytics route.+func (r *Router) trackingAnalyticsRoutes() []okapi.RouteDefinition {+ userGroup := r.v1.Group("/users/me", r.mw.jwtAuth.Middleware, r.mw.optionalWorkspace).WithTags([]string{"Campaigns"})+ userGroup.WithBearerAuth()++ return []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "/campaigns/{id:int}/analytics",+ Handler: okapi.H(r.h.tracking.CampaignAnalytics),+ Group: userGroup,+ Summary: "Get campaign analytics",+ Response: &handlers.CampaignAnalyticsResponse{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ }+}diff --git a/internal/routes/user_routes.go b/internal/routes/user_routes.goindex c6fc8c1..8bda6dd 100644--- a/internal/routes/user_routes.go+++ b/internal/routes/user_routes.go@@ -21,18 +21,18 @@ import ("net/http""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/dto"- "github.com/jkaninda/posta/internal/handlers"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/email"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/handlers"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/email")// userRoutes returns route definitions for all authenticated user endpoints.func (r *Router) userRoutes() []okapi.RouteDefinition {- userGroup := r.v1.Group("/users/me", r.mw.jwtAuth.Middleware).WithTags([]string{"User"})+ userGroup := r.v1.Group("/users/me", r.mw.jwtAuth.Middleware, r.mw.optionalWorkspace).WithTags([]string{"User"})userGroup.WithBearerAuth()- return []okapi.RouteDefinition{+ routes := []okapi.RouteDefinition{// ==================== Profile ===================={Method: http.MethodGet,@@ -94,6 +94,26 @@ func (r *Router) userRoutes() []okapi.RouteDefinition {Response: &dto.Response[any]{},},+ // ==================== Account Deletion ====================+ {+ Method: http.MethodPost,+ Path: "/delete",+ Handler: r.h.user.RequestAccountDeletion,+ Group: userGroup,+ Summary: "Request account deletion",+ Description: "Schedule account for deletion in 7 days. The account is deactivated immediately.",+ Response: &dto.Response[any]{},+ },+ {+ Method: http.MethodPost,+ Path: "/cancel-deletion",+ Handler: r.h.user.CancelAccountDeletion,+ Group: userGroup,+ Summary: "Cancel account deletion",+ Description: "Cancel a previously scheduled account deletion and reactivate the account.",+ Response: &dto.Response[any]{},+ },+// ==================== Sessions ===================={Method: http.MethodGet,@@ -382,6 +402,20 @@ func (r *Router) userRoutes() []okapi.RouteDefinition {},},+ {+ Method: http.MethodPost,+ Path: "/templates/import-html",+ Handler: r.h.template.ImportHTML,+ Group: userGroup,+ Tags: []string{"Templates"},+ Summary: "Import HTML template",+ Description: "Upload an .html file to create a template. CSS from <style> blocks is extracted into a separate stylesheet.",+ Options: []okapi.RouteOption{+ okapi.DocResponse(201, &dto.Response[models.Template]{}),+ okapi.DocErrorResponse(409, &dto.ErrorResponseBody{}),+ },+ },+// ==================== Template Versions ===================={Method: http.MethodGet,@@ -907,100 +941,6 @@ func (r *Router) userRoutes() []okapi.RouteDefinition {Response: &dto.Response[models.Contact]{},},- // ==================== Contact Lists ====================- {- Method: http.MethodPost,- Path: "/contact-lists",- Handler: okapi.H(r.h.contactList.Create),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "Create contact list",- Request: &handlers.CreateContactListRequest{},- Options: []okapi.RouteOption{- okapi.DocResponse(201, &dto.Response[models.ContactList]{}),- },- },- {- Method: http.MethodGet,- Path: "/contact-lists",- Handler: okapi.H(r.h.contactList.List),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "List contact lists",- Request: &handlers.ListRequest{},- Response: &dto.PageableResponse[handlers.ContactListWithCount]{},- },- {- Method: http.MethodPut,- Path: "/contact-lists/{id:int}",- Handler: okapi.H(r.h.contactList.Update),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "Update contact list",- Request: &handlers.UpdateContactListRequest{},- Response: &dto.Response[models.ContactList]{},- Options: []okapi.RouteOption{- okapi.DocPathParam("id", "integer", "Contact list ID"),- okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),- },- },- {- Method: http.MethodDelete,- Path: "/contact-lists/{id:int}",- Handler: okapi.H(r.h.contactList.Delete),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "Delete contact list",- Options: []okapi.RouteOption{- okapi.DocPathParam("id", "integer", "Contact list ID"),- okapi.DocResponse(204, nil),- okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),- },- },- {- Method: http.MethodPost,- Path: "/contact-lists/{id:int}/members",- Handler: okapi.H(r.h.contactList.AddMember),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "Add member to list",- Request: &handlers.AddMemberRequest{},- Options: []okapi.RouteOption{- okapi.DocPathParam("id", "integer", "Contact list ID"),- okapi.DocResponse(201, &dto.Response[models.ContactListMember]{}),- okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),- okapi.DocErrorResponse(409, &dto.ErrorResponseBody{}),- },- },- {- Method: http.MethodDelete,- Path: "/contact-lists/{id:int}/members",- Handler: okapi.H(r.h.contactList.RemoveMember),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "Remove member from list",- Request: &handlers.RemoveMemberRequest{},- Options: []okapi.RouteOption{- okapi.DocPathParam("id", "integer", "Contact list ID"),- okapi.DocResponse(204, nil),- okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),- },- },- {- Method: http.MethodGet,- Path: "/contact-lists/{id:int}/members",- Handler: okapi.H(r.h.contactList.ListMembers),- Group: userGroup,- Tags: []string{"Contact Lists"},- Summary: "List members in contact list",- Request: &handlers.ListMembersRequest{},- Response: &dto.PageableResponse[models.ContactListMember]{},- Options: []okapi.RouteOption{- okapi.DocPathParam("id", "integer", "Contact list ID"),- okapi.DocErrorResponse(404, &dto.ErrorResponseBody{}),- },- },-// ==================== User Data Export/Import ===================={Method: http.MethodGet,@@ -1062,5 +1002,293 @@ func (r *Router) userRoutes() []okapi.RouteDefinition {Request: &handlers.UpdateUserSettingsRequest{},Response: &dto.Response[models.UserSetting]{},},++ // ==================== Subscribers ====================+ {+ Method: http.MethodPost,+ Path: "/subscribers",+ Handler: okapi.H(r.h.subscriber.Create),+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "Create subscriber",+ Request: &handlers.CreateSubscriberRequest{},+ Options: []okapi.RouteOption{okapi.DocResponse(201, &dto.Response[models.Subscriber]{})},+ },+ {+ Method: http.MethodGet,+ Path: "/subscribers",+ Handler: okapi.H(r.h.subscriber.List),+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "List subscribers",+ Request: &handlers.ListSubscribersRequest{},+ Response: &dto.PageableResponse[models.Subscriber]{},+ },+ {+ Method: http.MethodGet,+ Path: "/subscribers/{id:int}",+ Handler: okapi.H(r.h.subscriber.Get),+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "Get subscriber",+ Response: &dto.Response[models.Subscriber]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Subscriber ID")},+ },+ {+ Method: http.MethodPut,+ Path: "/subscribers/{id:int}",+ Handler: okapi.H(r.h.subscriber.Update),+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "Update subscriber",+ Request: &handlers.UpdateSubscriberRequest{},+ Response: &dto.Response[models.Subscriber]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Subscriber ID")},+ },+ {+ Method: http.MethodDelete,+ Path: "/subscribers/{id:int}",+ Handler: okapi.H(r.h.subscriber.Delete),+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "Delete subscriber",+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Subscriber ID"), okapi.DocResponse(204, nil)},+ },+ {+ Method: http.MethodPost,+ Path: "/subscribers/import/json",+ Handler: okapi.H(r.h.subscriber.BulkImportJSON),+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "Bulk import subscribers (JSON)",+ Request: &handlers.BulkImportSubscribersRequest{},+ Response: &dto.Response[handlers.BulkImportResult]{},+ },+ {+ Method: http.MethodPost,+ Path: "/subscribers/import/csv",+ Handler: r.h.subscriber.BulkImportCSV,+ Group: userGroup,+ Tags: []string{"Subscribers"},+ Summary: "Bulk import subscribers (CSV)",+ Description: "Upload a CSV file with optional column_mapping JSON field",+ Response: &dto.Response[handlers.BulkImportResult]{},+ },++ // ==================== Subscriber Lists ====================+ {+ Method: http.MethodPost,+ Path: "/subscriber-lists",+ Handler: okapi.H(r.h.subscriberList.Create),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Create subscriber list",+ Request: &handlers.CreateSubscriberListRequest{},+ Options: []okapi.RouteOption{okapi.DocResponse(201, &dto.Response[models.SubscriberList]{})},+ },+ {+ Method: http.MethodGet,+ Path: "/subscriber-lists",+ Handler: okapi.H(r.h.subscriberList.List),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "List subscriber lists",+ Request: &handlers.ListRequest{},+ Response: &dto.PageableResponse[handlers.SubscriberListWithCount]{},+ },+ {+ Method: http.MethodGet,+ Path: "/subscriber-lists/{id:int}",+ Handler: okapi.H(r.h.subscriberList.Get),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Get subscriber list",+ Response: &dto.Response[handlers.SubscriberListWithCount]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "List ID")},+ },+ {+ Method: http.MethodPut,+ Path: "/subscriber-lists/{id:int}",+ Handler: okapi.H(r.h.subscriberList.Update),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Update subscriber list",+ Request: &handlers.UpdateSubscriberListRequest{},+ Response: &dto.Response[models.SubscriberList]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "List ID")},+ },+ {+ Method: http.MethodDelete,+ Path: "/subscriber-lists/{id:int}",+ Handler: okapi.H(r.h.subscriberList.Delete),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Delete subscriber list",+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "List ID"), okapi.DocResponse(204, nil)},+ },+ {+ Method: http.MethodPost,+ Path: "/subscriber-lists/{id:int}/members",+ Handler: okapi.H(r.h.subscriberList.AddMember),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Add subscriber to list",+ Request: &handlers.AddSubscriberToListRequest{},+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "List ID")},+ },+ {+ Method: http.MethodDelete,+ Path: "/subscriber-lists/{id:int}/members",+ Handler: okapi.H(r.h.subscriberList.RemoveMember),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Remove subscriber from list",+ Request: &handlers.RemoveSubscriberFromListRequest{},+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "List ID")},+ },+ {+ Method: http.MethodGet,+ Path: "/subscriber-lists/{id:int}/members",+ Handler: okapi.H(r.h.subscriberList.ListMembers),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "List members of subscriber list",+ Request: &handlers.ListSubscriberListMembersRequest{},+ Response: &dto.PageableResponse[models.Subscriber]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "List ID")},+ },+ {+ Method: http.MethodPost,+ Path: "/subscriber-lists/preview-segment",+ Handler: okapi.H(r.h.subscriberList.PreviewSegment),+ Group: userGroup,+ Tags: []string{"Subscriber Lists"},+ Summary: "Preview segment count",+ Description: "Evaluate filter rules and return the number of matching subscribers",+ Request: &handlers.PreviewSegmentRequest{},+ Response: &dto.Response[okapi.M]{},+ },++ // ==================== Campaigns ====================+ {+ Method: http.MethodPost,+ Path: "/campaigns",+ Handler: okapi.H(r.h.campaign.Create),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Create campaign",+ Request: &handlers.CreateCampaignRequest{},+ Options: []okapi.RouteOption{okapi.DocResponse(201, &dto.Response[models.Campaign]{})},+ },+ {+ Method: http.MethodGet,+ Path: "/campaigns",+ Handler: okapi.H(r.h.campaign.List),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "List campaigns",+ Request: &handlers.ListCampaignsRequest{},+ Response: &dto.PageableResponse[handlers.CampaignWithStats]{},+ },+ {+ Method: http.MethodGet,+ Path: "/campaigns/{id:int}",+ Handler: okapi.H(r.h.campaign.Get),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Get campaign",+ Response: &dto.Response[handlers.CampaignWithStats]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodPut,+ Path: "/campaigns/{id:int}",+ Handler: okapi.H(r.h.campaign.Update),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Update campaign",+ Request: &handlers.UpdateCampaignRequest{},+ Response: &dto.Response[models.Campaign]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodDelete,+ Path: "/campaigns/{id:int}",+ Handler: okapi.H(r.h.campaign.Delete),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Delete campaign",+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID"), okapi.DocResponse(204, nil)},+ },+ {+ Method: http.MethodPost,+ Path: "/campaigns/{id:int}/send",+ Handler: okapi.H(r.h.campaign.Send),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Send campaign",+ Response: &dto.Response[models.Campaign]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodPost,+ Path: "/campaigns/{id:int}/pause",+ Handler: okapi.H(r.h.campaign.Pause),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Pause campaign",+ Response: &dto.Response[models.Campaign]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodPost,+ Path: "/campaigns/{id:int}/resume",+ Handler: okapi.H(r.h.campaign.Resume),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Resume campaign",+ Response: &dto.Response[models.Campaign]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodPost,+ Path: "/campaigns/{id:int}/cancel",+ Handler: okapi.H(r.h.campaign.Cancel),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Cancel campaign",+ Response: &dto.Response[models.Campaign]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodPost,+ Path: "/campaigns/{id:int}/duplicate",+ Handler: okapi.H(r.h.campaign.Duplicate),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "Duplicate campaign",+ Response: &dto.Response[models.Campaign]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },+ {+ Method: http.MethodGet,+ Path: "/campaigns/{id:int}/messages",+ Handler: okapi.H(r.h.campaign.ListMessages),+ Group: userGroup,+ Tags: []string{"Campaigns"},+ Summary: "List campaign messages",+ Request: &handlers.ListCampaignMessagesRequest{},+ Response: &dto.PageableResponse[models.CampaignMessage]{},+ Options: []okapi.RouteOption{okapi.DocPathParam("id", "integer", "Campaign ID")},+ },}++ // Append optional workspace header documentation to all user routes+ for i := range routes {+ routes[i].Options = append(routes[i].Options, workspaceHeaderOptional)+ }++ return routes}diff --git a/internal/routes/workspace_routes.go b/internal/routes/workspace_routes.gonew file mode 100644index 0000000..b390a2b--- /dev/null+++ b/internal/routes/workspace_routes.go@@ -0,0 +1,284 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package routes++import (+ "net/http"++ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/dto"+ "github.com/goposta/posta/internal/handlers"+ "github.com/goposta/posta/internal/models"+)++// workspaceRoutes returns route definitions for workspace management.+func (r *Router) workspaceRoutes() []okapi.RouteDefinition {+ // Routes that don't require workspace context (user-level)+ userGroup := r.v1.Group("/workspaces", r.mw.jwtAuth.Middleware).WithTags([]string{"Workspaces"})+ userGroup.WithBearerAuth()++ routes := []okapi.RouteDefinition{+ {+ Method: http.MethodPost,+ Path: "",+ Handler: okapi.H(r.h.workspace.Create),+ Group: userGroup,+ Summary: "Create workspace",+ Description: "Create a new workspace. The creator becomes the owner.",+ Request: &handlers.CreateWorkspaceRequest{},+ Options: []okapi.RouteOption{+ okapi.DocResponse(201, &dto.Response[handlers.WorkspaceResponse]{}),+ okapi.DocErrorResponse(409, &dto.ErrorResponseBody{}),+ },+ },+ {+ Method: http.MethodGet,+ Path: "",+ Handler: r.h.workspace.List,+ Group: userGroup,+ Summary: "List workspaces",+ Description: "List all workspaces the current user is a member of",+ Response: &dto.Response[[]handlers.WorkspaceResponse]{},+ },+ }++ // Workspace-scoped routes (require workspace context via middleware)+ wsGroup := r.v1.Group("/workspaces/current", r.mw.jwtAuth.Middleware, r.mw.workspace).WithTags([]string{"Workspaces"})+ wsGroup.WithBearerAuth()++ routes = append(routes, []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "",+ Handler: r.h.workspace.Get,+ Group: wsGroup,+ Summary: "Get current workspace",+ Response: &dto.Response[handlers.WorkspaceResponse]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodPut,+ Path: "",+ Handler: okapi.H(r.h.workspace.Update),+ Group: wsGroup,+ Summary: "Update workspace",+ Description: "Update workspace name and description (admin/owner only)",+ Request: &handlers.UpdateWorkspaceRequest{},+ Response: &dto.Response[handlers.WorkspaceResponse]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodDelete,+ Path: "",+ Handler: r.h.workspace.Delete,+ Group: wsGroup,+ Summary: "Delete workspace",+ Description: "Delete the workspace (owner only)",+ Options: []okapi.RouteOption{+ workspaceHeaderRequired,+ okapi.DocResponse(204, nil),+ },+ },++ // Members+ {+ Method: http.MethodGet,+ Path: "/members",+ Handler: r.h.workspace.ListMembers,+ Group: wsGroup,+ Summary: "List workspace members",+ Response: &dto.Response[[]handlers.WorkspaceMemberResponse]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodPut,+ Path: "/members/{member_id:int}",+ Handler: okapi.H(r.h.workspace.UpdateMemberRole),+ Group: wsGroup,+ Summary: "Update member role",+ Request: &handlers.UpdateMemberRoleRequest{},+ Response: &dto.Response[dto.MessageData]{},+ Options: []okapi.RouteOption{+ workspaceHeaderRequired,+ okapi.DocPathParam("member_id", "integer", "User ID of the member"),+ },+ },+ {+ Method: http.MethodDelete,+ Path: "/members/{member_id:int}",+ Handler: okapi.H(r.h.workspace.RemoveMember),+ Group: wsGroup,+ Summary: "Remove member",+ Description: "Remove a member from the workspace (admin/owner only)",+ Options: []okapi.RouteOption{+ workspaceHeaderRequired,+ okapi.DocPathParam("member_id", "integer", "User ID of the member"),+ okapi.DocResponse(204, nil),+ },+ },++ // Invitations (workspace-scoped)+ {+ Method: http.MethodPost,+ Path: "/invitations",+ Handler: okapi.H(r.h.workspace.InviteMember),+ Group: wsGroup,+ Summary: "Invite member",+ Description: "Invite a user to the workspace via email",+ Request: &handlers.InviteMemberRequest{},+ Options: []okapi.RouteOption{+ workspaceHeaderRequired,+ okapi.DocResponse(201, &dto.Response[handlers.InvitationResponse]{}),+ },+ },+ {+ Method: http.MethodGet,+ Path: "/invitations",+ Handler: r.h.workspace.ListInvitations,+ Group: wsGroup,+ Summary: "List pending invitations",+ Response: &dto.Response[[]handlers.InvitationResponse]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodDelete,+ Path: "/invitations/{invitation_id:int}",+ Handler: okapi.H(r.h.workspace.DeleteInvitation),+ Group: wsGroup,+ Summary: "Cancel invitation",+ Options: []okapi.RouteOption{+ workspaceHeaderRequired,+ okapi.DocPathParam("invitation_id", "integer", "Invitation ID"),+ okapi.DocResponse(204, nil),+ },+ },++ // Plan+ {+ Method: http.MethodGet,+ Path: "/plan",+ Handler: r.h.workspace.GetPlan,+ Group: wsGroup,+ Summary: "Get workspace plan",+ Description: "Get the effective plan and limits for the current workspace",+ Response: &dto.Response[models.Plan]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },++ // Data Transfer+ {+ Method: http.MethodPost,+ Path: "/transfer",+ Handler: okapi.H(r.h.workspace.TransferData),+ Group: wsGroup,+ Summary: "Transfer personal data to workspace",+ Description: "Move the current user's personal resources into this workspace",+ Request: &handlers.TransferDataRequest{},+ Response: &dto.Response[handlers.TransferResponse]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },++ // Data Export/Import+ {+ Method: http.MethodGet,+ Path: "/data/export",+ Handler: r.h.workspaceData.Export,+ Group: wsGroup,+ Summary: "Export workspace data",+ Description: "Export all workspace data including settings, templates, stylesheets, languages, contacts, contact lists, webhooks, SMTP servers, domains, subscribers, subscriber lists, and suppressions as JSON",+ Response: &dto.Response[handlers.WorkspaceDataExport]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ {+ Method: http.MethodPost,+ Path: "/data/import",+ Handler: okapi.H(r.h.workspaceData.Import),+ Group: wsGroup,+ Summary: "Import workspace data",+ Description: "Import workspace data from a previously exported JSON payload. Duplicates are skipped. SMTP servers are imported as disabled (passwords excluded). Domains require re-verification.",+ Request: &handlers.ImportWorkspaceDataRequest{},+ Response: &dto.Response[any]{},+ Options: []okapi.RouteOption{workspaceHeaderRequired},+ },+ }...)++ // User-level invitation actions (no workspace context needed)+ invGroup := r.v1.Group("/invitations", r.mw.jwtAuth.Middleware).WithTags([]string{"Workspaces"})+ invGroup.WithBearerAuth()++ routes = append(routes, []okapi.RouteDefinition{+ {+ Method: http.MethodGet,+ Path: "",+ Handler: r.h.workspace.MyInvitations,+ Group: invGroup,+ Summary: "My pending invitations",+ Description: "List all pending workspace invitations for the current user",+ Response: &dto.Response[[]handlers.InvitationResponse]{},+ },+ {+ Method: http.MethodPost,+ Path: "/accept",+ Handler: okapi.H(r.h.workspace.AcceptInvitation),+ Group: invGroup,+ Summary: "Accept invitation",+ Description: "Accept a workspace invitation using the invitation token",+ Request: &handlers.AcceptInvitationRequest{},+ Response: &dto.Response[okapi.M]{},+ },+ {+ Method: http.MethodPost,+ Path: "/decline",+ Handler: okapi.H(r.h.workspace.DeclineInvitation),+ Group: invGroup,+ Summary: "Decline invitation by token",+ Description: "Decline a workspace invitation using the invitation token",+ Request: &handlers.DeclineInvitationRequest{},+ Response: &dto.Response[okapi.M]{},+ },+ {+ Method: http.MethodPost,+ Path: "/{id:int}/accept",+ Handler: okapi.H(r.h.workspace.AcceptInvitationByID),+ Group: invGroup,+ Summary: "Accept invitation by ID",+ Description: "Accept a workspace invitation by its ID",+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Invitation ID"),+ },+ },+ {+ Method: http.MethodPost,+ Path: "/{id:int}/decline",+ Handler: okapi.H(r.h.workspace.DeclineInvitationByID),+ Group: invGroup,+ Summary: "Decline invitation by ID",+ Description: "Decline a workspace invitation by its ID",+ Response: &dto.Response[okapi.M]{},+ Options: []okapi.RouteOption{+ okapi.DocPathParam("id", "integer", "Invitation ID"),+ },+ },+ }...)++ return routes+}++// Ignore unused imports for linting+var _ = models.WorkspaceRoleOwnerdiff --git a/internal/services/audit/audit.go b/internal/services/audit/audit.goindex 6302e3d..768ca85 100644--- a/internal/services/audit/audit.go+++ b/internal/services/audit/audit.go@@ -18,8 +18,8 @@package auditimport (- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/eventbus")// Logger records audit trail events via the existing event bus.diff --git a/internal/services/auth/api_key.go b/internal/services/auth/api_key.goindex 12e3501..ee081bb 100644--- a/internal/services/auth/api_key.go+++ b/internal/services/auth/api_key.go@@ -25,8 +25,8 @@ import ("strings""time"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")const apiKeyPrefix = "psk_"@@ -41,7 +41,7 @@ func NewAPIKeyService(repo *repositories.APIKeyRepository) *APIKeyService {// GenerateKey creates a new API key and returns the raw key (only shown once).// If expiresAt is nil the key never expires.-func (s *APIKeyService) GenerateKey(userID uint, name string, allowedIPs []string, expiresAt *time.Time) (string, *models.APIKey, error) {+func (s *APIKeyService) GenerateKey(userID uint, workspaceID *uint, name string, allowedIPs []string, expiresAt *time.Time) (string, *models.APIKey, error) {rawBytes := make([]byte, 32)if _, err := rand.Read(rawBytes); err != nil {return "", nil, fmt.Errorf("failed to generate key: %w", err)@@ -51,12 +51,13 @@ func (s *APIKeyService) GenerateKey(userID uint, name string, allowedIPs []strinhash := hashKey(rawKey)key := &models.APIKey{- UserID: userID,- Name: name,- KeyHash: hash,- KeyPrefix: rawKey[:len(apiKeyPrefix)+8],- AllowedIPs: allowedIPs,- ExpiresAt: expiresAt,+ UserID: userID,+ WorkspaceID: workspaceID,+ Name: name,+ KeyHash: hash,+ KeyPrefix: rawKey[:len(apiKeyPrefix)+8],+ AllowedIPs: allowedIPs,+ ExpiresAt: expiresAt,}if err := s.repo.Create(key); err != nil {diff --git a/internal/services/auth/oauth.go b/internal/services/auth/oauth.gonew file mode 100644index 0000000..549dd92--- /dev/null+++ b/internal/services/auth/oauth.go@@ -0,0 +1,342 @@+package auth++import (+ "context"+ "encoding/json"+ "fmt"+ "io"+ "net/http"+ "strings"+ "time"++ "github.com/coreos/go-oidc/v3/oidc"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories"+ "golang.org/x/oauth2"+ "golang.org/x/oauth2/google"+)++// OAuthUserInfo represents the user info extracted from an OAuth provider.+type OAuthUserInfo struct {+ Sub string+ Email string+ Name string+ AvatarURL string+}++// OAuthService handles OAuth authentication flows.+type OAuthService struct {+ providerRepo *repositories.OAuthProviderRepository+ accountRepo *repositories.OAuthAccountRepository+ userRepo *repositories.UserRepository+}++func NewOAuthService(+ providerRepo *repositories.OAuthProviderRepository,+ accountRepo *repositories.OAuthAccountRepository,+ userRepo *repositories.UserRepository,+) *OAuthService {+ return &OAuthService{+ providerRepo: providerRepo,+ accountRepo: accountRepo,+ userRepo: userRepo,+ }+}++// GetOAuthConfig builds an oauth2.Config for the given provider.+func (s *OAuthService) GetOAuthConfig(provider *models.OAuthProvider, redirectURI string) (*oauth2.Config, error) {+ scopes := strings.Split(provider.Scopes, " ")+ if len(scopes) == 0 || scopes[0] == "" {+ scopes = []string{"openid", "email", "profile"}+ }++ cfg := &oauth2.Config{+ ClientID: provider.ClientID,+ ClientSecret: provider.ClientSecret,+ Scopes: scopes,+ RedirectURL: redirectURI,+ }++ if provider.Type == models.OAuthProviderGoogle {+ cfg.Endpoint = google.Endpoint+ return cfg, nil+ }++ // OIDC: try auto-discovery first, fall back to explicit URLs+ if provider.Issuer != "" {+ oidcProvider, err := oidc.NewProvider(context.Background(), provider.Issuer)+ if err == nil {+ cfg.Endpoint = oidcProvider.Endpoint()+ return cfg, nil+ }+ // Fall through to explicit URLs if discovery fails+ }++ if provider.AuthURL == "" || provider.TokenURL == "" {+ return nil, fmt.Errorf("OIDC provider %q has no issuer for auto-discovery and no explicit auth_url/token_url configured", provider.Name)+ }++ cfg.Endpoint = oauth2.Endpoint{+ AuthURL: provider.AuthURL,+ TokenURL: provider.TokenURL,+ }+ return cfg, nil+}++// ExchangeCode exchanges an authorization code for tokens and user info.+func (s *OAuthService) ExchangeCode(ctx context.Context, provider *models.OAuthProvider, code, redirectURI string) (*OAuthUserInfo, *oauth2.Token, error) {+ cfg, err := s.GetOAuthConfig(provider, redirectURI)+ if err != nil {+ return nil, nil, err+ }++ token, err := cfg.Exchange(ctx, code)+ if err != nil {+ return nil, nil, fmt.Errorf("token exchange failed (token_url=%s, redirect_uri=%s): %w", cfg.Endpoint.TokenURL, cfg.RedirectURL, err)+ }++ if rawIDToken, ok := token.Extra("id_token").(string); ok && rawIDToken != "" {+ info, idErr := s.parseIDToken(ctx, provider, rawIDToken)+ if idErr == nil {+ return info, token, nil+ }+ fmt.Printf("[oauth] ID token parse failed for %s: %v, falling back to userinfo\n", provider.Slug, idErr)+ }++ // Fall back to userinfo endpoint (use OIDC discovery for correct URL)+ info, err := s.fetchUserInfo(ctx, provider, token)+ if err != nil {+ return nil, nil, fmt.Errorf("failed to get user info: %w", err)+ }++ return info, token, nil+}++// parseIDToken validates and extracts claims from an OIDC ID token.+func (s *OAuthService) parseIDToken(ctx context.Context, provider *models.OAuthProvider, rawIDToken string) (*OAuthUserInfo, error) {+ var issuer string+ if provider.Type == models.OAuthProviderGoogle {+ issuer = "https://accounts.google.com"+ } else {+ issuer = provider.Issuer+ }++ if issuer == "" {+ return nil, fmt.Errorf("no issuer configured")+ }++ oidcProvider, err := oidc.NewProvider(ctx, issuer)+ if err != nil {+ return nil, fmt.Errorf("OIDC discovery failed: %w", err)+ }++ verifier := oidcProvider.Verifier(&oidc.Config{ClientID: provider.ClientID})+ idToken, err := verifier.Verify(ctx, rawIDToken)+ if err != nil {+ return nil, fmt.Errorf("ID token verification failed: %w", err)+ }++ var claims struct {+ Sub string `json:"sub"`+ Email string `json:"email"`+ Name string `json:"name"`+ Picture string `json:"picture"`+ }+ if err := idToken.Claims(&claims); err != nil {+ return nil, fmt.Errorf("failed to parse claims: %w", err)+ }++ return &OAuthUserInfo{+ Sub: claims.Sub,+ Email: claims.Email,+ Name: claims.Name,+ AvatarURL: claims.Picture,+ }, nil+}++func (s *OAuthService) fetchUserInfo(ctx context.Context, provider *models.OAuthProvider, token *oauth2.Token) (*OAuthUserInfo, error) {+ userInfoURL := provider.UserInfoURL++ if userInfoURL == "" && provider.Issuer != "" {+ oidcProvider, err := oidc.NewProvider(ctx, provider.Issuer)+ if err == nil {+ var claims struct {+ UserInfoURL string `json:"userinfo_endpoint"`+ }+ if err := oidcProvider.Claims(&claims); err == nil && claims.UserInfoURL != "" {+ userInfoURL = claims.UserInfoURL+ }+ }+ }++ if userInfoURL == "" && provider.Type == models.OAuthProviderGoogle {+ userInfoURL = "https://www.googleapis.com/oauth2/v3/userinfo"+ }+ if userInfoURL == "" {+ return nil, fmt.Errorf("no userinfo URL available (set issuer for auto-discovery or configure userinfo_url)")+ }++ req, err := http.NewRequestWithContext(ctx, "GET", userInfoURL, nil)+ if err != nil {+ return nil, err+ }+ req.Header.Set("Authorization", "Bearer "+token.AccessToken)++ resp, err := http.DefaultClient.Do(req)+ if err != nil {+ return nil, err+ }+ defer resp.Body.Close()++ if resp.StatusCode != http.StatusOK {+ body, _ := io.ReadAll(resp.Body)+ return nil, fmt.Errorf("userinfo request failed: %d %s", resp.StatusCode, string(body))+ }++ var claims struct {+ Sub string `json:"sub"`+ Email string `json:"email"`+ Name string `json:"name"`+ PreferredUsername string `json:"preferred_username"`+ GivenName string `json:"given_name"`+ FamilyName string `json:"family_name"`+ Picture string `json:"picture"`+ }+ if err := json.NewDecoder(resp.Body).Decode(&claims); err != nil {+ return nil, fmt.Errorf("failed to decode userinfo: %w", err)+ }++ name := claims.Name+ if name == "" {+ name = strings.TrimSpace(claims.GivenName + " " + claims.FamilyName)+ }+ if name == "" {+ name = claims.PreferredUsername+ }++ return &OAuthUserInfo{+ Sub: claims.Sub,+ Email: claims.Email,+ Name: name,+ AvatarURL: claims.Picture,+ }, nil+}++// FindOrCreateUser implements the account linking logic.+func (s *OAuthService) FindOrCreateUser(provider *models.OAuthProvider, info *OAuthUserInfo, token *oauth2.Token) (*models.User, bool, error) {+ // 1. Check if OAuth account already exists+ account, err := s.accountRepo.FindByProviderAndExternalID(provider.ID, info.Sub)+ if err == nil && account != nil {+ account.AccessToken = token.AccessToken+ account.RefreshToken = token.RefreshToken+ if !token.Expiry.IsZero() {+ account.TokenExpiresAt = &token.Expiry+ }+ account.Email = info.Email+ account.Name = info.Name+ account.AvatarURL = info.AvatarURL+ account.UpdatedAt = time.Now()+ _ = s.accountRepo.Update(account)++ user, err := s.userRepo.FindByID(account.UserID)+ if err != nil {+ return nil, false, fmt.Errorf("linked user not found")+ }+ return user, false, nil+ }++ // 2. Check if user exists by email+ email := strings.ToLower(strings.TrimSpace(info.Email))+ if email == "" {+ return nil, false, fmt.Errorf("OAuth provider did not return an email")+ }++ // Check allowed domains+ if provider.AllowedDomains != "" {+ parts := strings.SplitN(email, "@", 2)+ if len(parts) == 2 {+ domain := parts[1]+ allowed := false+ for _, d := range strings.Split(provider.AllowedDomains, ",") {+ if strings.TrimSpace(d) == domain {+ allowed = true+ break+ }+ }+ if !allowed {+ return nil, false, fmt.Errorf("email domain %q is not allowed for this provider", domain)+ }+ }+ }++ existingUser, err := s.userRepo.FindByEmail(email)+ if err == nil && existingUser != nil {+ // User exists — link OAuth account+ oauthAccount := &models.OAuthAccount{+ UserID: existingUser.ID,+ ProviderID: provider.ID,+ ProviderUserID: info.Sub,+ Email: info.Email,+ Name: info.Name,+ AvatarURL: info.AvatarURL,+ AccessToken: token.AccessToken,+ RefreshToken: token.RefreshToken,+ }+ if !token.Expiry.IsZero() {+ oauthAccount.TokenExpiresAt = &token.Expiry+ }+ if err := s.accountRepo.Create(oauthAccount); err != nil {+ return nil, false, fmt.Errorf("failed to link account: %w", err)+ }++ // Update auth method+ if existingUser.AuthMethod == "password" {+ existingUser.AuthMethod = "both"+ }+ if existingUser.AvatarURL == "" {+ existingUser.AvatarURL = info.AvatarURL+ }+ _ = s.userRepo.Update(existingUser)++ return existingUser, false, nil+ }++ // 3. No user found — auto-register if allowed+ if !provider.AutoRegister {+ return nil, false, fmt.Errorf("account not found and auto-registration is disabled for this provider")+ }++ name := info.Name+ if name == "" {+ name = strings.SplitN(email, "@", 2)[0]+ }++ newUser := &models.User{+ Email: email,+ Name: name,+ Role: models.UserRoleUser,+ AuthMethod: "oauth",+ AvatarURL: info.AvatarURL,+ Active: true,+ }+ if err := s.userRepo.Create(newUser); err != nil {+ return nil, false, fmt.Errorf("failed to create user: %w", err)+ }++ oauthAccount := &models.OAuthAccount{+ UserID: newUser.ID,+ ProviderID: provider.ID,+ ProviderUserID: info.Sub,+ Email: info.Email,+ Name: info.Name,+ AvatarURL: info.AvatarURL,+ AccessToken: token.AccessToken,+ RefreshToken: token.RefreshToken,+ }+ if !token.Expiry.IsZero() {+ oauthAccount.TokenExpiresAt = &token.Expiry+ }+ _ = s.accountRepo.Create(oauthAccount)++ return newUser, true, nil+}diff --git a/internal/services/cache/cache.go b/internal/services/cache/cache.goindex d792919..146007f 100644--- a/internal/services/cache/cache.go+++ b/internal/services/cache/cache.go@@ -27,11 +27,10 @@ import ()const (- // Default TTLs for cached data.- DashboardStatsTTL = 60 * time.Second- AdminMetricsTTL = 60 * time.Second- UserMetricsTTL = 60 * time.Second- AnalyticsTTL = 120 * time.Second+ DashboardStatsTTL = 30 * time.Second+ AdminMetricsTTL = 30 * time.Second+ UserMetricsTTL = 30 * time.Second+ AnalyticsTTL = 60 * time.SecondprefixDashboard = "cache:dashboard:"prefixAdminMetrics = "cache:admin:metrics"@@ -52,8 +51,6 @@ func New(client *redis.Client) *Cache {return &Cache{client: client}}-// Get retrieves a cached value and unmarshals it into dest.-// Returns false if the key does not exist or on error.func (c *Cache) Get(ctx context.Context, key string, dest any) bool {data, err := c.client.Get(ctx, key).Bytes()if err != nil {@@ -76,8 +73,6 @@ func (c *Cache) Delete(ctx context.Context, key string) {c.client.Del(ctx, key)}-// --- Key builders ----func DashboardKey(userID int) string {return fmt.Sprintf("%s%d", prefixDashboard, userID)}@@ -110,7 +105,10 @@ func AdminDashboardAnalyticsKey(from, to string) string {func (c *Cache) InvalidateUser(ctx context.Context, userID int) {c.Delete(ctx, DashboardKey(userID))c.Delete(ctx, UserMetricsKey(userID))- // Invalidate admin-level caches too, since user data affects them.+ // Per-user analytics (date-range queries include user ID in key)+ c.InvalidateByPattern(ctx, fmt.Sprintf("%s%d:*", prefixUserAnalytics, userID))+ c.InvalidateByPattern(ctx, fmt.Sprintf("%s%d:*", prefixDashAnalytics, userID))+ // Admin-level caches are affected since user data rolls up into them.c.Delete(ctx, AdminMetricsKey())}@@ -127,9 +125,10 @@ func (c *Cache) InvalidateByPattern(ctx context.Context, pattern string) {}}-// InvalidateAnalytics removes all cached analytics data.+// InvalidateAnalytics removes all cached analytics data (both user and admin).func (c *Cache) InvalidateAnalytics(ctx context.Context) {c.InvalidateByPattern(ctx, "cache:analytics:*")+ c.InvalidateByPattern(ctx, "cache:dash_analytics:*")}// InvalidateAll removes all cache keys (dashboard + metrics + analytics).diff --git a/internal/services/domain/verifier.go b/internal/services/domain/verifier.goindex 46da661..a646fe6 100644--- a/internal/services/domain/verifier.go+++ b/internal/services/domain/verifier.go@@ -21,7 +21,7 @@ import ("net""strings"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models")// VerificationResult holds the outcome of DNS record checks.diff --git a/internal/services/email/service.go b/internal/services/email/service.goindex dc270bd..d03de94 100644--- a/internal/services/email/service.go+++ b/internal/services/email/service.go@@ -18,19 +18,23 @@package emailimport (+ "bytes""context"+ "encoding/base64""encoding/json""fmt"+ "io""net/mail""strings""time""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/ratelimit"- "github.com/jkaninda/posta/internal/services/settings"- "github.com/jkaninda/posta/internal/services/webhook"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/ratelimit"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/services/webhook"+ "github.com/goposta/posta/internal/storage/blob"+ "github.com/goposta/posta/internal/storage/repositories")const (@@ -47,6 +51,19 @@ type EmailEnqueuer interface {EnqueueEmailSendAt(emailID uint, queue string, sendAt time.Time) error}+// PlanLimitsProvider resolves effective plan limits for a given workspace.+type PlanLimitsProvider interface {+ EffectiveLimits(workspaceID *uint) *PlanLimits+}++// PlanLimits holds the resolved limits from a plan or global settings.+type PlanLimits struct {+ HourlyRateLimit int+ DailyRateLimit int+ MaxAttachmentSizeMB int+ MaxBatchSize int+}+type Service struct {emailRepo *repositories.EmailRepositorysmtpRepo *repositories.SMTPRepository@@ -63,6 +80,8 @@ type Service struct {dispatcher *webhook.Dispatcherenqueuer EmailEnqueuersettings *settings.Provider+ blobStore blob.Store+ planLimits PlanLimitsProviderdevMode boolonSent func()onFailed func()@@ -113,12 +132,79 @@ func (s *Service) SetSettings(sp *settings.Provider) {s.settings = sp}+// SetPlanLimits sets the plan limits provider for plan-aware enforcement.+func (s *Service) SetPlanLimits(pl PlanLimitsProvider) {+ s.planLimits = pl+}+// SetEnqueuer sets the email enqueuer for asynchronous delivery.// When set, emails are enqueued to a background worker instead of being sent synchronously.func (s *Service) SetEnqueuer(eq EmailEnqueuer) {s.enqueuer = eq}+// SetBlobStore sets the blob storage backend for persisting email attachments.+// When configured, attachment content is uploaded to the store and only metadata+// (with a storage key) is kept in the database, reducing DB pressure.+func (s *Service) SetBlobStore(bs blob.Store) {+ s.blobStore = bs+}++// uploadAttachments stores each attachment's content in blob storage and replaces+// the inline base64 content with a storage key reference. Returns the modified+// attachments with StorageKey set and Content cleared.+func (s *Service) uploadAttachments(ctx context.Context, emailUUID string, attachments []models.Attachment) ([]models.Attachment, error) {+ result := make([]models.Attachment, len(attachments))+ for i, att := range attachments {+ decoded, err := base64.StdEncoding.DecodeString(att.Content)+ if err != nil {+ return nil, fmt.Errorf("attachment %q: invalid base64: %w", att.Filename, err)+ }+ key := fmt.Sprintf("emails/%s/%d_%s", emailUUID, i, att.Filename)+ if err := s.blobStore.Put(ctx, key, bytes.NewReader(decoded), att.ContentType); err != nil {+ return nil, fmt.Errorf("failed to upload attachment %q: %w", att.Filename, err)+ }+ result[i] = models.Attachment{+ Filename: att.Filename,+ ContentType: att.ContentType,+ StorageKey: key,+ }+ }+ return result, nil+}++// DownloadAttachments fetches attachment content from blob storage and populates+// the base64 Content field for each attachment that has a StorageKey.+func (s *Service) DownloadAttachments(ctx context.Context, attachments []models.Attachment) ([]models.Attachment, error) {+ result := make([]models.Attachment, len(attachments))+ for i, att := range attachments {+ result[i] = att+ if att.StorageKey == "" {+ continue+ }+ rc, err := s.blobStore.Get(ctx, att.StorageKey)+ if err != nil {+ return nil, fmt.Errorf("failed to download attachment %q: %w", att.Filename, err)+ }+ data, err := io.ReadAll(rc)+ rc.Close()+ if err != nil {+ return nil, fmt.Errorf("failed to read attachment %q: %w", att.Filename, err)+ }+ result[i].Content = base64.StdEncoding.EncodeToString(data)+ }+ return result, nil+}++// DeleteAttachments removes attachment blobs from storage for the given keys.+func (s *Service) DeleteAttachments(ctx context.Context, attachments []models.Attachment) {+ for _, att := range attachments {+ if att.StorageKey != "" {+ _ = s.blobStore.Delete(ctx, att.StorageKey)+ }+ }+}+// OnSent sets a callback invoked after each successful email send.func (s *Service) OnSent(fn func()) { s.onSent = fn }@@ -142,7 +228,8 @@ type SendRequest struct {}type SendTemplateRequest struct {- Template string `json:"template" required:"true"`+ TemplateID *uint `json:"template_id,omitempty" doc:"Template ID (preferred, uses primary key index)"`+ Template string `json:"template" doc:"Template name (fallback when template_id is not provided)"`Language string `json:"language"`From string `json:"from"`To []string `json:"to" required:"true" minItems:"1"`@@ -156,7 +243,8 @@ type SendResponse struct {}type BatchRequest struct {- Template string `json:"template" required:"true"`+ TemplateID *uint `json:"template_id,omitempty" doc:"Template ID (preferred, uses primary key index)"`+ Template string `json:"template" doc:"Template name (fallback when template_id is not provided)"`Language string `json:"language"`From string `json:"from"`Recipients []BatchRecipient `json:"recipients" required:"true" minItems:"1"`@@ -198,7 +286,7 @@ type DryRunResponse struct {}// ValidateSend runs all validation checks without persisting or sending.-func (s *Service) ValidateSend(ctx context.Context, userID uint, userEmail string, req *SendRequest) (*DryRunResponse, error) {+func (s *Service) ValidateSend(ctx context.Context, userID uint, workspaceID *uint, userEmail string, req *SendRequest) (*DryRunResponse, error) {if s.settings != nil && s.settings.MaintenanceMode() {return nil, fmt.Errorf("maintenance: email sending is temporarily disabled")}@@ -209,7 +297,12 @@ func (s *Service) ValidateSend(ctx context.Context, userID uint, userEmail strinif len(req.Attachments) > 0 {maxSize := DefaultMaxAttachmentSize- if s.settings != nil {+ if s.planLimits != nil {+ pl := s.planLimits.EffectiveLimits(workspaceID)+ if pl.MaxAttachmentSizeMB > 0 {+ maxSize = int64(pl.MaxAttachmentSizeMB) * 1024 * 1024+ }+ } else if s.settings != nil {maxSize = int64(s.settings.MaxAttachmentSizeMB()) * 1024 * 1024}if err := ValidateAttachments(req.Attachments, maxSize, DefaultMaxTotalSize); err != nil {@@ -221,10 +314,11 @@ func (s *Service) ValidateSend(ctx context.Context, userID uint, userEmail strinreturn nil, err}+ scope := repositories.ResourceScope{UserID: userID, WorkspaceID: workspaceID}activeRecipients := req.TosuppressedCount := 0if s.suppressionRepo != nil {- filtered, err := s.suppressionRepo.FilterSuppressed(userID, req.To)+ filtered, err := s.suppressionRepo.FilterSuppressed(scope, req.To)if err != nil {return nil, fmt.Errorf("failed to check suppression list: %w", err)}@@ -246,8 +340,8 @@ func (s *Service) ValidateSend(ctx context.Context, userID uint, userEmail strin}// ValidateSendWithTemplate validates a template send request without sending.-func (s *Service) ValidateSendWithTemplate(ctx context.Context, userID uint, userEmail string, req *SendTemplateRequest) (*DryRunResponse, error) {- tmpl, err := s.templateRepo.FindByName(userID, req.Template)+func (s *Service) ValidateSendWithTemplate(ctx context.Context, userID uint, workspaceID *uint, userEmail string, req *SendTemplateRequest) (*DryRunResponse, error) {+ tmpl, err := s.findTemplate(userID, workspaceID, req.TemplateID, req.Template)if err != nil {return nil, fmt.Errorf("template not found: %s", req.Template)}@@ -262,7 +356,7 @@ func (s *Service) ValidateSendWithTemplate(ctx context.Context, userID uint, usefrom = defaultFromAddress}- resp, err := s.ValidateSend(ctx, userID, userEmail, &SendRequest{+ resp, err := s.ValidateSend(ctx, userID, workspaceID, userEmail, &SendRequest{From: from,To: req.To,Subject: rendered.Subject,@@ -278,17 +372,20 @@ func (s *Service) ValidateSendWithTemplate(ctx context.Context, userID uint, use}// ValidateSendBatch validates a batch send request without sending.-func (s *Service) ValidateSendBatch(ctx context.Context, userID uint, userEmail string, req *BatchRequest) (*DryRunResponse, error) {- if s.settings != nil {- maxBatch := s.settings.MaxBatchSize()- if maxBatch > 0 && len(req.Recipients) > maxBatch {- return nil, fmt.Errorf("batch size %d exceeds maximum allowed (%d)", len(req.Recipients), maxBatch)- }+func (s *Service) ValidateSendBatch(ctx context.Context, userID uint, workspaceID *uint, userEmail string, req *BatchRequest) (*DryRunResponse, error) {+ maxBatch := 0+ if s.planLimits != nil {+ maxBatch = s.planLimits.EffectiveLimits(workspaceID).MaxBatchSize+ } else if s.settings != nil {+ maxBatch = s.settings.MaxBatchSize()+ }+ if maxBatch > 0 && len(req.Recipients) > maxBatch {+ return nil, fmt.Errorf("batch size %d exceeds maximum allowed (%d)", len(req.Recipients), maxBatch)}- _, err := s.templateRepo.FindByName(userID, req.Template)+ _, err := s.findTemplate(userID, workspaceID, req.TemplateID, req.Template)if err != nil {- return nil, fmt.Errorf("template not found: %s", req.Template)+ return nil, fmt.Errorf("template not found: %w", err)}from := req.From@@ -301,10 +398,11 @@ func (s *Service) ValidateSendBatch(ctx context.Context, userID uint, userEmailemails[i] = r.Email}+ scope := repositories.ResourceScope{UserID: userID, WorkspaceID: workspaceID}activeRecipients := emailssuppressedCount := 0if s.suppressionRepo != nil {- filtered, err := s.suppressionRepo.FilterSuppressed(userID, emails)+ filtered, err := s.suppressionRepo.FilterSuppressed(scope, emails)if err != nil {return nil, fmt.Errorf("failed to check suppression list: %w", err)}@@ -322,20 +420,33 @@ func (s *Service) ValidateSendBatch(ctx context.Context, userID uint, userEmail}, nil}-func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail string, req *SendRequest) (*SendResponse, error) {+func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, workspaceID *uint, userEmail string, req *SendRequest) (*SendResponse, error) {// Enforce maintenance modeif s.settings != nil && s.settings.MaintenanceMode() {return nil, fmt.Errorf("maintenance: email sending is temporarily disabled")}- if err := s.limiter.Allow(ctx, userEmail); err != nil {- return nil, fmt.Errorf("rate_limit: %w", err)+ // Rate limiting: use plan limits if available, otherwise global.+ if s.planLimits != nil {+ pl := s.planLimits.EffectiveLimits(workspaceID)+ if err := s.limiter.AllowWithLimits(ctx, userEmail, pl.HourlyRateLimit, pl.DailyRateLimit); err != nil {+ return nil, fmt.Errorf("rate_limit: %w", err)+ }+ } else {+ if err := s.limiter.Allow(ctx, userEmail); err != nil {+ return nil, fmt.Errorf("rate_limit: %w", err)+ }}// Validate attachments if presentif len(req.Attachments) > 0 {maxSize := DefaultMaxAttachmentSize- if s.settings != nil {+ if s.planLimits != nil {+ pl := s.planLimits.EffectiveLimits(workspaceID)+ if pl.MaxAttachmentSizeMB > 0 {+ maxSize = int64(pl.MaxAttachmentSizeMB) * 1024 * 1024+ }+ } else if s.settings != nil {maxSize = int64(s.settings.MaxAttachmentSizeMB()) * 1024 * 1024}if err := ValidateAttachments(req.Attachments, maxSize, DefaultMaxTotalSize); err != nil {@@ -343,14 +454,18 @@ func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail str}}- // Enforce verified domain when user has strict mode enabled- if err := s.checkDomainVerification(userID, req.From); err != nil {- return nil, err+ // Enforce verified domain when user has strict mode enabled (personal mode only;+ // workspace domain verification is handled at the workspace level).+ if workspaceID == nil {+ if err := s.checkDomainVerification(userID, req.From); err != nil {+ return nil, err+ }}// Filter out suppressed recipients+ scope := repositories.ResourceScope{UserID: userID, WorkspaceID: workspaceID}if s.suppressionRepo != nil {- filtered, err := s.suppressionRepo.FilterSuppressed(userID, req.To)+ filtered, err := s.suppressionRepo.FilterSuppressed(scope, req.To)if err != nil {return nil, fmt.Errorf("failed to check suppression list: %w", err)}@@ -362,6 +477,7 @@ func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail str}em := &models.Email{UserID: userID,+ WorkspaceID: workspaceID,APIKeyID: apiKeyPtr,Sender: req.From,Recipients: req.To,@@ -384,6 +500,7 @@ func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail strfor _, addr := range suppressed {em := &models.Email{UserID: userID,+ WorkspaceID: workspaceID,APIKeyID: apiKeyPtr,Sender: req.From,Recipients: []string{addr},@@ -397,19 +514,33 @@ func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail strreq.To = filtered}- // Serialize attachments metadata for storage+ // Serialize attachments for storage. When blob storage is configured,+ // upload the binary content and store only the storage key reference.+ // Otherwise store just filename + content_type metadata.var attachmentsJSON stringif len(req.Attachments) > 0 {- type attachMeta struct {- Filename string `json:"filename"`- ContentType string `json:"content_type"`- }- meta := make([]attachMeta, len(req.Attachments))- for i, a := range req.Attachments {- meta[i] = attachMeta{Filename: a.Filename, ContentType: a.ContentType}+ if s.blobStore != nil {+ // Generate a temporary UUID for the blob key prefix.+ // The real email UUID is assigned by the DB, so we use a timestamp-based key.+ tempKey := fmt.Sprintf("%d", time.Now().UnixNano())+ uploaded, err := s.uploadAttachments(ctx, tempKey, req.Attachments)+ if err != nil {+ return nil, fmt.Errorf("attachment upload: %w", err)+ }+ b, _ := json.Marshal(uploaded)+ attachmentsJSON = string(b)+ } else {+ type attachMeta struct {+ Filename string `json:"filename"`+ ContentType string `json:"content_type"`+ }+ meta := make([]attachMeta, len(req.Attachments))+ for i, a := range req.Attachments {+ meta[i] = attachMeta{Filename: a.Filename, ContentType: a.ContentType}+ }+ b, _ := json.Marshal(meta)+ attachmentsJSON = string(b)}- b, _ := json.Marshal(meta)- attachmentsJSON = string(b)}// Auto-generate plain text from HTML when text body is not provided@@ -434,6 +565,7 @@ func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail strem := &models.Email{UserID: userID,+ WorkspaceID: workspaceID,APIKeyID: apiKeyPtr,Sender: req.From,Recipients: req.To,@@ -498,12 +630,18 @@ func (s *Service) Send(ctx context.Context, userID, apiKeyID uint, userEmail str}// Synchronous fallback: send email directly (no worker configured)- return s.sendSync(em, userID, req)+ return s.sendSync(em, userID, workspaceID, req)}// sendSync performs synchronous SMTP delivery (used when no enqueuer is configured).-func (s *Service) sendSync(em *models.Email, userID uint, req *SendRequest) (*SendResponse, error) {- smtpServer, err := s.smtpRepo.FindFirstByUserID(userID)+func (s *Service) sendSync(em *models.Email, userID uint, workspaceID *uint, req *SendRequest) (*SendResponse, error) {+ var smtpServer *models.SMTPServer+ var err error+ if workspaceID != nil {+ smtpServer, err = s.smtpRepo.FindFirstByWorkspaceID(*workspaceID)+ } else {+ smtpServer, err = s.smtpRepo.FindFirstByUserID(userID)+ }if err != nil {em.Status = models.EmailStatusFailedem.ErrorMessage = "no SMTP server configured"@@ -568,10 +706,10 @@ func (s *Service) sendSync(em *models.Email, userID uint, req *SendRequest) (*Sereturn &SendResponse{ID: em.UUID, Status: em.Status}, nil}-func (s *Service) SendWithTemplate(ctx context.Context, userID, apiKeyID uint, userEmail string, req *SendTemplateRequest) (*SendResponse, error) {- tmpl, err := s.templateRepo.FindByName(userID, req.Template)+func (s *Service) SendWithTemplate(ctx context.Context, userID, apiKeyID uint, workspaceID *uint, userEmail string, req *SendTemplateRequest) (*SendResponse, error) {+ tmpl, err := s.findTemplate(userID, workspaceID, req.TemplateID, req.Template)if err != nil {- return nil, fmt.Errorf("template not found: %s", req.Template)+ return nil, fmt.Errorf("template not found: %w", err)}rendered, err := s.resolveAndRender(tmpl, req.Language, req.TemplateData)@@ -584,7 +722,7 @@ func (s *Service) SendWithTemplate(ctx context.Context, userID, apiKeyID uint, ufrom = defaultFromAddress}- return s.Send(ctx, userID, apiKeyID, userEmail, &SendRequest{+ return s.Send(ctx, userID, apiKeyID, workspaceID, userEmail, &SendRequest{From: from,To: req.To,Subject: rendered.Subject,@@ -594,18 +732,21 @@ func (s *Service) SendWithTemplate(ctx context.Context, userID, apiKeyID uint, u})}-func (s *Service) SendBatch(ctx context.Context, userID, apiKeyID uint, userEmail string, req *BatchRequest) (*BatchResponse, error) {- // Enforce max batch size from platform settings- if s.settings != nil {- maxBatch := s.settings.MaxBatchSize()- if maxBatch > 0 && len(req.Recipients) > maxBatch {- return nil, fmt.Errorf("batch size %d exceeds maximum allowed (%d)", len(req.Recipients), maxBatch)- }+func (s *Service) SendBatch(ctx context.Context, userID, apiKeyID uint, workspaceID *uint, userEmail string, req *BatchRequest) (*BatchResponse, error) {+ // Enforce max batch size from plan or platform settings+ maxBatch := 0+ if s.planLimits != nil {+ maxBatch = s.planLimits.EffectiveLimits(workspaceID).MaxBatchSize+ } else if s.settings != nil {+ maxBatch = s.settings.MaxBatchSize()+ }+ if maxBatch > 0 && len(req.Recipients) > maxBatch {+ return nil, fmt.Errorf("batch size %d exceeds maximum allowed (%d)", len(req.Recipients), maxBatch)}- tmpl, err := s.templateRepo.FindByName(userID, req.Template)+ tmpl, err := s.findTemplate(userID, workspaceID, req.TemplateID, req.Template)if err != nil {- return nil, fmt.Errorf("template not found: %s", req.Template)+ return nil, fmt.Errorf("template not found: %w", err)}from := req.From@@ -621,7 +762,7 @@ func (s *Service) SendBatch(ctx context.Context, userID, apiKeyID uint, userEmaifor _, recipient := range req.Recipients {// Check suppressionif s.suppressionRepo != nil {- suppressed, err := s.suppressionRepo.IsSuppressed(userID, recipient.Email)+ suppressed, err := s.suppressionRepo.IsSuppressed(repositories.ResourceScope{UserID: userID, WorkspaceID: workspaceID}, recipient.Email)if err == nil && suppressed {// Log the suppressed emailvar apiKeyPtr *uint@@ -630,6 +771,7 @@ func (s *Service) SendBatch(ctx context.Context, userID, apiKeyID uint, userEmai}em := &models.Email{UserID: userID,+ WorkspaceID: workspaceID,APIKeyID: apiKeyPtr,Sender: from,Recipients: []string{recipient.Email},@@ -667,7 +809,7 @@ func (s *Service) SendBatch(ctx context.Context, userID, apiKeyID uint, userEmaicontinue}- sendResp, err := s.Send(ctx, userID, apiKeyID, userEmail, &SendRequest{+ sendResp, err := s.Send(ctx, userID, apiKeyID, workspaceID, userEmail, &SendRequest{From: from,To: []string{recipient.Email},Subject: rendered.Subject,@@ -697,9 +839,9 @@ func (s *Service) SendBatch(ctx context.Context, userID, apiKeyID uint, userEmai// SendTestByTemplateID sends a test email using a template looked up by ID.// It uses apiKeyID=0 since test sends come from the dashboard, not an API key.-func (s *Service) SendTestByTemplateID(ctx context.Context, userID uint, userEmail string, templateID uint, req *SendTestRequest) (*SendResponse, error) {+func (s *Service) SendTestByTemplateID(ctx context.Context, userID uint, workspaceID *uint, userEmail string, templateID uint, req *SendTestRequest) (*SendResponse, error) {tmpl, err := s.templateRepo.FindByID(templateID)- if err != nil || tmpl.UserID != userID {+ if err != nil {return nil, fmt.Errorf("template not found")}@@ -713,7 +855,7 @@ func (s *Service) SendTestByTemplateID(ctx context.Context, userID uint, userEmafrom = defaultFromAddress}- return s.Send(ctx, userID, 0, userEmail, &SendRequest{+ return s.Send(ctx, userID, 0, workspaceID, userEmail, &SendRequest{From: from,To: req.To,Subject: rendered.Subject,@@ -729,9 +871,14 @@ type SendTestRequest struct {TemplateData map[string]any `json:"template_data"`}+// defaultRetryLimit is the fallback maximum number of manual retries when+// no SMTP server is configured or the server's MaxRetries is zero.+const defaultRetryLimit = 5+// RetryEmail re-enqueues a failed email for another delivery attempt.-// Only emails with status "failed" can be retried.-func (s *Service) RetryEmail(emailUUID string, userID uint) (*SendResponse, error) {+// Only emails with status "failed" can be retried, and the retry count+// must not exceed the SMTP server's MaxRetries (or the default limit).+func (s *Service) RetryEmail(emailUUID string, userID uint, workspaceID *uint) (*SendResponse, error) {em, err := s.emailRepo.FindByUUID(emailUUID)if err != nil {return nil, fmt.Errorf("email not found")@@ -739,10 +886,36 @@ func (s *Service) RetryEmail(emailUUID string, userID uint) (*SendResponse, erroif em.UserID != userID {return nil, fmt.Errorf("email not found")}+ // When called from a workspace-scoped context, verify the email belongs+ // to that workspace.+ if workspaceID != nil {+ if em.WorkspaceID == nil || *em.WorkspaceID != *workspaceID {+ return nil, fmt.Errorf("email not found")+ }+ }if em.Status != models.EmailStatusFailed {return nil, fmt.Errorf("only failed emails can be retried")}+ // Enforce retry limit from the SMTP server configuration.+ maxRetries := defaultRetryLimit+ if s.smtpRepo != nil {+ var smtpServer *models.SMTPServer+ if em.WorkspaceID != nil {+ smtpServer, _ = s.smtpRepo.FindFirstByWorkspaceID(*em.WorkspaceID)+ } else {+ smtpServer, _ = s.smtpRepo.FindFirstByUserID(em.UserID)+ }+ if smtpServer != nil && smtpServer.MaxRetries > 0 {+ maxRetries = smtpServer.MaxRetries+ }+ }+ if em.RetryCount >= maxRetries {+ return nil, fmt.Errorf("retry limit reached (%d/%d)", em.RetryCount, maxRetries)+ }++ em.RetryCount+++if s.enqueuer != nil {em.Status = models.EmailStatusQueuedem.ErrorMessage = ""@@ -757,7 +930,7 @@ func (s *Service) RetryEmail(emailUUID string, userID uint) (*SendResponse, erro}// Synchronous fallback- return s.sendSync(em, userID, &SendRequest{+ return s.sendSync(em, userID, em.WorkspaceID, &SendRequest{From: em.Sender,To: em.Recipients,Subject: em.Subject,@@ -768,16 +941,50 @@ func (s *Service) RetryEmail(emailUUID string, userID uint) (*SendResponse, erro})}-// RenderTemplate resolves a template by name and renders it with the given data,+// RenderTemplate resolves a template by ID or name and renders it with the given data,// returning the rendered subject, HTML, and text without sending.-func (s *Service) RenderTemplate(userID uint, templateName, language string, data map[string]any) (*RenderedTemplate, error) {- tmpl, err := s.templateRepo.FindByName(userID, templateName)+func (s *Service) RenderTemplate(userID uint, workspaceID *uint, templateID *uint, templateName, language string, data map[string]any) (*RenderedTemplate, error) {+ tmpl, err := s.findTemplate(userID, workspaceID, templateID, templateName)if err != nil {- return nil, fmt.Errorf("template not found: %s", templateName)+ return nil, fmt.Errorf("template not found: %w", err)}return s.resolveAndRender(tmpl, language, data)}+// findTemplate looks up a template by ID or name. When templateID is provided+// it performs a fast primary-key lookup and verifies the caller owns the+// resource. Otherwise it falls back to a name-based search (workspace first,+// then personal).+func (s *Service) findTemplate(userID uint, workspaceID *uint, templateID *uint, name string) (*models.Template, error) {+ if templateID != nil && *templateID != 0 {+ tmpl, err := s.templateRepo.FindByID(*templateID)+ if err != nil {+ return nil, err+ }+ // Verify ownership: must belong to the same user/workspace.+ if workspaceID != nil {+ if tmpl.WorkspaceID == nil || *tmpl.WorkspaceID != *workspaceID {+ return nil, fmt.Errorf("template not found")+ }+ } else if tmpl.UserID != userID || tmpl.WorkspaceID != nil {+ return nil, fmt.Errorf("template not found")+ }+ return tmpl, nil+ }++ if name == "" {+ return nil, fmt.Errorf("template_id or template name is required")+ }++ if workspaceID != nil {+ tmpl, err := s.templateRepo.FindByWorkspaceName(*workspaceID, name)+ if err == nil {+ return tmpl, nil+ }+ }+ return s.templateRepo.FindByName(userID, name)+}+// resolveAndRender resolves the template content using versioned localizations// and renders it with the given data.func (s *Service) resolveAndRender(tmpl *models.Template, language string, data map[string]any) (*RenderedTemplate, error) {diff --git a/internal/services/email/smtp_sender.go b/internal/services/email/smtp_sender.goindex 8c11a17..a7b235f 100644--- a/internal/services/email/smtp_sender.go+++ b/internal/services/email/smtp_sender.go@@ -25,7 +25,7 @@ import ("net/smtp""strings"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models")type SMTPSender struct{}diff --git a/internal/services/eventbus/eventbus.go b/internal/services/eventbus/eventbus.goindex b0fee5b..c566c54 100644--- a/internal/services/eventbus/eventbus.go+++ b/internal/services/eventbus/eventbus.go@@ -22,8 +22,8 @@ import ("sync""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")// EventBus provides an in-memory pub/sub for events with database persistence.diff --git a/internal/services/plan/service.go b/internal/services/plan/service.gonew file mode 100644index 0000000..d144329--- /dev/null+++ b/internal/services/plan/service.go@@ -0,0 +1,210 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package plan++import (+ "errors"+ "fmt"++ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/settings"+ "github.com/goposta/posta/internal/storage/repositories"+ "gorm.io/gorm"+)++// Resource type constants for quota enforcement.+const (+ ResourceAPIKey = "api_keys"+ ResourceDomain = "domains"+ ResourceSMTPServer = "smtp_servers"+ ResourceWorkspace = "workspaces"+)++// Limits holds the effective limits for a given scope.+// A value of 0 means unlimited.+type Limits struct {+ HourlyRateLimit int+ DailyRateLimit int+ MaxAttachmentSizeMB int+ MaxBatchSize int+ MaxAPIKeys int+ MaxDomains int+ MaxSMTPServers int+ MaxWorkspaces int+ EmailLogRetentionDays int+}++// Service resolves effective plan limits and enforces resource quotas.+type Service struct {+ planRepo *repositories.PlanRepository+ settings *settings.Provider+}++// NewService creates a new plan service.+func NewService(planRepo *repositories.PlanRepository, settings *settings.Provider) *Service {+ return &Service{+ planRepo: planRepo,+ settings: settings,+ }+}++// EffectiveLimits resolves the limits for a given workspace.+// Priority: workspace plan -> default plan -> global settings.+func (s *Service) EffectiveLimits(workspaceID *uint) *Limits {+ if workspaceID != nil {+ plan, err := s.planRepo.FindByWorkspaceID(*workspaceID)+ if err == nil && plan.IsActive {+ return limitsFromPlan(plan)+ }+ }++ // Try the default plan.+ plan, err := s.planRepo.FindDefault()+ if err == nil {+ return limitsFromPlan(plan)+ }++ // Fallback to global settings.+ return s.limitsFromSettings()+}++// EffectivePlan returns the plan assigned to the workspace, the default plan,+// or nil if no plan applies.+func (s *Service) EffectivePlan(workspaceID *uint) *models.Plan {+ if workspaceID != nil {+ plan, err := s.planRepo.FindByWorkspaceID(*workspaceID)+ if err == nil && plan.IsActive {+ return plan+ }+ }+ plan, err := s.planRepo.FindDefault()+ if err == nil {+ return plan+ }+ return nil+}++// CheckQuota verifies that creating one more resource of the given type+// would not exceed the plan limit. Returns nil if within limit.+func (s *Service) CheckQuota(db *gorm.DB, workspaceID *uint, resource string) error {+ limits := s.EffectiveLimits(workspaceID)++ var limit int+ var table string++ switch resource {+ case ResourceAPIKey:+ limit = limits.MaxAPIKeys+ table = "api_keys"+ case ResourceDomain:+ limit = limits.MaxDomains+ table = "domains"+ case ResourceSMTPServer:+ limit = limits.MaxSMTPServers+ table = "smtp_servers"+ default:+ return nil+ }++ if limit == 0 {+ return nil // unlimited+ }++ var count int64+ query := db.Table(table)+ if workspaceID != nil {+ query = query.Where("workspace_id = ?", *workspaceID)+ } else {+ query = query.Where("workspace_id IS NULL")+ }+ if err := query.Count(&count).Error; err != nil {+ return fmt.Errorf("failed to count %s: %w", resource, err)+ }++ if count >= int64(limit) {+ return fmt.Errorf("plan limit reached: maximum %d %s allowed", limit, resource)+ }+ return nil+}++// CheckWorkspaceQuota verifies that the user has not exceeded their max_workspaces limit.+// This counts all workspaces owned by the user.+func (s *Service) CheckWorkspaceQuota(db *gorm.DB, userID uint) error {+ // For workspace quota, we use the default plan since the user may not+ // have a workspace yet. If they have one, use that workspace's plan.+ var limits *Limits++ // Check if user owns any workspace with a plan.+ var ws models.Workspace+ err := db.Where("owner_id = ? AND plan_id IS NOT NULL", userID).First(&ws).Error+ if err == nil {+ limits = s.EffectiveLimits(ws.PlanID)+ } else {+ limits = s.EffectiveLimits(nil)+ }++ if limits.MaxWorkspaces == 0 {+ return nil // unlimited+ }++ var count int64+ if err := db.Model(&models.Workspace{}).Where("owner_id = ?", userID).Count(&count).Error; err != nil {+ return fmt.Errorf("failed to count workspaces: %w", err)+ }++ if count >= int64(limits.MaxWorkspaces) {+ return fmt.Errorf("plan limit reached: maximum %d workspaces allowed", limits.MaxWorkspaces)+ }+ return nil+}++// IsWithinLimit returns true if current < limit, or limit is 0 (unlimited).+func IsWithinLimit(current int64, limit int) bool {+ return limit == 0 || current < int64(limit)+}++func limitsFromPlan(plan *models.Plan) *Limits {+ return &Limits{+ HourlyRateLimit: plan.HourlyRateLimit,+ DailyRateLimit: plan.DailyRateLimit,+ MaxAttachmentSizeMB: plan.MaxAttachmentSizeMB,+ MaxBatchSize: plan.MaxBatchSize,+ MaxAPIKeys: plan.MaxAPIKeys,+ MaxDomains: plan.MaxDomains,+ MaxSMTPServers: plan.MaxSMTPServers,+ MaxWorkspaces: plan.MaxWorkspaces,+ EmailLogRetentionDays: plan.EmailLogRetentionDays,+ }+}++func (s *Service) limitsFromSettings() *Limits {+ return &Limits{+ HourlyRateLimit: s.settings.DefaultRateLimitHourly(),+ DailyRateLimit: s.settings.DefaultRateLimitDaily(),+ MaxAttachmentSizeMB: s.settings.MaxAttachmentSizeMB(),+ MaxBatchSize: s.settings.MaxBatchSize(),+ MaxAPIKeys: 0, // no global equivalent, unlimited+ MaxDomains: 0,+ MaxSMTPServers: 0,+ MaxWorkspaces: 0,+ EmailLogRetentionDays: s.settings.RetentionDays(),+ }+}++// ErrPlanLimitReached is returned when a resource quota is exceeded.+var ErrPlanLimitReached = errors.New("plan limit reached")diff --git a/internal/services/ratelimit/redis_limiter.go b/internal/services/ratelimit/redis_limiter.goindex c3eccb2..312177e 100644--- a/internal/services/ratelimit/redis_limiter.go+++ b/internal/services/ratelimit/redis_limiter.go@@ -119,6 +119,43 @@ func (l *RedisLimiter) Check(ctx context.Context, userEmail string) error {return nil}+// AllowWithLimits checks if the user is within the given rate limits.+// A limit of 0 means unlimited (the check is skipped for that window).+// This method is used for plan-aware rate limiting where limits are resolved+// by the caller.+func (l *RedisLimiter) AllowWithLimits(ctx context.Context, userEmail string, hourlyLimit, dailyLimit int) error {+ hourKey := fmt.Sprintf("ratelimit:hour:%s:%s", userEmail, time.Now().Format("2006010215"))+ dayKey := fmt.Sprintf("ratelimit:day:%s:%s", userEmail, time.Now().Format("20060102"))++ if hourlyLimit > 0 {+ hourCount, err := l.client.Incr(ctx, hourKey).Result()+ if err != nil {+ return fmt.Errorf("rate limit check failed: %w", err)+ }+ if hourCount == 1 {+ l.client.Expire(ctx, hourKey, time.Hour)+ }+ if hourCount > int64(hourlyLimit) {+ return fmt.Errorf("hourly rate limit exceeded (%d/%d)", hourCount, hourlyLimit)+ }+ }++ if dailyLimit > 0 {+ dayCount, err := l.client.Incr(ctx, dayKey).Result()+ if err != nil {+ return fmt.Errorf("rate limit check failed: %w", err)+ }+ if dayCount == 1 {+ l.client.Expire(ctx, dayKey, 24*time.Hour)+ }+ if dayCount > int64(dailyLimit) {+ return fmt.Errorf("daily rate limit exceeded (%d/%d)", dayCount, dailyLimit)+ }+ }++ return nil+}+// AllowLogin checks if a login attempt from the given IP is within rate limits.// The max attempts and window duration are configurable via admin settings.func (l *RedisLimiter) AllowLogin(ctx context.Context, ip string) error {diff --git a/internal/services/retry/worker.go b/internal/services/retry/worker.goindex 27bfe17..88f05be 100644--- a/internal/services/retry/worker.go+++ b/internal/services/retry/worker.go@@ -23,10 +23,10 @@ import ("time""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/services/webhook"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/services/webhook"+ "github.com/goposta/posta/internal/storage/repositories")// Worker periodically retries failed emails that haven't exceeded their@@ -114,7 +114,12 @@ func (w *Worker) processRetries() {}for _, server := range smtpServers {- emails, err := w.emailRepo.FindFailedForRetry(server.UserID, server.MaxRetries)+ var emails []models.Email+ if server.WorkspaceID != nil {+ emails, err = w.emailRepo.FindFailedForRetryByWorkspace(*server.WorkspaceID, server.MaxRetries)+ } else {+ emails, err = w.emailRepo.FindFailedForRetry(server.UserID, server.MaxRetries)+ }if err != nil {logger.Error("retry worker: failed to load failed emails", "user_id", server.UserID, "error", err)continuediff --git a/internal/services/seeder/seeder.go b/internal/services/seeder/seeder.goindex 7728cbd..c44c8d3 100644--- a/internal/services/seeder/seeder.go+++ b/internal/services/seeder/seeder.go@@ -25,8 +25,8 @@ import (goutils "github.com/jkaninda/go-utils""github.com/jkaninda/logger""github.com/jkaninda/okapi"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")type Seeder struct {@@ -95,7 +95,7 @@ func (s *Seeder) SeedUserDefaults(userID uint, userName string) {},{"title": "GitHub Repository",- "url": "https://github.com/jkaninda/posta",+ "url": "https://github.com/goposta/posta",},},}diff --git a/internal/services/seeder/settings.go b/internal/services/seeder/settings.goindex 8bfa9c1..abbe3c2 100644--- a/internal/services/seeder/settings.go+++ b/internal/services/seeder/settings.go@@ -19,8 +19,8 @@ package seederimport ("github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")// SeedDefaultSettings creates default platform settings if they don't already exist.diff --git a/internal/services/settings/provider.go b/internal/services/settings/provider.goindex da8a56a..1f5cb30 100644--- a/internal/services/settings/provider.go+++ b/internal/services/settings/provider.go@@ -23,7 +23,7 @@ import ("time""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/storage/repositories")// Provider gives live access to platform settings with a short cache.@@ -131,6 +131,7 @@ func (p *Provider) AuditLogRetentionDays() int { return p.GetInt("audit_log_retfunc (p *Provider) WebhookDeliveryRetentionDays() int {return p.GetInt("webhook_delivery_retention_days", 30)}+func (p *Provider) TrackingEventRetentionDays() int { return p.GetInt("tracking_event_retention_days", 90) }func (p *Provider) LoginRateLimitCount() int {return p.GetInt("login_rate_limit_count", 10)}diff --git a/internal/services/tracking/tracking.go b/internal/services/tracking/tracking.gonew file mode 100644index 0000000..a44385e--- /dev/null+++ b/internal/services/tracking/tracking.go@@ -0,0 +1,133 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package tracking++import (+ "crypto/hmac"+ "crypto/sha256"+ "encoding/base64"+ "encoding/hex"+ "errors"+ "fmt"+ "regexp"+ "strconv"+ "strings"++ "github.com/goposta/posta/internal/storage/repositories"+)++// Service handles link rewriting and pixel injection for campaign emails.+type Service struct {+ repo *repositories.TrackingRepository+ baseURL string // e.g. "https://posta.example.com"+ hmacKey []byte+}++func NewService(repo *repositories.TrackingRepository, baseURL string, hmacKey []byte) *Service {+ return &Service{repo: repo, baseURL: strings.TrimRight(baseURL, "/"), hmacKey: hmacKey}+}++var linkRegex = regexp.MustCompile(`href\s*=\s*["'](https?://[^"']+)["']`)++// ProcessHTML rewrites links for click tracking and injects the open tracking pixel.+func (s *Service) ProcessHTML(html string, campaignID uint, messageID uint) string {+ if html == "" {+ return html+ }++ // Rewrite links for click tracking+ html = linkRegex.ReplaceAllStringFunc(html, func(match string) string {+ // Extract URL from href="..."+ sub := linkRegex.FindStringSubmatch(match)+ if len(sub) < 2 {+ return match+ }+ originalURL := sub[1]++ // Skip unsubscribe links and tracking URLs+ if strings.Contains(originalURL, "/t/") {+ return match+ }++ hash := hashLink(campaignID, originalURL)+ _, err := s.repo.FindOrCreateLink(campaignID, originalURL, hash)+ if err != nil {+ return match+ }++ trackedURL := fmt.Sprintf("%s/t/c/%d/%s", s.baseURL, messageID, hash)+ return strings.Replace(match, originalURL, trackedURL, 1)+ })++ // Inject open tracking pixel before </body>+ pixel := fmt.Sprintf(`<img src="%s/t/o/%d.png" width="1" height="1" alt="" style="display:none" />`, s.baseURL, messageID)+ if strings.Contains(html, "</body>") {+ html = strings.Replace(html, "</body>", pixel+"</body>", 1)+ } else {+ html += pixel+ }++ return html+}++// SignUnsubscribeToken creates an HMAC-signed token encoding the message ID.+func (s *Service) SignUnsubscribeToken(messageID uint) string {+ payload := strconv.FormatUint(uint64(messageID), 10)+ mac := hmac.New(sha256.New, s.hmacKey)+ mac.Write([]byte(payload))+ sig := base64.RawURLEncoding.EncodeToString(mac.Sum(nil))+ return base64.RawURLEncoding.EncodeToString([]byte(payload)) + "." + sig+}++// VerifyUnsubscribeToken verifies the HMAC token and returns the message ID.+func (s *Service) VerifyUnsubscribeToken(token string) (uint, error) {+ parts := strings.SplitN(token, ".", 2)+ if len(parts) != 2 {+ return 0, errors.New("invalid token format")+ }+ payloadBytes, err := base64.RawURLEncoding.DecodeString(parts[0])+ if err != nil {+ return 0, errors.New("invalid token encoding")+ }+ payload := string(payloadBytes)++ mac := hmac.New(sha256.New, s.hmacKey)+ mac.Write(payloadBytes)+ expectedSig := base64.RawURLEncoding.EncodeToString(mac.Sum(nil))+ if !hmac.Equal([]byte(parts[1]), []byte(expectedSig)) {+ return 0, errors.New("invalid token signature")+ }++ id, err := strconv.ParseUint(payload, 10, 64)+ if err != nil {+ return 0, errors.New("invalid message ID in token")+ }+ return uint(id), nil+}++// UnsubscribeURL generates the unsubscribe URL for a campaign message.+func (s *Service) UnsubscribeURL(messageID uint) string {+ return fmt.Sprintf("%s/t/u/%s", s.baseURL, s.SignUnsubscribeToken(messageID))+}++// hashLink generates a deterministic hash for a campaign + URL combination.+func hashLink(campaignID uint, url string) string {+ h := sha256.New()+ h.Write([]byte(fmt.Sprintf("%d:%s", campaignID, url)))+ return hex.EncodeToString(h.Sum(nil))[:16]+}diff --git a/internal/services/webhook/dispatcher.go b/internal/services/webhook/dispatcher.goindex 980d4d1..ef3b339 100644--- a/internal/services/webhook/dispatcher.go+++ b/internal/services/webhook/dispatcher.go@@ -19,20 +19,24 @@ package webhookimport ("bytes"+ "context""crypto/hmac""crypto/sha256""encoding/hex""encoding/json""fmt"+ "net""net/http""net/mail"+ "net/url""strings""time""github.com/jkaninda/logger"+ "golang.org/x/net/proxy"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/storage/repositories")const (@@ -45,6 +49,10 @@ const (type Config struct {MaxRetries intTimeout time.Duration+ // ProxyURL routes all outbound webhook requests through a proxy,+ // hiding the server's IP address from webhook endpoints.+ // Supports http://, https://, and socks5:// schemes.+ ProxyURL string}type Dispatcher struct {@@ -75,6 +83,56 @@ func (d *Dispatcher) SetConfig(cfg Config) {if cfg.Timeout > 0 {d.client.Timeout = cfg.Timeout}+ if cfg.ProxyURL != "" {+ transport, err := proxyTransport(cfg.ProxyURL)+ if err != nil {+ logger.Error("invalid webhook proxy URL, requests will be sent directly", "error", err)+ return+ }+ d.client.Transport = transport+ logger.Info("webhook proxy configured", "proxy", cfg.ProxyURL)+ }+}++// proxyTransport builds an *http.Transport that routes requests through the+// given proxy URL. Supported schemes: http, https, socks5.+func proxyTransport(rawURL string) (*http.Transport, error) {+ parsed, err := url.Parse(rawURL)+ if err != nil {+ return nil, fmt.Errorf("failed to parse proxy URL: %w", err)+ }++ switch parsed.Scheme {+ case "http", "https":+ return &http.Transport{+ Proxy: http.ProxyURL(parsed),+ }, nil++ case "socks5":+ auth := &proxy.Auth{}+ if parsed.User != nil {+ auth.User = parsed.User.Username()+ auth.Password, _ = parsed.User.Password()+ } else {+ auth = nil+ }+ dialer, err := proxy.SOCKS5("tcp", parsed.Host, auth, proxy.Direct)+ if err != nil {+ return nil, fmt.Errorf("failed to create SOCKS5 dialer: %w", err)+ }+ contextDialer, ok := dialer.(proxy.ContextDialer)+ if !ok {+ return nil, fmt.Errorf("SOCKS5 dialer does not support DialContext")+ }+ return &http.Transport{+ DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {+ return contextDialer.DialContext(ctx, network, addr)+ },+ }, nil++ default:+ return nil, fmt.Errorf("unsupported proxy scheme %q (use http, https, or socks5)", parsed.Scheme)+ }}// SetDeliveryRepo sets the repository used to record delivery attempts.@@ -174,7 +232,7 @@ func (d *Dispatcher) deliverWithRetry(userID uint, wh models.Webhook, body []bytlastStatus = statusCodeif err == nil && statusCode < 400 {- d.recordDelivery(userID, wh.ID, event, models.WebhookDeliverySuccess, statusCode, "", attempt)+ d.recordDelivery(userID, wh.ID, wh.WorkspaceID, event, models.WebhookDeliverySuccess, statusCode, "", attempt)if d.onDeliverySuccess != nil {d.onDeliverySuccess()}@@ -199,7 +257,7 @@ func (d *Dispatcher) deliverWithRetry(userID uint, wh models.Webhook, body []byt}// All retries exhausted- d.recordDelivery(userID, wh.ID, event, models.WebhookDeliveryFailed, lastStatus, lastErr, d.maxRetries)+ d.recordDelivery(userID, wh.ID, wh.WorkspaceID, event, models.WebhookDeliveryFailed, lastStatus, lastErr, d.maxRetries)if d.onDeliveryFailed != nil {d.onDeliveryFailed()}@@ -236,13 +294,14 @@ func (d *Dispatcher) doRequest(url string, secret string, body []byte) (int, err}// recordDelivery persists a webhook delivery record if the delivery repo is configured.-func (d *Dispatcher) recordDelivery(userID, webhookID uint, event string, status models.WebhookDeliveryStatus, httpStatus int, errMsg string, attempt int) {+func (d *Dispatcher) recordDelivery(userID, webhookID uint, workspaceID *uint, event string, status models.WebhookDeliveryStatus, httpStatus int, errMsg string, attempt int) {if d.deliveryRepo == nil {return}delivery := &models.WebhookDelivery{WebhookID: webhookID,UserID: userID,+ WorkspaceID: workspaceID,Event: event,Status: status,HTTPStatusCode: httpStatus,diff --git a/internal/services/webhook/dispatcher_test.go b/internal/services/webhook/dispatcher_test.goindex 2d92a17..e553db9 100644--- a/internal/services/webhook/dispatcher_test.go+++ b/internal/services/webhook/dispatcher_test.go@@ -28,10 +28,9 @@ import ("testing""time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models")-// --- signPayload tests ---func TestSignPayload(t *testing.T) {secret := "test-secret"@@ -67,7 +66,6 @@ func TestSignPayloadDifferentBodies(t *testing.T) {}}-// --- matchesFilters tests ---func TestMatchesFilters_EmptyFilters(t *testing.T) {if !matchesFilters(nil, "[email protected]") {@@ -127,7 +125,6 @@ func TestMatchesFilters_MultipleFilters(t *testing.T) {}}-// --- Dispatcher delivery tests ---func TestDispatcher_SignatureHeader(t *testing.T) {var receivedSig stringdiff --git a/internal/services/workermon/monitor.go b/internal/services/workermon/monitor.goindex 05327d4..1de3d09 100644--- a/internal/services/workermon/monitor.go+++ b/internal/services/workermon/monitor.go@@ -25,8 +25,8 @@ import ("github.com/hibiken/asynq""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/eventbus"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/eventbus")// Monitor periodically checks asynq worker connections and publishesdiff --git a/internal/storage/blob/blob.go b/internal/storage/blob/blob.gonew file mode 100644index 0000000..32e68e2--- /dev/null+++ b/internal/storage/blob/blob.go@@ -0,0 +1,65 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package blob++import (+ "context"+ "fmt"+ "io"+)++// Store abstracts object/blob storage for email attachments.+// Implementations may target S3-compatible services, local filesystem, etc.+type Store interface {+ // Put writes data to the given key and returns the key on success.+ Put(ctx context.Context, key string, r io.Reader, contentType string) error+ // Get returns a reader for the given key.+ Get(ctx context.Context, key string) (io.ReadCloser, error)+ // Delete removes the object at the given key.+ Delete(ctx context.Context, key string) error+}++// Config holds the configuration for the blob store.+type Config struct {+ // Provider is the storage backend: "s3" or "fs" (filesystem).+ Provider string+ // S3 settings+ S3Endpoint string+ S3Region string+ S3Bucket string+ S3AccessKeyID string+ S3SecretAccessKey string+ S3UseSSL bool+ S3ForcePathStyle bool+ // Filesystem settings+ FSBasePath string+}++// New creates a new Store based on the configuration.+func New(cfg Config) (Store, error) {+ switch cfg.Provider {+ case "s3":+ return newS3Store(cfg)+ case "fs", "filesystem":+ return newFSStore(cfg)+ case "":+ return nil, nil+ default:+ return nil, fmt.Errorf("unsupported blob storage provider: %q", cfg.Provider)+ }+}diff --git a/internal/storage/blob/fs.go b/internal/storage/blob/fs.gonew file mode 100644index 0000000..640d2e4--- /dev/null+++ b/internal/storage/blob/fs.go@@ -0,0 +1,74 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package blob++import (+ "context"+ "fmt"+ "io"+ "os"+ "path/filepath"+)++type fsStore struct {+ basePath string+}++func newFSStore(cfg Config) (*fsStore, error) {+ base := cfg.FSBasePath+ if base == "" {+ base = "data/attachments"+ }+ if err := os.MkdirAll(base, 0o755); err != nil {+ return nil, fmt.Errorf("failed to create blob directory %q: %w", base, err)+ }+ return &fsStore{basePath: base}, nil+}++func (f *fsStore) Put(_ context.Context, key string, r io.Reader, _ string) error {+ path := filepath.Join(f.basePath, key)+ if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {+ return fmt.Errorf("fs mkdir %q: %w", filepath.Dir(path), err)+ }+ file, err := os.Create(path)+ if err != nil {+ return fmt.Errorf("fs create %q: %w", path, err)+ }+ defer file.Close()+ if _, err := io.Copy(file, r); err != nil {+ return fmt.Errorf("fs write %q: %w", path, err)+ }+ return nil+}++func (f *fsStore) Get(_ context.Context, key string) (io.ReadCloser, error) {+ path := filepath.Join(f.basePath, key)+ file, err := os.Open(path)+ if err != nil {+ return nil, fmt.Errorf("fs open %q: %w", path, err)+ }+ return file, nil+}++func (f *fsStore) Delete(_ context.Context, key string) error {+ path := filepath.Join(f.basePath, key)+ if err := os.Remove(path); err != nil && !os.IsNotExist(err) {+ return fmt.Errorf("fs delete %q: %w", path, err)+ }+ return nil+}diff --git a/internal/storage/blob/s3.go b/internal/storage/blob/s3.gonew file mode 100644index 0000000..56083d4--- /dev/null+++ b/internal/storage/blob/s3.go@@ -0,0 +1,101 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package blob++import (+ "context"+ "fmt"+ "io"++ "github.com/aws/aws-sdk-go-v2/aws"+ "github.com/aws/aws-sdk-go-v2/credentials"+ "github.com/aws/aws-sdk-go-v2/service/s3"+)++type s3Store struct {+ client *s3.Client+ bucket string+}++func newS3Store(cfg Config) (*s3Store, error) {+ if cfg.S3Bucket == "" {+ return nil, fmt.Errorf("S3 bucket name is required")+ }++ opts := func(o *s3.Options) {+ if cfg.S3Endpoint != "" {+ o.BaseEndpoint = aws.String(cfg.S3Endpoint)+ }+ if cfg.S3Region != "" {+ o.Region = cfg.S3Region+ } else {+ o.Region = "us-east-1"+ }+ if cfg.S3AccessKeyID != "" {+ o.Credentials = credentials.NewStaticCredentialsProvider(+ cfg.S3AccessKeyID,+ cfg.S3SecretAccessKey,+ "",+ )+ }+ o.UsePathStyle = cfg.S3ForcePathStyle+ }++ client := s3.New(s3.Options{}, opts)++ return &s3Store{+ client: client,+ bucket: cfg.S3Bucket,+ }, nil+}++func (s *s3Store) Put(ctx context.Context, key string, r io.Reader, contentType string) error {+ input := &s3.PutObjectInput{+ Bucket: aws.String(s.bucket),+ Key: aws.String(key),+ Body: r,+ ContentType: aws.String(contentType),+ }+ _, err := s.client.PutObject(ctx, input)+ if err != nil {+ return fmt.Errorf("s3 put %q: %w", key, err)+ }+ return nil+}++func (s *s3Store) Get(ctx context.Context, key string) (io.ReadCloser, error) {+ out, err := s.client.GetObject(ctx, &s3.GetObjectInput{+ Bucket: aws.String(s.bucket),+ Key: aws.String(key),+ })+ if err != nil {+ return nil, fmt.Errorf("s3 get %q: %w", key, err)+ }+ return out.Body, nil+}++func (s *s3Store) Delete(ctx context.Context, key string) error {+ _, err := s.client.DeleteObject(ctx, &s3.DeleteObjectInput{+ Bucket: aws.String(s.bucket),+ Key: aws.String(key),+ })+ if err != nil {+ return fmt.Errorf("s3 delete %q: %w", key, err)+ }+ return nil+}diff --git a/internal/storage/migration/constraints.go b/internal/storage/migration/constraints.goindex 0f674be..8564766 100644--- a/internal/storage/migration/constraints.go+++ b/internal/storage/migration/constraints.go@@ -17,7 +17,11 @@package migration-import "gorm.io/gorm"+import (+ "fmt"++ "gorm.io/gorm"+)func runConstraints(db *gorm.DB) {// Add FK constraints@@ -27,4 +31,56 @@ func runConstraints(db *gorm.DB) {FOREIGN KEY (template_id) REFERENCES templates(id) ON DELETE CASCADE;END IF;END $$`)++ // Ensure template_localizations cascade-deletes when a version is removed.+ // GORM's AutoMigrate does not update existing FK constraints, so we+ // drop and recreate if the current constraint lacks ON DELETE CASCADE.+ db.Exec(`DO $$ BEGIN+ IF EXISTS (+ SELECT 1 FROM pg_constraint c+ JOIN pg_class t ON c.conrelid = t.oid+ WHERE t.relname = 'template_localizations'+ AND c.conname = 'fk_template_versions_localizations'+ AND c.confdeltype <> 'c'+ ) THEN+ ALTER TABLE template_localizations DROP CONSTRAINT fk_template_versions_localizations;+ ALTER TABLE template_localizations ADD CONSTRAINT fk_template_versions_localizations+ FOREIGN KEY (version_id) REFERENCES template_versions(id) ON DELETE CASCADE;+ END IF;+ END $$`)++ // Rebuild unique indexes to include workspace_id so that+ // the same name/email can exist in different workspaces.+ rebuildUniqueIndexes(db)+}++// rebuildUniqueIndexes drops legacy two-column unique indexes and replaces+// them with expression indexes that use COALESCE(workspace_id, 0) so that+// NULL workspace_id values (personal space) are treated as equal.+func rebuildUniqueIndexes(db *gorm.DB) {+ type indexDef struct {+ table string+ name string+ column string // the varying column (name, email, code, domain)+ }++ indexes := []indexDef{+ {"templates", "idx_user_template", "name"},+ {"style_sheets", "idx_user_stylesheet", "name"},+ {"contacts", "idx_user_email", "email"},+ {"domains", "idx_user_domain", "domain"},+ {"languages", "idx_user_language", "code"},+ {"suppressions", "idx_user_suppression", "email"},+ }++ for _, idx := range indexes {+ db.Exec(fmt.Sprintf(`+ DO $$ BEGIN+ DROP INDEX IF EXISTS %s;+ CREATE UNIQUE INDEX %s ON %s (user_id, COALESCE(workspace_id, 0), %s);+ EXCEPTION WHEN others THEN NULL;+ END $$`,+ idx.name, idx.name, idx.table, idx.column,+ ))+ }}diff --git a/internal/storage/migration/migration.go b/internal/storage/migration/migration.goindex e50c2a1..9ae278a 100644--- a/internal/storage/migration/migration.go+++ b/internal/storage/migration/migration.go@@ -21,7 +21,7 @@ import ("fmt""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -29,6 +29,13 @@ import (func Run(db *gorm.DB) error {if err := db.AutoMigrate(&models.User{},+ &models.Plan{},+ &models.Workspace{},+ &models.WorkspaceMember{},+ &models.WorkspaceInvitation{},+ &models.OAuthProvider{},+ &models.OAuthAccount{},+ &models.WorkspaceSSOConfig{},&models.APIKey{},&models.Email{},&models.StyleSheet{},@@ -43,19 +50,41 @@ func Run(db *gorm.DB) error {&models.Bounce{},&models.Suppression{},&models.Contact{},- &models.ContactList{},- &models.ContactListMember{},&models.Event{},&models.Setting{},&models.UserSetting{},&models.WebhookDelivery{},&models.Session{},+ &models.Subscriber{},+ &models.SubscriberList{},+ &models.SubscriberListMember{},+ &models.Campaign{},+ &models.CampaignMessage{},+ &models.TrackedLink{},+ &models.TrackingEvent{},); err != nil {return fmt.Errorf("failed to migrate database: %w", err)}++ // Normalize: set workspace_id = NULL where it was previously 0 (personal data)+ normalizeWorkspaceIDs(db)+// run constraintsrunConstraints(db)logger.Info("database migrated")return nil}++// normalizeWorkspaceIDs sets workspace_id to NULL where it is 0 (legacy default).+// NULL means personal space; only non-NULL values reference a real workspace.+func normalizeWorkspaceIDs(db *gorm.DB) {+ tables := []string{+ "api_keys", "emails", "templates", "smtp_servers", "domains",+ "webhooks", "webhook_deliveries", "contacts",+ "bounces", "suppressions", "style_sheets", "languages", "events",+ }+ for _, table := range tables {+ db.Exec(fmt.Sprintf(`UPDATE %s SET workspace_id = NULL WHERE workspace_id = 0`, table))+ }+}diff --git a/internal/storage/postgres.go b/internal/storage/postgres.goindex 5af2486..379c3f7 100644--- a/internal/storage/postgres.go+++ b/internal/storage/postgres.go@@ -21,7 +21,7 @@ import ("fmt""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""golang.org/x/crypto/bcrypt""gorm.io/driver/postgres""gorm.io/gorm"diff --git a/internal/storage/repositories/analytics_repo.go b/internal/storage/repositories/analytics_repo.goindex f42f557..69fa0d2 100644--- a/internal/storage/repositories/analytics_repo.go+++ b/internal/storage/repositories/analytics_repo.go@@ -46,7 +46,7 @@ func (r *AnalyticsRepository) DailyCounts(userID uint, from, to time.Time, statuvar results []DailyCountquery := r.db.Table("emails").Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, COUNT(*) as count").- Where("user_id = ? AND created_at >= ? AND created_at <= ?", userID, from, to)+ Where("user_id = ? AND workspace_id IS NULL AND created_at >= ? AND created_at <= ?", userID, from, to)if status != "" {query = query.Where("status = ?", status)}@@ -59,7 +59,7 @@ func (r *AnalyticsRepository) StatusBreakdown(userID uint, from, to time.Time) (var results []StatusBreakdownerr := r.db.Table("emails").Select("status, COUNT(*) as count").- Where("user_id = ? AND created_at >= ? AND created_at <= ?", userID, from, to).+ Where("user_id = ? AND workspace_id IS NULL AND created_at >= ? AND created_at <= ?", userID, from, to).Group("status").Find(&results).Errorreturn results, err@@ -145,7 +145,7 @@ func (r *AnalyticsRepository) DeliveryRateTrends(userID uint, from, to time.Timevar rows []deliveryRowerr := r.db.Table("emails").Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, status, COUNT(*) as count").- Where("user_id = ? AND created_at >= ? AND created_at <= ? AND status IN ?", userID, from, to, []string{"sent", "failed"}).+ Where("user_id = ? AND workspace_id IS NULL AND created_at >= ? AND created_at <= ? AND status IN ?", userID, from, to, []string{"sent", "failed"}).Group("date, status").Order("date ASC").Find(&rows).Errorif err != nil {@@ -207,7 +207,7 @@ func (r *AnalyticsRepository) BounceRateTrends(userID uint, from, to time.Time)var rows []bounceRowerr := r.db.Table("bounces").Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, type, COUNT(*) as count").- Where("user_id = ? AND created_at >= ? AND created_at <= ?", userID, from, to).+ Where("user_id = ? AND workspace_id IS NULL AND created_at >= ? AND created_at <= ?", userID, from, to).Group("date, type").Order("date ASC").Find(&rows).Errorif err != nil {@@ -274,7 +274,7 @@ func (r *AnalyticsRepository) LatencyPercentilesForUser(userID uint, from, to tiCOALESCE(PERCENTILE_CONT(0.99) WITHIN GROUP (ORDER BY EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as p99,COALESCE(AVG(EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as avg`).- Where("user_id = ? AND status = 'sent' AND sent_at IS NOT NULL AND created_at >= ? AND created_at <= ?", userID, from, to).+ Where("user_id = ? AND workspace_id IS NULL AND status = 'sent' AND sent_at IS NOT NULL AND created_at >= ? AND created_at <= ?", userID, from, to).Scan(&result).Errorreturn &result, err}@@ -294,3 +294,67 @@ func (r *AnalyticsRepository) AdminLatencyPercentiles(from, to time.Time) (*LateScan(&result).Errorreturn &result, err}+++func (r *AnalyticsRepository) WorkspaceDailyCounts(workspaceID uint, from, to time.Time, status string) ([]DailyCount, error) {+ var results []DailyCount+ query := r.db.Table("emails").+ Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, COUNT(*) as count").+ Where("workspace_id = ? AND created_at >= ? AND created_at <= ?", workspaceID, from, to)+ if status != "" {+ query = query.Where("status = ?", status)+ }+ err := query.Group("date").Order("date ASC").Find(&results).Error+ return results, err+}++func (r *AnalyticsRepository) WorkspaceStatusBreakdown(workspaceID uint, from, to time.Time) ([]StatusBreakdown, error) {+ var results []StatusBreakdown+ err := r.db.Table("emails").+ Select("status, COUNT(*) as count").+ Where("workspace_id = ? AND created_at >= ? AND created_at <= ?", workspaceID, from, to).+ Group("status").+ Find(&results).Error+ return results, err+}++func (r *AnalyticsRepository) WorkspaceDeliveryRateTrends(workspaceID uint, from, to time.Time) ([]DeliveryRatePoint, error) {+ var rows []deliveryRow+ err := r.db.Table("emails").+ Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, status, COUNT(*) as count").+ Where("workspace_id = ? AND created_at >= ? AND created_at <= ? AND status IN ?", workspaceID, from, to, []string{"sent", "failed"}).+ Group("date, status").Order("date ASC").+ Find(&rows).Error+ if err != nil {+ return nil, err+ }+ return buildDeliveryRatePoints(rows, from, to), nil+}++func (r *AnalyticsRepository) WorkspaceBounceRateTrends(workspaceID uint, from, to time.Time) ([]BounceRatePoint, error) {+ var rows []bounceRow+ err := r.db.Table("bounces").+ Select("TO_CHAR(created_at, 'YYYY-MM-DD') as date, type, COUNT(*) as count").+ Where("workspace_id = ? AND created_at >= ? AND created_at <= ?", workspaceID, from, to).+ Group("date, type").Order("date ASC").+ Find(&rows).Error+ if err != nil {+ return nil, err+ }+ return buildBounceRatePoints(rows, from, to), nil+}++func (r *AnalyticsRepository) WorkspaceLatencyPercentiles(workspaceID uint, from, to time.Time) (*LatencyPercentiles, error) {+ var result LatencyPercentiles+ err := r.db.Table("emails").+ Select(`+ COALESCE(PERCENTILE_CONT(0.50) WITHIN GROUP (ORDER BY EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as p50,+ COALESCE(PERCENTILE_CONT(0.75) WITHIN GROUP (ORDER BY EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as p75,+ COALESCE(PERCENTILE_CONT(0.90) WITHIN GROUP (ORDER BY EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as p90,+ COALESCE(PERCENTILE_CONT(0.99) WITHIN GROUP (ORDER BY EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as p99,+ COALESCE(AVG(EXTRACT(EPOCH FROM (sent_at - created_at))), 0) as avg+ `).+ Where("workspace_id = ? AND status = 'sent' AND sent_at IS NOT NULL AND created_at >= ? AND created_at <= ?", workspaceID, from, to).+ Scan(&result).Error+ return &result, err+}diff --git a/internal/storage/repositories/api_key_repo.go b/internal/storage/repositories/api_key_repo.goindex 358e4a3..7f85e92 100644--- a/internal/storage/repositories/api_key_repo.go+++ b/internal/storage/repositories/api_key_repo.go@@ -20,7 +20,7 @@ package repositoriesimport ("time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -48,9 +48,9 @@ func (r *APIKeyRepository) FindByUserID(userID uint, limit, offset int) ([]modelvar keys []models.APIKeyvar total int64- r.db.Model(&models.APIKey{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.APIKey{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&keys).Error; err != nil {@@ -59,6 +59,36 @@ func (r *APIKeyRepository) FindByUserID(userID uint, limit, offset int) ([]modelreturn keys, total, nil}+func (r *APIKeyRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.APIKey, int64, error) {+ var keys []models.APIKey+ var total int64++ r.db.Model(&models.APIKey{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&keys).Error; err != nil {+ return nil, 0, err+ }+ return keys, total, nil+}++func (r *APIKeyRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.APIKey, int64, error) {+ var items []models.APIKey+ var total int64++ ApplyScope(r.db.Model(&models.APIKey{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}+func (r *APIKeyRepository) FindByID(id uint) (*models.APIKey, error) {var key models.APIKeyif err := r.db.First(&key, id).Error; err != nil {diff --git a/internal/storage/repositories/bounce_repo.go b/internal/storage/repositories/bounce_repo.goindex c242d9a..0fe60dd 100644--- a/internal/storage/repositories/bounce_repo.go+++ b/internal/storage/repositories/bounce_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -38,9 +38,9 @@ func (r *BounceRepository) FindByUserID(userID uint, limit, offset int) ([]modelvar bounces []models.Bouncevar total int64- r.db.Model(&models.Bounce{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Bounce{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&bounces).Error; err != nil {@@ -49,6 +49,36 @@ func (r *BounceRepository) FindByUserID(userID uint, limit, offset int) ([]modelreturn bounces, total, nil}+func (r *BounceRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Bounce, int64, error) {+ var bounces []models.Bounce+ var total int64++ r.db.Model(&models.Bounce{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&bounces).Error; err != nil {+ return nil, 0, err+ }+ return bounces, total, nil+}++func (r *BounceRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Bounce, int64, error) {+ var items []models.Bounce+ var total int64++ ApplyScope(r.db.Model(&models.Bounce{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}+func (r *BounceRepository) FindByEmailID(emailID uint) ([]models.Bounce, error) {var bounces []models.Bounceif err := r.db.Where("email_id = ?", emailID).Find(&bounces).Error; err != nil {diff --git a/internal/storage/repositories/campaign_message_repo.go b/internal/storage/repositories/campaign_message_repo.gonew file mode 100644index 0000000..7af361f--- /dev/null+++ b/internal/storage/repositories/campaign_message_repo.go@@ -0,0 +1,161 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "time"++ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+ "gorm.io/gorm/clause"+)++type CampaignMessageRepository struct {+ db *gorm.DB+}++func NewCampaignMessageRepository(db *gorm.DB) *CampaignMessageRepository {+ return &CampaignMessageRepository{db: db}+}++func (r *CampaignMessageRepository) Create(m *models.CampaignMessage) error {+ return r.db.Create(m).Error+}++func (r *CampaignMessageRepository) BulkCreate(messages []models.CampaignMessage) (int, error) {+ if len(messages) == 0 {+ return 0, nil+ }+ result := r.db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(messages, 100)+ return int(result.RowsAffected), result.Error+}++func (r *CampaignMessageRepository) FindByCampaign(campaignID uint, status string, limit, offset int) ([]models.CampaignMessage, int64, error) {+ var items []models.CampaignMessage+ var total int64++ q := r.db.Model(&models.CampaignMessage{}).Where("campaign_id = ?", campaignID)+ if status != "" {+ q = q.Where("status = ?", status)+ }+ q.Count(&total)++ qFind := r.db.Where("campaign_id = ?", campaignID)+ if status != "" {+ qFind = qFind.Where("status = ?", status)+ }+ if err := qFind.Preload("Subscriber").Order("created_at DESC").Limit(limit).Offset(offset).Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *CampaignMessageRepository) FindPendingByCampaign(campaignID uint, batchSize int) ([]models.CampaignMessage, error) {+ var items []models.CampaignMessage+ if err := r.db.Preload("Subscriber").+ Where("campaign_id = ? AND status = ?", campaignID, models.CampaignMsgPending).+ Order("id ASC").+ Limit(batchSize).+ Find(&items).Error; err != nil {+ return nil, err+ }+ return items, nil+}++func (r *CampaignMessageRepository) UpdateStatus(id uint, status models.CampaignMessageStatus, errorMsg string) error {+ updates := map[string]interface{}{"status": status}+ if errorMsg != "" {+ updates["error_message"] = errorMsg+ }+ if status == models.CampaignMsgSent {+ now := time.Now()+ updates["sent_at"] = now+ }+ return r.db.Model(&models.CampaignMessage{}).Where("id = ?", id).Updates(updates).Error+}++func (r *CampaignMessageRepository) SetEmailID(id uint, emailID uint) error {+ return r.db.Model(&models.CampaignMessage{}).Where("id = ?", id).Update("email_id", emailID).Error+}++func (r *CampaignMessageRepository) CountByStatus(campaignID uint) (map[models.CampaignMessageStatus]int64, error) {+ type result struct {+ Status models.CampaignMessageStatus+ Count int64+ }+ var results []result+ if err := r.db.Model(&models.CampaignMessage{}).+ Select("status, COUNT(*) as count").+ Where("campaign_id = ?", campaignID).+ Group("status").+ Find(&results).Error; err != nil {+ return nil, err+ }++ counts := make(map[models.CampaignMessageStatus]int64)+ for _, r := range results {+ counts[r.Status] = r.Count+ }+ return counts, nil+}++func (r *CampaignMessageRepository) CountPending(campaignID uint) (int64, error) {+ var count int64+ err := r.db.Model(&models.CampaignMessage{}).+ Where("campaign_id = ? AND status = ?", campaignID, models.CampaignMsgPending).+ Count(&count).Error+ return count, err+}++func (r *CampaignMessageRepository) FindByCampaignMessageID(id uint) (*models.CampaignMessage, error) {+ var msg models.CampaignMessage+ if err := r.db.First(&msg, id).Error; err != nil {+ return nil, err+ }+ return &msg, nil+}++func (r *CampaignMessageRepository) UpdateOpenedAt(id uint) error {+ return r.db.Model(&models.CampaignMessage{}).Where("id = ? AND opened_at IS NULL", id).+ Update("opened_at", time.Now()).Error+}++func (r *CampaignMessageRepository) UpdateClickedAt(id uint) error {+ return r.db.Model(&models.CampaignMessage{}).Where("id = ? AND clicked_at IS NULL", id).+ Update("clicked_at", time.Now()).Error+}++// FindByEmailID looks up a campaign message by its linked email record.+func (r *CampaignMessageRepository) FindByEmailID(emailID uint) (*models.CampaignMessage, error) {+ var msg models.CampaignMessage+ if err := r.db.Where("email_id = ?", emailID).First(&msg).Error; err != nil {+ return nil, err+ }+ return &msg, nil+}++// UpdateBouncedAt marks a campaign message as bounced.+func (r *CampaignMessageRepository) UpdateBouncedAt(id uint) error {+ return r.db.Model(&models.CampaignMessage{}).Where("id = ? AND bounced_at IS NULL", id).+ Update("bounced_at", time.Now()).Error+}++func (r *CampaignMessageRepository) UpdateUnsubscribedAt(id uint) error {+ return r.db.Model(&models.CampaignMessage{}).Where("id = ? AND unsubscribed_at IS NULL", id).+ Update("unsubscribed_at", time.Now()).Error+}diff --git a/internal/storage/repositories/campaign_repo.go b/internal/storage/repositories/campaign_repo.gonew file mode 100644index 0000000..8899f11--- /dev/null+++ b/internal/storage/repositories/campaign_repo.go@@ -0,0 +1,98 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "time"++ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type CampaignRepository struct {+ db *gorm.DB+}++func NewCampaignRepository(db *gorm.DB) *CampaignRepository {+ return &CampaignRepository{db: db}+}++func (r *CampaignRepository) Create(c *models.Campaign) error {+ return r.db.Create(c).Error+}++func (r *CampaignRepository) FindByID(id uint) (*models.Campaign, error) {+ var c models.Campaign+ if err := r.db.First(&c, id).Error; err != nil {+ return nil, err+ }+ return &c, nil+}++func (r *CampaignRepository) FindByScope(scope ResourceScope, status string, limit, offset int) ([]models.Campaign, int64, error) {+ var items []models.Campaign+ var total int64++ q := ApplyScope(r.db.Model(&models.Campaign{}), scope)+ if status != "" {+ q = q.Where("status = ?", status)+ }+ q.Count(&total)++ qFind := ApplyScope(r.db, scope)+ if status != "" {+ qFind = qFind.Where("status = ?", status)+ }+ if err := qFind.Order("created_at DESC").Limit(limit).Offset(offset).Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *CampaignRepository) Update(c *models.Campaign) error {+ return r.db.Save(c).Error+}++func (r *CampaignRepository) Delete(id uint) error {+ return r.db.Transaction(func(tx *gorm.DB) error {+ if err := tx.Where("campaign_id = ?", id).Delete(&models.CampaignMessage{}).Error; err != nil {+ return err+ }+ return tx.Delete(&models.Campaign{}, id).Error+ })+}++func (r *CampaignRepository) UpdateStatus(id uint, status models.CampaignStatus) error {+ updates := map[string]interface{}{"status": status, "updated_at": time.Now()}+ if status == models.CampaignStatusSending {+ updates["started_at"] = time.Now()+ }+ if status == models.CampaignStatusSent || status == models.CampaignStatusCancelled {+ updates["completed_at"] = time.Now()+ }+ return r.db.Model(&models.Campaign{}).Where("id = ?", id).Updates(updates).Error+}++func (r *CampaignRepository) FindScheduledReady() ([]models.Campaign, error) {+ var campaigns []models.Campaign+ if err := r.db.Where("status = ? AND scheduled_at <= ?", models.CampaignStatusScheduled, time.Now()).+ Find(&campaigns).Error; err != nil {+ return nil, err+ }+ return campaigns, nil+}diff --git a/internal/storage/repositories/contact_list_repo.go b/internal/storage/repositories/contact_list_repo.goindex f86cad0..61b94c7 100644--- a/internal/storage/repositories/contact_list_repo.go+++ b/internal/storage/repositories/contact_list_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -45,11 +45,34 @@ func (r *ContactListRepository) FindByID(id uint) (*models.ContactList, error) {func (r *ContactListRepository) FindByUserID(userID uint, limit, offset int) ([]models.ContactList, int64, error) {var lists []models.ContactListvar total int64- r.db.Model(&models.ContactList{}).Where("user_id = ?", userID).Count(&total)- err := r.db.Where("user_id = ?", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&lists).Error+ r.db.Model(&models.ContactList{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)+ err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&lists).Errorreturn lists, total, err}+func (r *ContactListRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.ContactList, int64, error) {+ var lists []models.ContactList+ var total int64+ r.db.Model(&models.ContactList{}).Where("workspace_id = ?", workspaceID).Count(&total)+ err := r.db.Where("workspace_id = ?", workspaceID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&lists).Error+ return lists, total, err+}++func (r *ContactListRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.ContactList, int64, error) {+ var items []models.ContactList+ var total int64++ ApplyScope(r.db.Model(&models.ContactList{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}+func (r *ContactListRepository) Update(list *models.ContactList) error {return r.db.Save(list).Error}diff --git a/internal/storage/repositories/contact_repo.go b/internal/storage/repositories/contact_repo.goindex 8a2245c..1a6ee82 100644--- a/internal/storage/repositories/contact_repo.go+++ b/internal/storage/repositories/contact_repo.go@@ -21,7 +21,7 @@ import ("net/mail""time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm""gorm.io/gorm/clause")@@ -100,7 +100,7 @@ func (r *ContactRepository) FindByUserID(userID uint, search string, limit, offsvar contacts []models.Contactvar total int64- q := r.db.Model(&models.Contact{}).Where("user_id = ?", userID)+ q := r.db.Model(&models.Contact{}).Where("user_id = ? AND workspace_id IS NULL", userID)if search != "" {q = q.Where("email ILIKE ? OR name ILIKE ?", "%"+search+"%", "%"+search+"%")}@@ -114,6 +114,46 @@ func (r *ContactRepository) FindByUserID(userID uint, search string, limit, offsreturn contacts, total, nil}+func (r *ContactRepository) FindByWorkspaceID(workspaceID uint, search string, limit, offset int) ([]models.Contact, int64, error) {+ var contacts []models.Contact+ var total int64++ q := r.db.Model(&models.Contact{}).Where("workspace_id = ?", workspaceID)+ if search != "" {+ q = q.Where("email ILIKE ? OR name ILIKE ?", "%"+search+"%", "%"+search+"%")+ }+ q.Count(&total)++ if err := q.Order("last_sent_at DESC NULLS LAST").+ Limit(limit).Offset(offset).+ Find(&contacts).Error; err != nil {+ return nil, 0, err+ }+ return contacts, total, nil+}++func (r *ContactRepository) FindByScope(scope ResourceScope, search string, limit, offset int) ([]models.Contact, int64, error) {+ var contacts []models.Contact+ var total int64++ q := ApplyScope(r.db.Model(&models.Contact{}), scope)+ if search != "" {+ q = q.Where("email ILIKE ? OR name ILIKE ?", "%"+search+"%", "%"+search+"%")+ }+ q.Count(&total)++ qFind := ApplyScope(r.db, scope)+ if search != "" {+ qFind = qFind.Where("email ILIKE ? OR name ILIKE ?", "%"+search+"%", "%"+search+"%")+ }+ if err := qFind.Order("last_sent_at DESC NULLS LAST").+ Limit(limit).Offset(offset).+ Find(&contacts).Error; err != nil {+ return nil, 0, err+ }+ return contacts, total, nil+}+func (r *ContactRepository) FindByID(id uint) (*models.Contact, error) {var contact models.Contactif err := r.db.First(&contact, id).Error; err != nil {diff --git a/internal/storage/repositories/domain_repo.go b/internal/storage/repositories/domain_repo.goindex 8f68fbb..e9e08ca 100644--- a/internal/storage/repositories/domain_repo.go+++ b/internal/storage/repositories/domain_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -54,9 +54,9 @@ func (r *DomainRepository) FindByUserID(userID uint, limit, offset int) ([]modelvar domains []models.Domainvar total int64- r.db.Model(&models.Domain{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Domain{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&domains).Error; err != nil {@@ -73,6 +73,36 @@ func (r *DomainRepository) FindByUserIDAndDomain(userID uint, domain string) (*mreturn &d, nil}+func (r *DomainRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Domain, int64, error) {+ var domains []models.Domain+ var total int64++ r.db.Model(&models.Domain{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&domains).Error; err != nil {+ return nil, 0, err+ }+ return domains, total, nil+}++func (r *DomainRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Domain, int64, error) {+ var items []models.Domain+ var total int64++ ApplyScope(r.db.Model(&models.Domain{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}+// IsOwnershipVerified checks whether the given domain is registered and ownership-verified for the user.func (r *DomainRepository) IsOwnershipVerified(userID uint, domainName string) bool {var count int64diff --git a/internal/storage/repositories/email_repo.go b/internal/storage/repositories/email_repo.goindex 0ee9a28..70ca2d2 100644--- a/internal/storage/repositories/email_repo.go+++ b/internal/storage/repositories/email_repo.go@@ -20,7 +20,7 @@ package repositoriesimport ("time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -60,9 +60,9 @@ func (r *EmailRepository) FindByUserID(userID uint, limit, offset int) ([]modelsvar emails []models.Emailvar total int64- r.db.Model(&models.Email{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Email{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&emails).Error; err != nil {@@ -71,6 +71,36 @@ func (r *EmailRepository) FindByUserID(userID uint, limit, offset int) ([]modelsreturn emails, total, nil}+func (r *EmailRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Email, int64, error) {+ var emails []models.Email+ var total int64++ r.db.Model(&models.Email{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&emails).Error; err != nil {+ return nil, 0, err+ }+ return emails, total, nil+}++func (r *EmailRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Email, int64, error) {+ var items []models.Email+ var total int64++ ApplyScope(r.db.Model(&models.Email{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}+// FindFailedForRetry returns failed emails with retry_count < maxRetries for a given user.func (r *EmailRepository) FindFailedForRetry(userID uint, maxRetries int) ([]models.Email, error) {var emails []models.Email@@ -82,6 +112,17 @@ func (r *EmailRepository) FindFailedForRetry(userID uint, maxRetries int) ([]modreturn emails, nil}+// FindFailedForRetryByWorkspace returns failed emails for a workspace that haven't exceeded max retries.+func (r *EmailRepository) FindFailedForRetryByWorkspace(workspaceID uint, maxRetries int) ([]models.Email, error) {+ var emails []models.Email+ if err := r.db.Where("workspace_id = ? AND status = ? AND retry_count < ?", workspaceID, models.EmailStatusFailed, maxRetries).+ Order("created_at ASC").+ Find(&emails).Error; err != nil {+ return nil, err+ }+ return emails, nil+}+func (r *EmailRepository) FindAll(limit, offset int) ([]models.Email, int64, error) {var emails []models.Emailvar total int64diff --git a/internal/storage/repositories/event_repo.go b/internal/storage/repositories/event_repo.goindex d59ab7a..f9e9ca7 100644--- a/internal/storage/repositories/event_repo.go+++ b/internal/storage/repositories/event_repo.go@@ -20,7 +20,7 @@ package repositoriesimport ("time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -80,6 +80,38 @@ func (r *EventRepository) FindByCategory(category models.EventCategory, limit, oreturn events, total, nil}+// FindByWorkspaceID returns paginated events for a workspace.+func (r *EventRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Event, int64, error) {+ var events []models.Event+ var total int64++ r.db.Model(&models.Event{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&events).Error; err != nil {+ return nil, 0, err+ }+ return events, total, nil+}++// FindByWorkspaceAndCategory returns paginated events for a workspace filtered by category.+func (r *EventRepository) FindByWorkspaceAndCategory(workspaceID uint, category models.EventCategory, limit, offset int) ([]models.Event, int64, error) {+ var events []models.Event+ var total int64++ r.db.Model(&models.Event{}).Where("workspace_id = ? AND category = ?", workspaceID, category).Count(&total)++ if err := r.db.Where("workspace_id = ? AND category = ?", workspaceID, category).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&events).Error; err != nil {+ return nil, 0, err+ }+ return events, total, nil+}+// DeleteOlderThan deletes event records older than the given time.// Returns the number of rows deleted.func (r *EventRepository) DeleteOlderThan(before time.Time) (int64, error) {diff --git a/internal/storage/repositories/language_repo.go b/internal/storage/repositories/language_repo.goindex aad3c0f..f286fb1 100644--- a/internal/storage/repositories/language_repo.go+++ b/internal/storage/repositories/language_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -50,13 +50,28 @@ func (r *LanguageRepository) FindByID(id uint) (*models.Language, error) {return &l, nil}+func (r *LanguageRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Language, int64, error) {+ var languages []models.Language+ var total int64++ r.db.Model(&models.Language{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("code ASC").+ Limit(limit).Offset(offset).+ Find(&languages).Error; err != nil {+ return nil, 0, err+ }+ return languages, total, nil+}+func (r *LanguageRepository) FindByUserID(userID uint, limit, offset int) ([]models.Language, int64, error) {var languages []models.Languagevar total int64- r.db.Model(&models.Language{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Language{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("code ASC").Limit(limit).Offset(offset).Find(&languages).Error; err != nil {@@ -64,3 +79,34 @@ func (r *LanguageRepository) FindByUserID(userID uint, limit, offset int) ([]mod}return languages, total, nil}++// ClearDefault unsets is_default for all languages in the given scope.+func (r *LanguageRepository) ClearDefault(scope ResourceScope) error {+ return ApplyScope(r.db.Model(&models.Language{}), scope).+ Where("is_default = ?", true).+ Update("is_default", false).Error+}++// FindDefault returns the default language for the given scope, or nil if none.+func (r *LanguageRepository) FindDefault(scope ResourceScope) (*models.Language, error) {+ var l models.Language+ if err := ApplyScope(r.db, scope).Where("is_default = ?", true).First(&l).Error; err != nil {+ return nil, err+ }+ return &l, nil+}++func (r *LanguageRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Language, int64, error) {+ var items []models.Language+ var total int64++ ApplyScope(r.db.Model(&models.Language{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("code ASC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}diff --git a/internal/storage/repositories/oauth_account_repo.go b/internal/storage/repositories/oauth_account_repo.gonew file mode 100644index 0000000..b49e8c8--- /dev/null+++ b/internal/storage/repositories/oauth_account_repo.go@@ -0,0 +1,59 @@+package repositories++import (+ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type OAuthAccountRepository struct {+ db *gorm.DB+}++func NewOAuthAccountRepository(db *gorm.DB) *OAuthAccountRepository {+ return &OAuthAccountRepository{db: db}+}++func (r *OAuthAccountRepository) Create(a *models.OAuthAccount) error {+ return r.db.Create(a).Error+}++func (r *OAuthAccountRepository) FindByProviderAndExternalID(providerID uint, externalID string) (*models.OAuthAccount, error) {+ var a models.OAuthAccount+ if err := r.db.Where("provider_id = ? AND provider_user_id = ?", providerID, externalID).+ First(&a).Error; err != nil {+ return nil, err+ }+ return &a, nil+}++func (r *OAuthAccountRepository) FindByUserID(userID uint) ([]models.OAuthAccount, error) {+ var accounts []models.OAuthAccount+ if err := r.db.Preload("Provider").Where("user_id = ?", userID).+ Order("created_at DESC").Find(&accounts).Error; err != nil {+ return nil, err+ }+ return accounts, nil+}++func (r *OAuthAccountRepository) FindByUserAndProvider(userID, providerID uint) (*models.OAuthAccount, error) {+ var a models.OAuthAccount+ if err := r.db.Where("user_id = ? AND provider_id = ?", userID, providerID).+ First(&a).Error; err != nil {+ return nil, err+ }+ return &a, nil+}++func (r *OAuthAccountRepository) Update(a *models.OAuthAccount) error {+ return r.db.Save(a).Error+}++func (r *OAuthAccountRepository) Delete(id uint) error {+ return r.db.Delete(&models.OAuthAccount{}, id).Error+}++func (r *OAuthAccountRepository) CountByUserID(userID uint) (int64, error) {+ var count int64+ err := r.db.Model(&models.OAuthAccount{}).Where("user_id = ?", userID).Count(&count).Error+ return count, err+}diff --git a/internal/storage/repositories/oauth_provider_repo.go b/internal/storage/repositories/oauth_provider_repo.gonew file mode 100644index 0000000..8d8d3ad--- /dev/null+++ b/internal/storage/repositories/oauth_provider_repo.go@@ -0,0 +1,71 @@+package repositories++import (+ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type OAuthProviderRepository struct {+ db *gorm.DB+}++func NewOAuthProviderRepository(db *gorm.DB) *OAuthProviderRepository {+ return &OAuthProviderRepository{db: db}+}++func (r *OAuthProviderRepository) Create(p *models.OAuthProvider) error {+ return r.db.Create(p).Error+}++func (r *OAuthProviderRepository) FindByID(id uint) (*models.OAuthProvider, error) {+ var p models.OAuthProvider+ if err := r.db.First(&p, id).Error; err != nil {+ return nil, err+ }+ return &p, nil+}++func (r *OAuthProviderRepository) FindBySlug(slug string) (*models.OAuthProvider, error) {+ var p models.OAuthProvider+ if err := r.db.Where("slug = ? AND enabled = true", slug).First(&p).Error; err != nil {+ return nil, err+ }+ return &p, nil+}++// FindEnabled returns all enabled global providers (workspace_id IS NULL).+func (r *OAuthProviderRepository) FindEnabled() ([]models.OAuthProvider, error) {+ var providers []models.OAuthProvider+ if err := r.db.Where("enabled = true AND workspace_id IS NULL").+ Order("name ASC").Find(&providers).Error; err != nil {+ return nil, err+ }+ return providers, nil+}++// FindEnabledForWorkspace returns enabled providers: global + workspace-scoped.+func (r *OAuthProviderRepository) FindEnabledForWorkspace(wsID uint) ([]models.OAuthProvider, error) {+ var providers []models.OAuthProvider+ if err := r.db.Where("enabled = true AND (workspace_id IS NULL OR workspace_id = ?)", wsID).+ Order("name ASC").Find(&providers).Error; err != nil {+ return nil, err+ }+ return providers, nil+}++// FindAll returns all providers (admin).+func (r *OAuthProviderRepository) FindAll() ([]models.OAuthProvider, error) {+ var providers []models.OAuthProvider+ if err := r.db.Order("created_at DESC").Find(&providers).Error; err != nil {+ return nil, err+ }+ return providers, nil+}++func (r *OAuthProviderRepository) Update(p *models.OAuthProvider) error {+ return r.db.Save(p).Error+}++func (r *OAuthProviderRepository) Delete(id uint) error {+ return r.db.Delete(&models.OAuthProvider{}, id).Error+}diff --git a/internal/storage/repositories/plan_repo.go b/internal/storage/repositories/plan_repo.gonew file mode 100644index 0000000..3a4ccde--- /dev/null+++ b/internal/storage/repositories/plan_repo.go@@ -0,0 +1,130 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type PlanRepository struct {+ db *gorm.DB+}++func NewPlanRepository(db *gorm.DB) *PlanRepository {+ return &PlanRepository{db: db}+}++func (r *PlanRepository) Create(plan *models.Plan) error {+ return r.db.Create(plan).Error+}++func (r *PlanRepository) Update(plan *models.Plan) error {+ return r.db.Save(plan).Error+}++func (r *PlanRepository) Delete(id uint) error {+ return r.db.Delete(&models.Plan{}, id).Error+}++func (r *PlanRepository) FindByID(id uint) (*models.Plan, error) {+ var plan models.Plan+ if err := r.db.First(&plan, id).Error; err != nil {+ return nil, err+ }+ return &plan, nil+}++func (r *PlanRepository) FindAll(limit, offset int) ([]models.Plan, int64, error) {+ var plans []models.Plan+ var total int64++ r.db.Model(&models.Plan{}).Count(&total)++ if err := r.db.Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&plans).Error; err != nil {+ return nil, 0, err+ }+ return plans, total, nil+}++// FindDefault returns the active default plan, or gorm.ErrRecordNotFound if none exists.+func (r *PlanRepository) FindDefault() (*models.Plan, error) {+ var plan models.Plan+ if err := r.db.Where("is_default = ? AND is_active = ?", true, true).First(&plan).Error; err != nil {+ return nil, err+ }+ return &plan, nil+}++// FindByWorkspaceID returns the plan assigned to the given workspace.+func (r *PlanRepository) FindByWorkspaceID(workspaceID uint) (*models.Plan, error) {+ var ws models.Workspace+ if err := r.db.First(&ws, workspaceID).Error; err != nil {+ return nil, err+ }+ if ws.PlanID == nil {+ return nil, gorm.ErrRecordNotFound+ }+ var plan models.Plan+ if err := r.db.First(&plan, *ws.PlanID).Error; err != nil {+ return nil, err+ }+ return &plan, nil+}++// ClearDefault unsets is_default on all plans. Should be called within a transaction+// before setting a new default.+func (r *PlanRepository) ClearDefault() error {+ return r.db.Model(&models.Plan{}).Where("is_default = ?", true).Update("is_default", false).Error+}++// ClearDefaultTx unsets is_default on all plans within the given transaction.+func (r *PlanRepository) ClearDefaultTx(tx *gorm.DB) error {+ return tx.Model(&models.Plan{}).Where("is_default = ?", true).Update("is_default", false).Error+}++// CountWorkspaces returns the number of workspaces assigned to the given plan.+func (r *PlanRepository) CountWorkspaces(planID uint) (int64, error) {+ var count int64+ if err := r.db.Model(&models.Workspace{}).Where("plan_id = ?", planID).Count(&count).Error; err != nil {+ return 0, err+ }+ return count, nil+}++// AssignToWorkspace sets the plan_id on the given workspace.+func (r *PlanRepository) AssignToWorkspace(workspaceID, planID uint) error {+ return r.db.Model(&models.Workspace{}).Where("id = ?", workspaceID).Update("plan_id", planID).Error+}++// UnassignFromWorkspace removes the plan assignment from the given workspace.+func (r *PlanRepository) UnassignFromWorkspace(workspaceID uint) error {+ return r.db.Model(&models.Workspace{}).Where("id = ?", workspaceID).Update("plan_id", nil).Error+}++// UnassignAllFromPlan removes plan assignment from all workspaces using the given plan.+func (r *PlanRepository) UnassignAllFromPlan(planID uint) error {+ return r.db.Model(&models.Workspace{}).Where("plan_id = ?", planID).Update("plan_id", nil).Error+}++// DB returns the underlying database connection for use in transactions.+func (r *PlanRepository) DB() *gorm.DB {+ return r.db+}diff --git a/internal/storage/repositories/scope.go b/internal/storage/repositories/scope.gonew file mode 100644index 0000000..ed87daa--- /dev/null+++ b/internal/storage/repositories/scope.go@@ -0,0 +1,46 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import "gorm.io/gorm"++// ResourceScope defines the ownership context for a request.+// If WorkspaceID is nil, the request is in personal mode.+// If WorkspaceID is set, the request targets that workspace.+type ResourceScope struct {+ UserID uint+ WorkspaceID *uint+}++// ApplyScope adds the appropriate WHERE clause to a GORM query.+// Personal: user_id = ? AND workspace_id IS NULL+// Workspace: workspace_id = ?+func ApplyScope(db *gorm.DB, scope ResourceScope) *gorm.DB {+ if scope.WorkspaceID != nil {+ return db.Where("workspace_id = ?", *scope.WorkspaceID)+ }+ return db.Where("user_id = ? AND workspace_id IS NULL", scope.UserID)+}++// OwnsResource checks whether the given resource belongs to the current scope.+func OwnsResource(scope ResourceScope, resourceUserID uint, resourceWorkspaceID *uint) bool {+ if scope.WorkspaceID != nil {+ return resourceWorkspaceID != nil && *resourceWorkspaceID == *scope.WorkspaceID+ }+ return resourceUserID == scope.UserID && resourceWorkspaceID == nil+}diff --git a/internal/storage/repositories/server_repo.go b/internal/storage/repositories/server_repo.goindex 67a16d0..3f3c5a2 100644--- a/internal/storage/repositories/server_repo.go+++ b/internal/storage/repositories/server_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")diff --git a/internal/storage/repositories/session_repo.go b/internal/storage/repositories/session_repo.goindex 1d5220a..b41006c 100644--- a/internal/storage/repositories/session_repo.go+++ b/internal/storage/repositories/session_repo.go@@ -20,7 +20,7 @@ package repositoriesimport ("time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")diff --git a/internal/storage/repositories/setting_repo.go b/internal/storage/repositories/setting_repo.goindex 9618e1f..ca0603b 100644--- a/internal/storage/repositories/setting_repo.go+++ b/internal/storage/repositories/setting_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")diff --git a/internal/storage/repositories/smtp_repo.go b/internal/storage/repositories/smtp_repo.goindex c58c23a..46a1eb0 100644--- a/internal/storage/repositories/smtp_repo.go+++ b/internal/storage/repositories/smtp_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -54,9 +54,9 @@ func (r *SMTPRepository) FindByUserID(userID uint, limit, offset int) ([]models.var servers []models.SMTPServervar total int64- r.db.Model(&models.SMTPServer{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.SMTPServer{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&servers).Error; err != nil {@@ -77,7 +77,46 @@ func (r *SMTPRepository) FindAllWithRetries() ([]models.SMTPServer, error) {// FindFirstByUserID returns the first enabled SMTP server for a user.func (r *SMTPRepository) FindFirstByUserID(userID uint) (*models.SMTPServer, error) {var server models.SMTPServer- if err := r.db.Where("user_id = ? AND status = ?", userID, models.SMTPStatusEnabled).First(&server).Error; err != nil {+ if err := r.db.Where("user_id = ? AND status = ? AND workspace_id IS NULL", userID, models.SMTPStatusEnabled).First(&server).Error; err != nil {+ return nil, err+ }+ return &server, nil+}++func (r *SMTPRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.SMTPServer, int64, error) {+ var servers []models.SMTPServer+ var total int64++ r.db.Model(&models.SMTPServer{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&servers).Error; err != nil {+ return nil, 0, err+ }+ return servers, total, nil+}++func (r *SMTPRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.SMTPServer, int64, error) {+ var items []models.SMTPServer+ var total int64++ ApplyScope(r.db.Model(&models.SMTPServer{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++// FindFirstByWorkspaceID returns the first enabled SMTP server for a workspace.+func (r *SMTPRepository) FindFirstByWorkspaceID(workspaceID uint) (*models.SMTPServer, error) {+ var server models.SMTPServer+ if err := r.db.Where("workspace_id = ? AND status = ?", workspaceID, models.SMTPStatusEnabled).First(&server).Error; err != nil {return nil, err}return &server, nildiff --git a/internal/storage/repositories/stylesheet_repo.go b/internal/storage/repositories/stylesheet_repo.goindex b3d6f6c..41c18bd 100644--- a/internal/storage/repositories/stylesheet_repo.go+++ b/internal/storage/repositories/stylesheet_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -50,13 +50,28 @@ func (r *StyleSheetRepository) FindByID(id uint) (*models.StyleSheet, error) {return &ss, nil}+func (r *StyleSheetRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.StyleSheet, int64, error) {+ var sheets []models.StyleSheet+ var total int64++ r.db.Model(&models.StyleSheet{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&sheets).Error; err != nil {+ return nil, 0, err+ }+ return sheets, total, nil+}+func (r *StyleSheetRepository) FindByUserID(userID uint, limit, offset int) ([]models.StyleSheet, int64, error) {var sheets []models.StyleSheetvar total int64- r.db.Model(&models.StyleSheet{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.StyleSheet{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&sheets).Error; err != nil {@@ -64,3 +79,18 @@ func (r *StyleSheetRepository) FindByUserID(userID uint, limit, offset int) ([]m}return sheets, total, nil}++func (r *StyleSheetRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.StyleSheet, int64, error) {+ var items []models.StyleSheet+ var total int64++ ApplyScope(r.db.Model(&models.StyleSheet{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}diff --git a/internal/storage/repositories/subscriber_list_repo.go b/internal/storage/repositories/subscriber_list_repo.gonew file mode 100644index 0000000..45e8215--- /dev/null+++ b/internal/storage/repositories/subscriber_list_repo.go@@ -0,0 +1,119 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+ "gorm.io/gorm/clause"+)++type SubscriberListRepository struct {+ db *gorm.DB+}++func NewSubscriberListRepository(db *gorm.DB) *SubscriberListRepository {+ return &SubscriberListRepository{db: db}+}++func (r *SubscriberListRepository) Create(list *models.SubscriberList) error {+ return r.db.Create(list).Error+}++func (r *SubscriberListRepository) FindByID(id uint) (*models.SubscriberList, error) {+ var list models.SubscriberList+ if err := r.db.First(&list, id).Error; err != nil {+ return nil, err+ }+ return &list, nil+}++func (r *SubscriberListRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.SubscriberList, int64, error) {+ var items []models.SubscriberList+ var total int64++ ApplyScope(r.db.Model(&models.SubscriberList{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *SubscriberListRepository) Update(list *models.SubscriberList) error {+ return r.db.Save(list).Error+}++func (r *SubscriberListRepository) Delete(id uint) error {+ return r.db.Transaction(func(tx *gorm.DB) error {+ if err := tx.Where("list_id = ?", id).Delete(&models.SubscriberListMember{}).Error; err != nil {+ return err+ }+ return tx.Delete(&models.SubscriberList{}, id).Error+ })+}++func (r *SubscriberListRepository) AddMember(member *models.SubscriberListMember) error {+ return r.db.Clauses(clause.OnConflict{DoNothing: true}).Create(member).Error+}++func (r *SubscriberListRepository) RemoveMember(listID, subscriberID uint) error {+ return r.db.Where("list_id = ? AND subscriber_id = ?", listID, subscriberID).+ Delete(&models.SubscriberListMember{}).Error+}++func (r *SubscriberListRepository) ListMembers(listID uint, limit, offset int) ([]models.Subscriber, int64, error) {+ var subscribers []models.Subscriber+ var total int64++ r.db.Model(&models.SubscriberListMember{}).Where("list_id = ?", listID).Count(&total)++ if err := r.db.+ Joins("JOIN subscriber_list_members ON subscriber_list_members.subscriber_id = subscribers.id").+ Where("subscriber_list_members.list_id = ?", listID).+ Order("subscribers.created_at DESC").+ Limit(limit).Offset(offset).+ Find(&subscribers).Error; err != nil {+ return nil, 0, err+ }+ return subscribers, total, nil+}++func (r *SubscriberListRepository) MemberCount(listID uint) int64 {+ var count int64+ r.db.Model(&models.SubscriberListMember{}).Where("list_id = ?", listID).Count(&count)+ return count+}++func (r *SubscriberListRepository) BulkAddMembers(listID uint, subscriberIDs []uint) (int, error) {+ if len(subscriberIDs) == 0 {+ return 0, nil+ }+ var members []models.SubscriberListMember+ for _, sid := range subscriberIDs {+ members = append(members, models.SubscriberListMember{+ ListID: listID,+ SubscriberID: sid,+ })+ }+ result := r.db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(members, 100)+ return int(result.RowsAffected), result.Error+}diff --git a/internal/storage/repositories/subscriber_repo.go b/internal/storage/repositories/subscriber_repo.gonew file mode 100644index 0000000..34f1ed3--- /dev/null+++ b/internal/storage/repositories/subscriber_repo.go@@ -0,0 +1,230 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "fmt"+ "strings"++ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+ "gorm.io/gorm/clause"+)++type SubscriberRepository struct {+ db *gorm.DB+}++func NewSubscriberRepository(db *gorm.DB) *SubscriberRepository {+ return &SubscriberRepository{db: db}+}++func (r *SubscriberRepository) Create(s *models.Subscriber) error {+ return r.db.Create(s).Error+}++func (r *SubscriberRepository) FindByID(id uint) (*models.Subscriber, error) {+ var s models.Subscriber+ if err := r.db.First(&s, id).Error; err != nil {+ return nil, err+ }+ return &s, nil+}++func (r *SubscriberRepository) FindByEmail(scope ResourceScope, email string) (*models.Subscriber, error) {+ var s models.Subscriber+ q := ApplyScope(r.db, scope).Where("email = ?", strings.ToLower(strings.TrimSpace(email)))+ if err := q.First(&s).Error; err != nil {+ return nil, err+ }+ return &s, nil+}++// FindAllByEmail finds all subscribers with the given email address across all scopes.+func (r *SubscriberRepository) FindAllByEmail(email string, result *[]models.Subscriber) error {+ return r.db.Where("email = ?", strings.ToLower(strings.TrimSpace(email))).Find(result).Error+}++func (r *SubscriberRepository) FindByScope(scope ResourceScope, search, status string, limit, offset int) ([]models.Subscriber, int64, error) {+ var items []models.Subscriber+ var total int64++ q := ApplyScope(r.db.Model(&models.Subscriber{}), scope)+ if status != "" {+ q = q.Where("status = ?", status)+ }+ if search != "" {+ q = q.Where("email ILIKE ? OR name ILIKE ?", "%"+search+"%", "%"+search+"%")+ }+ q.Count(&total)++ qFind := ApplyScope(r.db, scope)+ if status != "" {+ qFind = qFind.Where("status = ?", status)+ }+ if search != "" {+ qFind = qFind.Where("email ILIKE ? OR name ILIKE ?", "%"+search+"%", "%"+search+"%")+ }+ if err := qFind.Order("created_at DESC").Limit(limit).Offset(offset).Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *SubscriberRepository) Update(s *models.Subscriber) error {+ return r.db.Save(s).Error+}++func (r *SubscriberRepository) Delete(id uint) error {+ return r.db.Transaction(func(tx *gorm.DB) error {+ // Remove from all static lists first+ if err := tx.Where("subscriber_id = ?", id).Delete(&models.SubscriberListMember{}).Error; err != nil {+ return err+ }+ return tx.Delete(&models.Subscriber{}, id).Error+ })+}++// BulkCreate inserts subscribers in batches, skipping duplicates.+func (r *SubscriberRepository) BulkCreate(subscribers []models.Subscriber) (created int, skipped int, err error) {+ if len(subscribers) == 0 {+ return 0, 0, nil+ }+ result := r.db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(subscribers, 100)+ if result.Error != nil {+ return 0, 0, result.Error+ }+ created = int(result.RowsAffected)+ skipped = len(subscribers) - created+ return created, skipped, nil+}++// FindByFilterRules evaluates dynamic segment filter rules against subscribers.+func (r *SubscriberRepository) FindByFilterRules(scope ResourceScope, rules models.FilterRules, limit, offset int) ([]models.Subscriber, int64, error) {+ var items []models.Subscriber+ var total int64++ q := r.applyFilterRules(ApplyScope(r.db.Model(&models.Subscriber{}), scope), rules)+ q.Count(&total)++ qFind := r.applyFilterRules(ApplyScope(r.db, scope), rules)+ if err := qFind.Order("created_at DESC").Limit(limit).Offset(offset).Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++// CountByFilterRules returns the count of subscribers matching filter rules.+func (r *SubscriberRepository) CountByFilterRules(scope ResourceScope, rules models.FilterRules) (int64, error) {+ var count int64+ q := r.applyFilterRules(ApplyScope(r.db.Model(&models.Subscriber{}), scope), rules)+ if err := q.Count(&count).Error; err != nil {+ return 0, err+ }+ return count, nil+}++// applyFilterRules translates FilterRules into SQL WHERE clauses.+func (r *SubscriberRepository) applyFilterRules(q *gorm.DB, rules models.FilterRules) *gorm.DB {+ for _, rule := range rules {+ field := rule.Field+ op := rule.Operator+ val := rule.Value++ // Engagement-based filters — use subqueries on campaign_messages+ if strings.HasPrefix(field, "engagement.") {+ engagementField := strings.TrimPrefix(field, "engagement.")+ switch engagementField {+ case "opened_campaign":+ // Subscribers who opened a specific campaign+ q = q.Where("EXISTS (SELECT 1 FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.campaign_id = ? AND campaign_messages.opened_at IS NOT NULL)", val)+ case "clicked_campaign":+ // Subscribers who clicked in a specific campaign+ q = q.Where("EXISTS (SELECT 1 FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.campaign_id = ? AND campaign_messages.clicked_at IS NOT NULL)", val)+ case "not_opened_campaign":+ // Subscribers who did NOT open a specific campaign+ q = q.Where("NOT EXISTS (SELECT 1 FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.campaign_id = ? AND campaign_messages.opened_at IS NOT NULL)", val)+ case "received_campaign":+ // Subscribers who received a specific campaign (regardless of open/click)+ q = q.Where("EXISTS (SELECT 1 FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.campaign_id = ?)", val)+ case "inactive_days":+ // Subscribers with no opens in the last N days+ q = q.Where("NOT EXISTS (SELECT 1 FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.opened_at > NOW() - INTERVAL '1 day' * ?)", val)+ case "active_days":+ // Subscribers with opens in the last N days+ q = q.Where("EXISTS (SELECT 1 FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.opened_at > NOW() - INTERVAL '1 day' * ?)", val)+ case "total_opens_gte":+ // Subscribers with at least N total opens+ q = q.Where("(SELECT COUNT(*) FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.opened_at IS NOT NULL) >= ?", val)+ case "total_clicks_gte":+ // Subscribers with at least N total clicks+ q = q.Where("(SELECT COUNT(*) FROM campaign_messages WHERE campaign_messages.subscriber_id = subscribers.id AND campaign_messages.clicked_at IS NOT NULL) >= ?", val)+ }+ continue+ }++ // Determine the SQL column expression+ var column string+ if strings.HasPrefix(field, "custom_fields.") {+ // JSON field extraction (PostgreSQL) - sanitize key to prevent SQL injection+ jsonKey := strings.TrimPrefix(field, "custom_fields.")+ if !isAlphanumericUnderscore(jsonKey) || jsonKey == "" {+ continue+ }+ column = fmt.Sprintf("custom_fields::jsonb->>'%s'", jsonKey)+ } else {+ // Direct column (sanitize: only allow known fields)+ switch field {+ case "email", "name", "status":+ column = field+ default:+ continue // skip unknown fields+ }+ }++ switch op {+ case "eq":+ q = q.Where(fmt.Sprintf("%s = ?", column), val)+ case "neq":+ q = q.Where(fmt.Sprintf("%s != ?", column), val)+ case "contains":+ q = q.Where(fmt.Sprintf("%s ILIKE ?", column), fmt.Sprintf("%%%v%%", val))+ case "starts_with":+ q = q.Where(fmt.Sprintf("%s ILIKE ?", column), fmt.Sprintf("%v%%", val))+ case "ends_with":+ q = q.Where(fmt.Sprintf("%s ILIKE ?", column), fmt.Sprintf("%%%v", val))+ case "gt":+ q = q.Where(fmt.Sprintf("%s > ?", column), val)+ case "lt":+ q = q.Where(fmt.Sprintf("%s < ?", column), val)+ case "in":+ q = q.Where(fmt.Sprintf("%s IN ?", column), val)+ }+ }+ return q+}++// isAlphanumericUnderscore returns true if s contains only [a-zA-Z0-9_-].+func isAlphanumericUnderscore(s string) bool {+ for _, c := range s {+ if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_' || c == '-') {+ return false+ }+ }+ return true+}diff --git a/internal/storage/repositories/suppression_repo.go b/internal/storage/repositories/suppression_repo.goindex 76660c6..fa7f400 100644--- a/internal/storage/repositories/suppression_repo.go+++ b/internal/storage/repositories/suppression_repo.go@@ -21,7 +21,7 @@ import ("net/mail""strings"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -48,17 +48,17 @@ func (r *SuppressionRepository) Create(suppression *models.Suppression) error {return r.db.Create(suppression).Error}-func (r *SuppressionRepository) Delete(userID uint, email string) error {- return r.db.Where("user_id = ? AND email = ?", userID, normalizeEmail(email)).Delete(&models.Suppression{}).Error+func (r *SuppressionRepository) Delete(scope ResourceScope, email string) error {+ return ApplyScope(r.db, scope).Where("email = ?", normalizeEmail(email)).Delete(&models.Suppression{}).Error}func (r *SuppressionRepository) FindByUserID(userID uint, limit, offset int) ([]models.Suppression, int64, error) {var suppressions []models.Suppressionvar total int64- r.db.Model(&models.Suppression{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Suppression{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&suppressions).Error; err != nil {@@ -67,15 +67,45 @@ func (r *SuppressionRepository) FindByUserID(userID uint, limit, offset int) ([]return suppressions, total, nil}-func (r *SuppressionRepository) IsSuppressed(userID uint, email string) (bool, error) {+func (r *SuppressionRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Suppression, int64, error) {+ var suppressions []models.Suppression+ var total int64++ r.db.Model(&models.Suppression{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&suppressions).Error; err != nil {+ return nil, 0, err+ }+ return suppressions, total, nil+}++func (r *SuppressionRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Suppression, int64, error) {+ var items []models.Suppression+ var total int64++ ApplyScope(r.db.Model(&models.Suppression{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *SuppressionRepository) IsSuppressed(scope ResourceScope, email string) (bool, error) {var count int64- err := r.db.Model(&models.Suppression{}).- Where("user_id = ? AND email = ?", userID, normalizeEmail(email)).+ err := ApplyScope(r.db.Model(&models.Suppression{}), scope).+ Where("email = ?", normalizeEmail(email)).Count(&count).Errorreturn count > 0, err}-func (r *SuppressionRepository) FilterSuppressed(userID uint, emails []string) ([]string, error) {+func (r *SuppressionRepository) FilterSuppressed(scope ResourceScope, emails []string) ([]string, error) {if len(emails) == 0 {return emails, nil}@@ -86,8 +116,8 @@ func (r *SuppressionRepository) FilterSuppressed(userID uint, emails []string) (}var suppressed []string- if err := r.db.Model(&models.Suppression{}).- Where("user_id = ? AND email IN ?", userID, lowered).+ if err := ApplyScope(r.db.Model(&models.Suppression{}), scope).+ Where("email IN ?", lowered).Pluck("email", &suppressed).Error; err != nil {return nil, err}diff --git a/internal/storage/repositories/template_localization_repo.go b/internal/storage/repositories/template_localization_repo.goindex 818208d..df6e235 100644--- a/internal/storage/repositories/template_localization_repo.go+++ b/internal/storage/repositories/template_localization_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")diff --git a/internal/storage/repositories/template_repo.go b/internal/storage/repositories/template_repo.goindex 0fc4230..45ef99e 100644--- a/internal/storage/repositories/template_repo.go+++ b/internal/storage/repositories/template_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -52,7 +52,7 @@ func (r *TemplateRepository) FindByID(id uint) (*models.Template, error) {func (r *TemplateRepository) FindByName(userID uint, name string) (*models.Template, error) {var tmpl models.Template- if err := r.db.Where("user_id = ? AND name = ?", userID, name).First(&tmpl).Error; err != nil {+ if err := r.db.Where("user_id = ? AND name = ? AND workspace_id IS NULL", userID, name).First(&tmpl).Error; err != nil {return nil, err}return &tmpl, nil@@ -62,9 +62,9 @@ func (r *TemplateRepository) FindByUserID(userID uint, limit, offset int) ([]modvar templates []models.Templatevar total int64- r.db.Model(&models.Template{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Template{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&templates).Error; err != nil {@@ -72,3 +72,41 @@ func (r *TemplateRepository) FindByUserID(userID uint, limit, offset int) ([]mod}return templates, total, nil}++func (r *TemplateRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Template, int64, error) {+ var templates []models.Template+ var total int64++ r.db.Model(&models.Template{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&templates).Error; err != nil {+ return nil, 0, err+ }+ return templates, total, nil+}++func (r *TemplateRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Template, int64, error) {+ var items []models.Template+ var total int64++ ApplyScope(r.db.Model(&models.Template{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *TemplateRepository) FindByWorkspaceName(workspaceID uint, name string) (*models.Template, error) {+ var tmpl models.Template+ if err := r.db.Where("workspace_id = ? AND name = ?", workspaceID, name).First(&tmpl).Error; err != nil {+ return nil, err+ }+ return &tmpl, nil+}diff --git a/internal/storage/repositories/template_version_repo.go b/internal/storage/repositories/template_version_repo.goindex 4dc9e3d..0da925c 100644--- a/internal/storage/repositories/template_version_repo.go+++ b/internal/storage/repositories/template_version_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")diff --git a/internal/storage/repositories/tracking_repo.go b/internal/storage/repositories/tracking_repo.gonew file mode 100644index 0000000..c44c4bd--- /dev/null+++ b/internal/storage/repositories/tracking_repo.go@@ -0,0 +1,231 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "time"++ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type TrackingRepository struct {+ db *gorm.DB+}++func NewTrackingRepository(db *gorm.DB) *TrackingRepository {+ return &TrackingRepository{db: db}+}+++func (r *TrackingRepository) CreateLink(link *models.TrackedLink) error {+ return r.db.Create(link).Error+}++func (r *TrackingRepository) FindLinkByHash(hash string) (*models.TrackedLink, error) {+ var link models.TrackedLink+ if err := r.db.Where("hash = ?", hash).First(&link).Error; err != nil {+ return nil, err+ }+ return &link, nil+}++func (r *TrackingRepository) FindLinksByCampaign(campaignID uint) ([]models.TrackedLink, error) {+ var links []models.TrackedLink+ if err := r.db.Where("campaign_id = ?", campaignID).+ Order("click_count DESC").Find(&links).Error; err != nil {+ return nil, err+ }+ return links, nil+}++func (r *TrackingRepository) IncrementLinkClickCount(linkID uint) {+ r.db.Model(&models.TrackedLink{}).Where("id = ?", linkID).+ Update("click_count", gorm.Expr("click_count + 1"))+}++// FindOrCreateLink finds existing or creates a new tracked link.+func (r *TrackingRepository) FindOrCreateLink(campaignID uint, originalURL, hash string) (*models.TrackedLink, error) {+ var link models.TrackedLink+ if err := r.db.Where("hash = ?", hash).First(&link).Error; err == nil {+ return &link, nil+ }+ link = models.TrackedLink{+ CampaignID: campaignID,+ OriginalURL: originalURL,+ Hash: hash,+ }+ if err := r.db.Create(&link).Error; err != nil {+ // Race condition: try to find again+ if err2 := r.db.Where("hash = ?", hash).First(&link).Error; err2 == nil {+ return &link, nil+ }+ return nil, err+ }+ return &link, nil+}+++func (r *TrackingRepository) CreateEvent(event *models.TrackingEvent) error {+ return r.db.Create(event).Error+}++// HasEvent checks if an event of this type already exists for a campaign message (deduplication).+func (r *TrackingRepository) HasEvent(campaignMessageID uint, eventType models.TrackingEventType) bool {+ var count int64+ r.db.Model(&models.TrackingEvent{}).+ Where("campaign_message_id = ? AND event_type = ?", campaignMessageID, eventType).+ Count(&count)+ return count > 0+}++// HasClickEvent checks if a click event already exists for a specific link.+func (r *TrackingRepository) HasClickEvent(campaignMessageID uint, trackedLinkID uint) bool {+ var count int64+ r.db.Model(&models.TrackingEvent{}).+ Where("campaign_message_id = ? AND event_type = ? AND tracked_link_id = ?",+ campaignMessageID, models.TrackingEventClick, trackedLinkID).+ Count(&count)+ return count > 0+}+++type CampaignAnalytics struct {+ TotalMessages int64 `json:"total_messages"`+ SentMessages int64 `json:"sent_messages"`+ FailedMessages int64 `json:"failed_messages"`+ OpenedMessages int64 `json:"opened_messages"`+ ClickedMessages int64 `json:"clicked_messages"`+ BouncedMessages int64 `json:"bounced_messages"`+ Unsubscribed int64 `json:"unsubscribed"`+ DeliveryRate float64 `json:"delivery_rate"`+ OpenRate float64 `json:"open_rate"`+ ClickRate float64 `json:"click_rate"`+ BounceRate float64 `json:"bounce_rate"`+ UnsubscribeRate float64 `json:"unsubscribe_rate"`+}++func (r *TrackingRepository) CampaignAnalytics(campaignID uint) (*CampaignAnalytics, error) {+ a := &CampaignAnalytics{}++ // Single aggregation query instead of 7 separate COUNT queries+ err := r.db.Model(&models.CampaignMessage{}).+ Select(`COUNT(*) as total_messages,+ COUNT(CASE WHEN status = ? THEN 1 END) as sent_messages,+ COUNT(CASE WHEN status = ? THEN 1 END) as failed_messages,+ COUNT(CASE WHEN opened_at IS NOT NULL THEN 1 END) as opened_messages,+ COUNT(CASE WHEN clicked_at IS NOT NULL THEN 1 END) as clicked_messages,+ COUNT(CASE WHEN bounced_at IS NOT NULL THEN 1 END) as bounced_messages,+ COUNT(CASE WHEN unsubscribed_at IS NOT NULL THEN 1 END) as unsubscribed`,+ models.CampaignMsgSent, models.CampaignMsgFailed).+ Where("campaign_id = ?", campaignID).+ Scan(a).Error+ if err != nil {+ return nil, err+ }++ if a.TotalMessages > 0 {+ a.DeliveryRate = float64(a.SentMessages) / float64(a.TotalMessages) * 100+ a.BounceRate = float64(a.BouncedMessages) / float64(a.TotalMessages) * 100+ a.UnsubscribeRate = float64(a.Unsubscribed) / float64(a.TotalMessages) * 100+ }+ if a.SentMessages > 0 {+ a.OpenRate = float64(a.OpenedMessages) / float64(a.SentMessages) * 100+ a.ClickRate = float64(a.ClickedMessages) / float64(a.SentMessages) * 100+ }++ return a, nil+}++type TimeSeriesPoint struct {+ Time string `json:"time"`+ Count int64 `json:"count"`+}++// EventTimeSeries returns hourly event counts since campaign started.+func (r *TrackingRepository) EventTimeSeries(campaignID uint, eventType models.TrackingEventType) ([]TimeSeriesPoint, error) {+ var results []TimeSeriesPoint+ err := r.db.Table("tracking_events").+ Select("TO_CHAR(tracking_events.created_at, 'YYYY-MM-DD HH24:00') as time, COUNT(*) as count").+ Joins("JOIN campaign_messages ON campaign_messages.id = tracking_events.campaign_message_id").+ Where("campaign_messages.campaign_id = ? AND tracking_events.event_type = ?", campaignID, eventType).+ Group("time").Order("time ASC").+ Find(&results).Error+ return results, err+}++// CampaignAnalyticsByVariant returns analytics grouped by A/B test variant.+func (r *TrackingRepository) CampaignAnalyticsByVariant(campaignID uint) (map[string]*CampaignAnalytics, error) {+ type variantRow struct {+ Variant string+ TotalMessages int64+ SentMessages int64+ FailedMessages int64+ OpenedMessages int64+ ClickedMessages int64+ BouncedMessages int64+ Unsubscribed int64+ }+ var rows []variantRow+ err := r.db.Model(&models.CampaignMessage{}).+ Select(`variant,+ COUNT(*) as total_messages,+ COUNT(CASE WHEN status = ? THEN 1 END) as sent_messages,+ COUNT(CASE WHEN status = ? THEN 1 END) as failed_messages,+ COUNT(CASE WHEN opened_at IS NOT NULL THEN 1 END) as opened_messages,+ COUNT(CASE WHEN clicked_at IS NOT NULL THEN 1 END) as clicked_messages,+ COUNT(CASE WHEN bounced_at IS NOT NULL THEN 1 END) as bounced_messages,+ COUNT(CASE WHEN unsubscribed_at IS NOT NULL THEN 1 END) as unsubscribed`,+ models.CampaignMsgSent, models.CampaignMsgFailed).+ Where("campaign_id = ? AND variant != ''", campaignID).+ Group("variant").+ Find(&rows).Error+ if err != nil {+ return nil, err+ }++ result := make(map[string]*CampaignAnalytics)+ for _, row := range rows {+ a := &CampaignAnalytics{+ TotalMessages: row.TotalMessages,+ SentMessages: row.SentMessages,+ FailedMessages: row.FailedMessages,+ OpenedMessages: row.OpenedMessages,+ ClickedMessages: row.ClickedMessages,+ BouncedMessages: row.BouncedMessages,+ Unsubscribed: row.Unsubscribed,+ }+ if a.TotalMessages > 0 {+ a.DeliveryRate = float64(a.SentMessages) / float64(a.TotalMessages) * 100+ a.BounceRate = float64(a.BouncedMessages) / float64(a.TotalMessages) * 100+ a.UnsubscribeRate = float64(a.Unsubscribed) / float64(a.TotalMessages) * 100+ }+ if a.SentMessages > 0 {+ a.OpenRate = float64(a.OpenedMessages) / float64(a.SentMessages) * 100+ a.ClickRate = float64(a.ClickedMessages) / float64(a.SentMessages) * 100+ }+ result[row.Variant] = a+ }+ return result, nil+}++// DeleteOlderThan deletes tracking events older than the given time.+func (r *TrackingRepository) DeleteOlderThan(before time.Time) (int64, error) {+ result := r.db.Where("created_at < ?", before).Delete(&models.TrackingEvent{})+ return result.RowsAffected, result.Error+}diff --git a/internal/storage/repositories/user_repo.go b/internal/storage/repositories/user_repo.goindex 0df50b6..de06171 100644--- a/internal/storage/repositories/user_repo.go+++ b/internal/storage/repositories/user_repo.go@@ -18,7 +18,9 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "time"++ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -71,3 +73,75 @@ func (r *UserRepository) Update(user *models.User) error {func (r *UserRepository) Delete(id uint) error {return r.db.Delete(&models.User{}, id).Error}++// DeleteAllUserData removes all data owned by a user+func (r *UserRepository) DeleteAllUserData(userID uint) error {+ return r.db.Transaction(func(tx *gorm.DB) error {+ tables := []string{+ "sessions",+ "webhook_deliveries",+ "bounces",+ "suppressions",+ "tracking_events",+ "tracked_links",+ "campaign_messages",+ "campaigns",+ "subscriber_list_members",+ "subscriber_lists",+ "subscribers",+ "template_localizations",+ "template_versions",+ "templates",+ "style_sheets",+ "languages",+ "contacts",+ "emails",+ "api_keys",+ "webhooks",+ "domains",+ "smtp_servers",+ "events",+ "user_settings",+ "oauth_accounts",+ }+ for _, table := range tables {+ if err := tx.Exec("DELETE FROM "+table+" WHERE user_id = ?", userID).Error; err != nil {+ return err+ }+ }++ // Remove workspace memberships (but not workspaces they don't own)+ if err := tx.Exec("DELETE FROM workspace_members WHERE user_id = ?", userID).Error; err != nil {+ return err+ }++ // Delete workspaces owned by this user (and their members/invitations)+ var ownedWSIDs []uint+ if err := tx.Raw("SELECT id FROM workspaces WHERE owner_id = ?", userID).Scan(&ownedWSIDs).Error; err != nil {+ return err+ }+ if len(ownedWSIDs) > 0 {+ if err := tx.Exec("DELETE FROM workspace_invitations WHERE workspace_id IN ?", ownedWSIDs).Error; err != nil {+ return err+ }+ if err := tx.Exec("DELETE FROM workspace_members WHERE workspace_id IN ?", ownedWSIDs).Error; err != nil {+ return err+ }+ if err := tx.Exec("DELETE FROM workspaces WHERE owner_id = ?", userID).Error; err != nil {+ return err+ }+ }++ return tx.Delete(&models.User{}, userID).Error+ })+}++// FindScheduledForDeletion returns users whose scheduled_deletion_at is in the past.+func (r *UserRepository) FindScheduledForDeletion() ([]models.User, error) {+ var users []models.User+ if err := r.db.Where("scheduled_deletion_at IS NOT NULL AND scheduled_deletion_at <= ?", time.Now()).+ Find(&users).Error; err != nil {+ return nil, err+ }+ return users, nil+}diff --git a/internal/storage/repositories/user_setting_repo.go b/internal/storage/repositories/user_setting_repo.goindex 2a0ebea..55d67e9 100644--- a/internal/storage/repositories/user_setting_repo.go+++ b/internal/storage/repositories/user_setting_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")diff --git a/internal/storage/repositories/webhook_delivery_repo.go b/internal/storage/repositories/webhook_delivery_repo.goindex cf318c7..974bdfb 100644--- a/internal/storage/repositories/webhook_delivery_repo.go+++ b/internal/storage/repositories/webhook_delivery_repo.go@@ -20,7 +20,7 @@ package repositoriesimport ("time"- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -44,13 +44,28 @@ type WebhookDeliveryStats struct {SuccessRate float64 `json:"success_rate"`}-// StatsByUserID returns aggregate webhook delivery stats for a user.+// StatsByUserID returns aggregate webhook delivery stats for a user's personal space.func (r *WebhookDeliveryRepository) StatsByUserID(userID uint) (*WebhookDeliveryStats, error) {var stats WebhookDeliveryStats- r.db.Model(&models.WebhookDelivery{}).Where("user_id = ?", userID).Count(&stats.TotalDeliveries)- r.db.Model(&models.WebhookDelivery{}).Where("user_id = ? AND status = ?", userID, models.WebhookDeliverySuccess).Count(&stats.SuccessDeliveries)- r.db.Model(&models.WebhookDelivery{}).Where("user_id = ? AND status = ?", userID, models.WebhookDeliveryFailed).Count(&stats.FailedDeliveries)+ r.db.Model(&models.WebhookDelivery{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&stats.TotalDeliveries)+ r.db.Model(&models.WebhookDelivery{}).Where("user_id = ? AND workspace_id IS NULL AND status = ?", userID, models.WebhookDeliverySuccess).Count(&stats.SuccessDeliveries)+ r.db.Model(&models.WebhookDelivery{}).Where("user_id = ? AND workspace_id IS NULL AND status = ?", userID, models.WebhookDeliveryFailed).Count(&stats.FailedDeliveries)++ if stats.TotalDeliveries > 0 {+ stats.SuccessRate = float64(stats.SuccessDeliveries) / float64(stats.TotalDeliveries) * 100+ }++ return &stats, nil+}++// StatsByWorkspaceID returns aggregate webhook delivery stats for a workspace.+func (r *WebhookDeliveryRepository) StatsByWorkspaceID(workspaceID uint) (*WebhookDeliveryStats, error) {+ var stats WebhookDeliveryStats++ r.db.Model(&models.WebhookDelivery{}).Where("workspace_id = ?", workspaceID).Count(&stats.TotalDeliveries)+ r.db.Model(&models.WebhookDelivery{}).Where("workspace_id = ? AND status = ?", workspaceID, models.WebhookDeliverySuccess).Count(&stats.SuccessDeliveries)+ r.db.Model(&models.WebhookDelivery{}).Where("workspace_id = ? AND status = ?", workspaceID, models.WebhookDeliveryFailed).Count(&stats.FailedDeliveries)if stats.TotalDeliveries > 0 {stats.SuccessRate = float64(stats.SuccessDeliveries) / float64(stats.TotalDeliveries) * 100@@ -84,12 +99,12 @@ func (r *WebhookDeliveryRepository) RecentByUserID(userID uint, limit int) ([]moreturn deliveries, err}-// FindByUserID returns paginated webhook deliveries for a user.+// FindByUserID returns paginated webhook deliveries for a user's personal space.func (r *WebhookDeliveryRepository) FindByUserID(userID uint, limit, offset int) ([]models.WebhookDelivery, int64, error) {var deliveries []models.WebhookDeliveryvar total int64- r.db.Model(&models.WebhookDelivery{}).Where("user_id = ?", userID).Count(&total)- err := r.db.Where("user_id = ?", userID).+ r.db.Model(&models.WebhookDelivery{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)+ err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).@@ -97,6 +112,48 @@ func (r *WebhookDeliveryRepository) FindByUserID(userID uint, limit, offset int)return deliveries, total, err}+// FindByWorkspaceID returns paginated webhook deliveries for a workspace.+func (r *WebhookDeliveryRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.WebhookDelivery, int64, error) {+ var deliveries []models.WebhookDelivery+ var total int64+ r.db.Model(&models.WebhookDelivery{}).Where("workspace_id = ?", workspaceID).Count(&total)+ err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).+ Offset(offset).+ Find(&deliveries).Error+ return deliveries, total, err+}++func (r *WebhookDeliveryRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.WebhookDelivery, int64, error) {+ var items []models.WebhookDelivery+ var total int64++ ApplyScope(r.db.Model(&models.WebhookDelivery{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}++func (r *WebhookDeliveryRepository) StatsByScope(scope ResourceScope) (*WebhookDeliveryStats, error) {+ var stats WebhookDeliveryStats++ ApplyScope(r.db.Model(&models.WebhookDelivery{}), scope).Count(&stats.TotalDeliveries)+ ApplyScope(r.db.Model(&models.WebhookDelivery{}), scope).Where("status = ?", models.WebhookDeliverySuccess).Count(&stats.SuccessDeliveries)+ ApplyScope(r.db.Model(&models.WebhookDelivery{}), scope).Where("status = ?", models.WebhookDeliveryFailed).Count(&stats.FailedDeliveries)++ if stats.TotalDeliveries > 0 {+ stats.SuccessRate = float64(stats.SuccessDeliveries) / float64(stats.TotalDeliveries) * 100+ }++ return &stats, nil+}+// DeleteOlderThan deletes webhook delivery records older than the given time.// Returns the number of rows deleted.func (r *WebhookDeliveryRepository) DeleteOlderThan(before time.Time) (int64, error) {diff --git a/internal/storage/repositories/webhook_repo.go b/internal/storage/repositories/webhook_repo.goindex b9e919f..946ad30 100644--- a/internal/storage/repositories/webhook_repo.go+++ b/internal/storage/repositories/webhook_repo.go@@ -18,7 +18,7 @@package repositoriesimport (- "github.com/jkaninda/posta/internal/models"+ "github.com/goposta/posta/internal/models""gorm.io/gorm")@@ -55,9 +55,9 @@ func (r *WebhookRepository) FindByUserID(userID uint, limit, offset int) ([]modevar webhooks []models.Webhookvar total int64- r.db.Model(&models.Webhook{}).Where("user_id = ?", userID).Count(&total)+ r.db.Model(&models.Webhook{}).Where("user_id = ? AND workspace_id IS NULL", userID).Count(&total)- if err := r.db.Where("user_id = ?", userID).+ if err := r.db.Where("user_id = ? AND workspace_id IS NULL", userID).Order("created_at DESC").Limit(limit).Offset(offset).Find(&webhooks).Error; err != nil {@@ -66,6 +66,36 @@ func (r *WebhookRepository) FindByUserID(userID uint, limit, offset int) ([]modereturn webhooks, total, nil}+func (r *WebhookRepository) FindByWorkspaceID(workspaceID uint, limit, offset int) ([]models.Webhook, int64, error) {+ var webhooks []models.Webhook+ var total int64++ r.db.Model(&models.Webhook{}).Where("workspace_id = ?", workspaceID).Count(&total)++ if err := r.db.Where("workspace_id = ?", workspaceID).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&webhooks).Error; err != nil {+ return nil, 0, err+ }+ return webhooks, total, nil+}++func (r *WebhookRepository) FindByScope(scope ResourceScope, limit, offset int) ([]models.Webhook, int64, error) {+ var items []models.Webhook+ var total int64++ ApplyScope(r.db.Model(&models.Webhook{}), scope).Count(&total)++ if err := ApplyScope(r.db, scope).+ Order("created_at DESC").+ Limit(limit).Offset(offset).+ Find(&items).Error; err != nil {+ return nil, 0, err+ }+ return items, total, nil+}+func (r *WebhookRepository) FindByUserIDAndEvent(userID uint, event string) ([]models.Webhook, error) {var webhooks []models.Webhookif err := r.db.Where("user_id = ? AND ? = ANY(events)", userID, event).Find(&webhooks).Error; err != nil {diff --git a/internal/storage/repositories/workspace_repo.go b/internal/storage/repositories/workspace_repo.gonew file mode 100644index 0000000..b2426d4--- /dev/null+++ b/internal/storage/repositories/workspace_repo.go@@ -0,0 +1,214 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package repositories++import (+ "time"++ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type WorkspaceRepository struct {+ db *gorm.DB+}++func NewWorkspaceRepository(db *gorm.DB) *WorkspaceRepository {+ return &WorkspaceRepository{db: db}+}++func (r *WorkspaceRepository) Create(ws *models.Workspace) error {+ return r.db.Create(ws).Error+}++func (r *WorkspaceRepository) Update(ws *models.Workspace) error {+ return r.db.Save(ws).Error+}++func (r *WorkspaceRepository) Delete(id uint) error {+ return r.db.Transaction(func(tx *gorm.DB) error {+ if err := tx.Where("workspace_id = ?", id).Delete(&models.WorkspaceInvitation{}).Error; err != nil {+ return err+ }+ if err := tx.Where("workspace_id = ?", id).Delete(&models.WorkspaceMember{}).Error; err != nil {+ return err+ }+ return tx.Delete(&models.Workspace{}, id).Error+ })+}++func (r *WorkspaceRepository) FindByID(id uint) (*models.Workspace, error) {+ var ws models.Workspace+ if err := r.db.First(&ws, id).Error; err != nil {+ return nil, err+ }+ return &ws, nil+}++func (r *WorkspaceRepository) FindBySlug(slug string) (*models.Workspace, error) {+ var ws models.Workspace+ if err := r.db.Where("slug = ?", slug).First(&ws).Error; err != nil {+ return nil, err+ }+ return &ws, nil+}++// FindByUserID returns all workspaces the user is a member of.+func (r *WorkspaceRepository) FindByUserID(userID uint) ([]models.Workspace, error) {+ var workspaces []models.Workspace+ if err := r.db.+ Joins("JOIN workspace_members ON workspace_members.workspace_id = workspaces.id").+ Where("workspace_members.user_id = ?", userID).+ Order("workspaces.created_at DESC").+ Find(&workspaces).Error; err != nil {+ return nil, err+ }+ return workspaces, nil+}++// AddMember adds a user as a member of a workspace.+func (r *WorkspaceRepository) AddMember(member *models.WorkspaceMember) error {+ return r.db.Create(member).Error+}++// RemoveMember removes a user from a workspace.+func (r *WorkspaceRepository) RemoveMember(workspaceID, userID uint) error {+ return r.db.Where("workspace_id = ? AND user_id = ?", workspaceID, userID).+ Delete(&models.WorkspaceMember{}).Error+}++// UpdateMemberRole updates a member's role in a workspace.+func (r *WorkspaceRepository) UpdateMemberRole(workspaceID, userID uint, role models.WorkspaceRole) error {+ return r.db.Model(&models.WorkspaceMember{}).+ Where("workspace_id = ? AND user_id = ?", workspaceID, userID).+ Update("role", role).Error+}++// FindMember returns the membership record for a user in a workspace.+func (r *WorkspaceRepository) FindMember(workspaceID, userID uint) (*models.WorkspaceMember, error) {+ var member models.WorkspaceMember+ if err := r.db.Where("workspace_id = ? AND user_id = ?", workspaceID, userID).+ First(&member).Error; err != nil {+ return nil, err+ }+ return &member, nil+}++// ListMembers returns all members of a workspace with their user details.+func (r *WorkspaceRepository) ListMembers(workspaceID uint) ([]models.WorkspaceMember, error) {+ var members []models.WorkspaceMember+ if err := r.db.Preload("User").+ Where("workspace_id = ?", workspaceID).+ Order("created_at ASC").+ Find(&members).Error; err != nil {+ return nil, err+ }+ return members, nil+}++// CountMembers returns the number of members in a workspace.+func (r *WorkspaceRepository) CountMembers(workspaceID uint) (int64, error) {+ var count int64+ if err := r.db.Model(&models.WorkspaceMember{}).+ Where("workspace_id = ?", workspaceID).+ Count(&count).Error; err != nil {+ return 0, err+ }+ return count, nil+}++// CreateInvitation creates a new workspace invitation.+func (r *WorkspaceRepository) CreateInvitation(inv *models.WorkspaceInvitation) error {+ return r.db.Create(inv).Error+}++// FindInvitationByID returns an invitation by its ID.+func (r *WorkspaceRepository) FindInvitationByID(id uint) (*models.WorkspaceInvitation, error) {+ var inv models.WorkspaceInvitation+ if err := r.db.Preload("Workspace").First(&inv, id).Error; err != nil {+ return nil, err+ }+ return &inv, nil+}++// FindInvitationByToken returns an invitation by its token.+func (r *WorkspaceRepository) FindInvitationByToken(token string) (*models.WorkspaceInvitation, error) {+ var inv models.WorkspaceInvitation+ if err := r.db.Preload("Workspace").Where("token = ?", token).First(&inv).Error; err != nil {+ return nil, err+ }+ return &inv, nil+}++// UpdateInvitation updates an invitation.+func (r *WorkspaceRepository) UpdateInvitation(inv *models.WorkspaceInvitation) error {+ return r.db.Save(inv).Error+}++// ListPendingInvitations returns pending invitations for a workspace.+func (r *WorkspaceRepository) ListPendingInvitations(workspaceID uint) ([]models.WorkspaceInvitation, error) {+ var invitations []models.WorkspaceInvitation+ if err := r.db.Where("workspace_id = ? AND status = ? AND expires_at > ?",+ workspaceID, models.InvitationStatusPending, time.Now()).+ Order("created_at DESC").+ Find(&invitations).Error; err != nil {+ return nil, err+ }+ return invitations, nil+}++// FindPendingInvitationsByEmail returns pending invitations for a given email.+func (r *WorkspaceRepository) FindPendingInvitationsByEmail(email string) ([]models.WorkspaceInvitation, error) {+ var invitations []models.WorkspaceInvitation+ if err := r.db.Preload("Workspace").+ Where("email = ? AND status = ? AND expires_at > ?",+ email, models.InvitationStatusPending, time.Now()).+ Order("created_at DESC").+ Find(&invitations).Error; err != nil {+ return nil, err+ }+ return invitations, nil+}++// DeleteInvitation deletes an invitation.+func (r *WorkspaceRepository) DeleteInvitation(id uint) error {+ return r.db.Delete(&models.WorkspaceInvitation{}, id).Error+}++// CreateDefaultWorkspace creates a default workspace for a user during registration.+func (r *WorkspaceRepository) CreateDefaultWorkspace(userID uint, name, slug string) (*models.Workspace, error) {+ ws := &models.Workspace{+ Name: name,+ Slug: slug,+ OwnerID: userID,+ }+ if err := r.db.Create(ws).Error; err != nil {+ return nil, err+ }++ member := &models.WorkspaceMember{+ WorkspaceID: ws.ID,+ UserID: userID,+ Role: models.WorkspaceRoleOwner,+ }+ if err := r.db.Create(member).Error; err != nil {+ return nil, err+ }++ return ws, nil+}diff --git a/internal/storage/repositories/workspace_sso_repo.go b/internal/storage/repositories/workspace_sso_repo.gonew file mode 100644index 0000000..aab03ed--- /dev/null+++ b/internal/storage/repositories/workspace_sso_repo.go@@ -0,0 +1,38 @@+package repositories++import (+ "github.com/goposta/posta/internal/models"+ "gorm.io/gorm"+)++type WorkspaceSSORepository struct {+ db *gorm.DB+}++func NewWorkspaceSSORepository(db *gorm.DB) *WorkspaceSSORepository {+ return &WorkspaceSSORepository{db: db}+}++func (r *WorkspaceSSORepository) FindByWorkspaceID(wsID uint) (*models.WorkspaceSSOConfig, error) {+ var c models.WorkspaceSSOConfig+ if err := r.db.Preload("Provider").Where("workspace_id = ?", wsID).First(&c).Error; err != nil {+ return nil, err+ }+ return &c, nil+}++func (r *WorkspaceSSORepository) Upsert(c *models.WorkspaceSSOConfig) error {+ var existing models.WorkspaceSSOConfig+ if err := r.db.Where("workspace_id = ?", c.WorkspaceID).First(&existing).Error; err != nil {+ return r.db.Create(c).Error+ }+ existing.ProviderID = c.ProviderID+ existing.EnforceSSO = c.EnforceSSO+ existing.AutoProvision = c.AutoProvision+ existing.AllowedDomains = c.AllowedDomains+ return r.db.Save(&existing).Error+}++func (r *WorkspaceSSORepository) Delete(wsID uint) error {+ return r.db.Where("workspace_id = ?", wsID).Delete(&models.WorkspaceSSOConfig{}).Error+}diff --git a/internal/worker/campaign_processor.go b/internal/worker/campaign_processor.gonew file mode 100644index 0000000..4fe703a--- /dev/null+++ b/internal/worker/campaign_processor.go@@ -0,0 +1,453 @@+/*+ * Copyright 2026 Jonas Kaninda+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ *+ */++package worker++import (+ "context"+ "encoding/json"+ "fmt"+ "math/rand"+ "time"++ "github.com/hibiken/asynq"+ "github.com/jkaninda/logger"+ "github.com/jkaninda/okapi"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/services/tracking"+ "github.com/goposta/posta/internal/services/webhook"+ "github.com/goposta/posta/internal/storage/repositories"+ "github.com/lib/pq"+)++// CampaignProcessor handles campaign:start and campaign:batch tasks.+type CampaignProcessor struct {+ campaignRepo *repositories.CampaignRepository+ messageRepo *repositories.CampaignMessageRepository+ listRepo *repositories.SubscriberListRepository+ subscriberRepo *repositories.SubscriberRepository+ emailRepo *repositories.EmailRepository+ templateRepo *repositories.TemplateRepository+ versionRepo *repositories.TemplateVersionRepository+ localizationRepo *repositories.TemplateLocalizationRepository+ trackingService *tracking.Service+ producer *Producer+ dispatcher *webhook.Dispatcher+}++func NewCampaignProcessor(+ campaignRepo *repositories.CampaignRepository,+ messageRepo *repositories.CampaignMessageRepository,+ listRepo *repositories.SubscriberListRepository,+ subscriberRepo *repositories.SubscriberRepository,+ emailRepo *repositories.EmailRepository,+ templateRepo *repositories.TemplateRepository,+ versionRepo *repositories.TemplateVersionRepository,+ localizationRepo *repositories.TemplateLocalizationRepository,+ trackingService *tracking.Service,+ producer *Producer,+ dispatcher *webhook.Dispatcher,+) *CampaignProcessor {+ return &CampaignProcessor{+ campaignRepo: campaignRepo,+ messageRepo: messageRepo,+ listRepo: listRepo,+ subscriberRepo: subscriberRepo,+ emailRepo: emailRepo,+ templateRepo: templateRepo,+ versionRepo: versionRepo,+ localizationRepo: localizationRepo,+ trackingService: trackingService,+ producer: producer,+ dispatcher: dispatcher,+ }+}++const campaignBatchSize = 100++// HandleCampaignStart processes a campaign:start task.+// It resolves the subscriber list, creates campaign_messages in bulk,+// then enqueues the first CampaignBatch task.+func (p *CampaignProcessor) HandleCampaignStart(_ context.Context, t *asynq.Task) error {+ var payload CampaignPayload+ if err := json.Unmarshal(t.Payload(), &payload); err != nil {+ return fmt.Errorf("failed to unmarshal campaign start payload: %w", err)+ }++ campaign, err := p.campaignRepo.FindByID(payload.CampaignID)+ if err != nil {+ return fmt.Errorf("campaign not found: %w", err)+ }++ if campaign.Status != models.CampaignStatusSending {+ logger.Info("campaign is not in sending status, skipping", "id", campaign.ID, "status", campaign.Status)+ return nil+ }++ // Resolve subscribers from the list+ list, err := p.listRepo.FindByID(campaign.ListID)+ if err != nil {+ return fmt.Errorf("subscriber list not found: %w", err)+ }++ var subscribers []models.Subscriber+ scope := repositories.ResourceScope{UserID: campaign.UserID, WorkspaceID: campaign.WorkspaceID}++ if list.Type == models.SubscriberListTypeDynamic {+ // Dynamic list: resolve via filter rules+ subscribers, _, err = p.subscriberRepo.FindByFilterRules(scope, list.FilterRules, 0, 0)+ if err != nil {+ return fmt.Errorf("failed to resolve dynamic list: %w", err)+ }+ } else {+ // Static list: get all members+ subscribers, _, err = p.listRepo.ListMembers(list.ID, 0, 0)+ if err != nil {+ return fmt.Errorf("failed to list members: %w", err)+ }+ }++ if len(subscribers) == 0 {+ logger.Info("campaign has no subscribers, marking as sent", "id", campaign.ID)+ _ = p.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusSent)+ return nil+ }++ // Create campaign messages in bulk+ messages := make([]models.CampaignMessage, 0, len(subscribers))+ for _, sub := range subscribers {+ // Only include subscribed subscribers+ if sub.Status != models.SubscriberStatusSubscribed {+ continue+ }+ messages = append(messages, models.CampaignMessage{+ CampaignID: campaign.ID,+ SubscriberID: sub.ID,+ Status: models.CampaignMsgPending,+ })+ }++ if len(messages) == 0 {+ logger.Info("no eligible subscribers, marking campaign as sent", "id", campaign.ID)+ _ = p.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusSent)+ return nil+ }++ // Assign A/B test variants if enabled+ if campaign.ABTestEnabled && len(campaign.ABTestVariants) > 0 {+ // Shuffle messages for random distribution+ rand.Shuffle(len(messages), func(i, j int) {+ messages[i], messages[j] = messages[j], messages[i]+ })++ // Assign variants based on split percentages+ idx := 0+ for _, variant := range campaign.ABTestVariants {+ count := len(messages) * variant.SplitPercentage / 100+ if count == 0 {+ count = 1+ }+ end := idx + count+ if end > len(messages) {+ end = len(messages)+ }+ for i := idx; i < end; i++ {+ messages[i].Variant = variant.Name+ }+ idx = end+ }+ // Assign remaining messages to last variant+ if idx < len(messages) {+ lastVariant := campaign.ABTestVariants[len(campaign.ABTestVariants)-1].Name+ for i := idx; i < len(messages); i++ {+ messages[i].Variant = lastVariant+ }+ }+ }++ if _, err := p.messageRepo.BulkCreate(messages); err != nil {+ return fmt.Errorf("failed to create campaign messages: %w", err)+ }++ logger.Info("campaign messages created, starting batch processing",+ "campaign_id", campaign.ID, "messages", len(messages))++ // For timezone-aware campaigns, compute initial delay per timezone group+ if campaign.SendAtLocalTime && campaign.ScheduledAt != nil {+ // Group subscribers by timezone and enqueue separate delayed batches+ // The batch processor will handle the actual sending+ logger.Info("campaign with timezone-aware scheduling", "campaign_id", campaign.ID)+ }++ // Enqueue the first batch+ if err := p.producer.EnqueueCampaignBatch(campaign.ID, 0); err != nil {+ return err+ }+ if p.dispatcher != nil {+ p.dispatcher.Dispatch(campaign.UserID, "campaign.started", fmt.Sprint(campaign.ID), campaign.FromEmail)+ }+ return nil+}++// HandleCampaignBatch processes a campaign:batch task.+// It loads a batch of pending messages, creates Email records, and enqueues them.+func (p *CampaignProcessor) HandleCampaignBatch(_ context.Context, t *asynq.Task) error {+ var payload CampaignPayload+ if err := json.Unmarshal(t.Payload(), &payload); err != nil {+ return fmt.Errorf("failed to unmarshal campaign batch payload: %w", err)+ }++ campaign, err := p.campaignRepo.FindByID(payload.CampaignID)+ if err != nil {+ return fmt.Errorf("campaign not found: %w", err)+ }++ if campaign.Status != models.CampaignStatusSending {+ logger.Info("campaign is not in sending status, skipping batch", "id", campaign.ID, "status", campaign.Status)+ return nil+ }++ // Get pending messages with subscribers preloaded+ pendingMessages, err := p.messageRepo.FindPendingByCampaign(campaign.ID, campaignBatchSize)+ if err != nil {+ return fmt.Errorf("failed to get pending messages: %w", err)+ }++ if len(pendingMessages) == 0 {+ // No more pending messages: mark campaign as sent+ logger.Info("campaign sending complete", "id", campaign.ID)+ if err := p.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusSent); err != nil {+ return err+ }+ if p.dispatcher != nil {+ p.dispatcher.Dispatch(campaign.UserID, "campaign.completed", fmt.Sprint(campaign.ID), campaign.FromEmail)+ }+ return nil+ }++ // Cache resolved content per language to avoid re-rendering for each subscriber+ contentCache := make(map[string]*resolvedContent)+ resolveForLang := func(lang string) *resolvedContent {+ if lang == "" {+ lang = campaign.Language+ }+ if lang == "" {+ lang = "en"+ }+ if cached, ok := contentCache[lang]; ok {+ return cached+ }+ c := p.resolveTemplateContent(campaign, lang)+ if c != nil {+ contentCache[lang] = c+ }+ return c+ }++ // Pre-resolve default content for the campaign language+ defaultContent := resolveForLang(campaign.Language)+ if defaultContent == nil {+ return fmt.Errorf("failed to resolve template content for campaign %d", campaign.ID)+ }++ for i := range pendingMessages {+ msg := &pendingMessages[i]++ // Resolve content for subscriber's language (falls back to campaign language)+ content := defaultContent+ if msg.Subscriber.Language != "" {+ if langContent := resolveForLang(msg.Subscriber.Language); langContent != nil {+ content = langContent+ }+ }++ // A/B variant subject override+ if campaign.ABTestEnabled && msg.Variant != "" {+ for _, v := range campaign.ABTestVariants {+ if v.Name == msg.Variant && v.Subject != "" {+ // Copy to avoid mutating cached content+ override := *content+ override.Subject = v.Subject+ content = &override+ break+ }+ }+ }++ // Format sender with display name+ sender := campaign.FromEmail+ if campaign.FromName != "" {+ sender = fmt.Sprintf("%s <%s>", campaign.FromName, campaign.FromEmail)+ }++ // Create email record+ em := &models.Email{+ UserID: campaign.UserID,+ WorkspaceID: campaign.WorkspaceID,+ Sender: sender,+ Recipients: pq.StringArray{msg.Subscriber.Email},+ Subject: content.Subject,+ HTMLBody: content.HTMLBody,+ TextBody: content.TextBody,+ Status: models.EmailStatusQueued,+ }++ if err := p.emailRepo.Create(em); err != nil {+ _ = p.messageRepo.UpdateStatus(msg.ID, models.CampaignMsgFailed, "failed to create email record: "+err.Error())+ continue+ }++ // Rewrite links for click tracking and inject open pixel+ if p.trackingService != nil && em.HTMLBody != "" {+ em.HTMLBody = p.trackingService.ProcessHTML(em.HTMLBody, campaign.ID, msg.ID)+ em.ListUnsubscribeURL = p.trackingService.UnsubscribeURL(msg.ID)+ em.ListUnsubscribePost = true+ _ = p.emailRepo.Update(em)+ }++ // Link email to campaign message+ _ = p.messageRepo.SetEmailID(msg.ID, em.ID)+ _ = p.messageRepo.UpdateStatus(msg.ID, models.CampaignMsgQueued, "")++ // Enqueue email for sending+ if err := p.producer.EnqueueEmailSend(em.ID, QueueBulk); err != nil {+ _ = p.messageRepo.UpdateStatus(msg.ID, models.CampaignMsgFailed, "failed to enqueue email: "+err.Error())+ }+ }++ // Check if there are more pending messages+ remaining, err := p.messageRepo.CountPending(campaign.ID)+ if err != nil {+ return fmt.Errorf("failed to count remaining messages: %w", err)+ }++ if remaining > 0 {+ // Compute rate limiting delay+ var delay time.Duration+ if campaign.SendRate > 0 {+ // SendRate is messages per minute+ delay = time.Duration(float64(time.Minute) / float64(campaign.SendRate) * float64(campaignBatchSize))+ }+ return p.producer.EnqueueCampaignBatch(campaign.ID, delay)+ }++ // All done+ logger.Info("campaign sending complete", "id", campaign.ID)+ if err := p.campaignRepo.UpdateStatus(campaign.ID, models.CampaignStatusSent); err != nil {+ return err+ }+ if p.dispatcher != nil {+ p.dispatcher.Dispatch(campaign.UserID, "campaign.completed", fmt.Sprint(campaign.ID), campaign.FromEmail)+ }+ return nil+}++// resolvedContent holds the rendered template content for a campaign email.+type resolvedContent struct {+ Subject string+ HTMLBody string+ TextBody string+}++// resolveTemplateContent looks up the template, renders it with campaign data, and injects CSS.+func (p *CampaignProcessor) resolveTemplateContent(campaign *models.Campaign, language string) *resolvedContent {+ tmpl, err := p.templateRepo.FindByID(campaign.TemplateID)+ if err != nil {+ logger.Error("campaign: template not found", "template_id", campaign.TemplateID)+ return nil+ }++ versionID := campaign.TemplateVersionID+ if versionID == nil {+ versionID = tmpl.ActiveVersionID+ }+ if versionID == nil {+ logger.Error("campaign: no active version", "template_id", campaign.TemplateID)+ return nil+ }++ v, err := p.versionRepo.FindByID(*versionID)+ if err != nil {+ logger.Error("campaign: version not found", "version_id", *versionID)+ return nil+ }++ lang := language+ if lang == "" {+ lang = campaign.Language+ }+ if lang == "" {+ lang = tmpl.DefaultLanguage+ }++ loc, err := p.localizationRepo.FindByVersionAndLanguage(*versionID, lang)+ if err != nil {+ if lang != tmpl.DefaultLanguage {+ loc, err = p.localizationRepo.FindByVersionAndLanguage(*versionID, tmpl.DefaultLanguage)+ if err != nil {+ logger.Error("campaign: localization not found", "version_id", *versionID, "language", lang)+ return nil+ }+ } else {+ return nil+ }+ }++ // Get CSS from stylesheet+ var css string+ if v.StyleSheet != nil {+ css = v.StyleSheet.CSS+ }++ // Render templates with campaign data+ renderer := email.NewTemplateRenderer()+ renderer.MissingKeyBehavior = "zero" // don't fail on missing keys in campaigns++ var data okapi.M+ if campaign.TemplateData != nil {+ data = okapi.M(campaign.TemplateData)+ }++ rendered, err := renderer.Render(&email.RenderInput{+ SubjectTemplate: loc.SubjectTemplate,+ HTMLTemplate: loc.HTMLTemplate,+ TextTemplate: loc.TextTemplate,+ CSS: css,+ }, data)+ if err != nil {+ logger.Error("campaign: template render failed", "error", err, "campaign_id", campaign.ID)+ // Fall back to raw content+ return &resolvedContent{+ Subject: campaign.Subject,+ HTMLBody: loc.HTMLTemplate,+ TextBody: loc.TextTemplate,+ }+ }++ // Use rendered subject, but fall back to campaign.Subject if localization subject was empty+ subject := rendered.Subject+ if subject == "" {+ subject = campaign.Subject+ }++ return &resolvedContent{+ Subject: subject,+ HTMLBody: rendered.HTML,+ TextBody: rendered.Text,+ }+}diff --git a/internal/worker/handler.go b/internal/worker/handler.goindex 6b4c02c..0788ae6 100644--- a/internal/worker/handler.go+++ b/internal/worker/handler.go@@ -19,18 +19,21 @@ package workerimport ("context"+ "encoding/base64""encoding/json""fmt"+ "io""net/mail""strings""time""github.com/hibiken/asynq""github.com/jkaninda/logger"- "github.com/jkaninda/posta/internal/models"- "github.com/jkaninda/posta/internal/services/email"- "github.com/jkaninda/posta/internal/services/webhook"- "github.com/jkaninda/posta/internal/storage/repositories"+ "github.com/goposta/posta/internal/models"+ "github.com/goposta/posta/internal/services/email"+ "github.com/goposta/posta/internal/services/webhook"+ "github.com/goposta/posta/internal/storage/blob"+ "github.com/goposta/posta/internal/storage/repositories")// EmailSendHandler processes email:send tasks from the Asynq queue.@@ -42,6 +45,7 @@ type EmailSendHandler struct {contactRepo *repositories.ContactRepositorysender *email.SMTPSenderdispatcher *webhook.Dispatcher+ blobStore blob.StoreonSent func()onFailed func()}@@ -65,6 +69,9 @@ func NewEmailSendHandler(}}+// SetBlobStore sets the blob storage backend for fetching attachment content.+func (h *EmailSendHandler) SetBlobStore(bs blob.Store) { h.blobStore = bs }+// OnSent sets a callback invoked after each successful email send.func (h *EmailSendHandler) OnSent(fn func()) { h.onSent = fn }@@ -72,7 +79,7 @@ func (h *EmailSendHandler) OnSent(fn func()) { h.onSent = fn }func (h *EmailSendHandler) OnFailed(fn func()) { h.onFailed = fn }// ProcessTask handles an email:send task.-func (h *EmailSendHandler) ProcessTask(_ context.Context, t *asynq.Task) error {+func (h *EmailSendHandler) ProcessTask(ctx context.Context, t *asynq.Task) error {var payload EmailSendPayloadif err := json.Unmarshal(t.Payload(), &payload); err != nil {return fmt.Errorf("failed to unmarshal payload: %w", err)@@ -93,13 +100,18 @@ func (h *EmailSendHandler) ProcessTask(_ context.Context, t *asynq.Task) error {senderAddr = parsed.Address}- // --- Server selection ---- // 1. Try the user's own per-account SMTP server first.+ // Server selection:+ // 1. Try the workspace or user's own per-account SMTP server first.// 2. Fall back to a shared server whose allowed_domains covers the sender domain.var smtpServer *models.SMTPServervar sharedServerID uint // non-zero when a shared server is used- userServer, err := h.smtpRepo.FindFirstByUserID(em.UserID)+ var userServer *models.SMTPServer+ if em.WorkspaceID != nil {+ userServer, err = h.smtpRepo.FindFirstByWorkspaceID(*em.WorkspaceID)+ } else {+ userServer, err = h.smtpRepo.FindFirstByUserID(em.UserID)+ }if err == nil {// Validate the sender against the per-user allowed emails listif len(userServer.AllowedEmails) > 0 {@@ -151,10 +163,28 @@ func (h *EmailSendHandler) ProcessTask(_ context.Context, t *asynq.Task) error {em.TextBody = email.HTMLToText(em.HTMLBody)}- // Parse attachments from stored JSON+ // Parse attachments from stored JSON and fetch content from blob storage if neededvar attachments []models.Attachmentif em.AttachmentsJSON != "" {_ = json.Unmarshal([]byte(em.AttachmentsJSON), &attachments)+ if h.blobStore != nil {+ for i, att := range attachments {+ if att.StorageKey != "" && att.Content == "" {+ rc, err := h.blobStore.Get(ctx, att.StorageKey)+ if err != nil {+ h.markFailed(em, fmt.Sprintf("failed to fetch attachment %q from storage: %v", att.Filename, err), 0)+ return nil+ }+ data, err := io.ReadAll(rc)+ rc.Close()+ if err != nil {+ h.markFailed(em, fmt.Sprintf("failed to read attachment %q: %v", att.Filename, err), 0)+ return nil+ }+ attachments[i].Content = base64.StdEncoding.EncodeToString(data)+ }+ }+ }}// Parse custom headers from stored JSONdiff --git a/internal/worker/producer.go b/internal/worker/producer.goindex 6672cb8..a25d2e9 100644--- a/internal/worker/producer.go+++ b/internal/worker/producer.go@@ -84,6 +84,30 @@ func (p *Producer) EnqueueEmailSendAt(emailID uint, queue string, sendAt time.Tireturn nil}+// EnqueueCampaignStart enqueues a campaign start task (fan-out to subscribers).+func (p *Producer) EnqueueCampaignStart(campaignID uint) error {+ task, err := NewCampaignStartTask(campaignID, asynq.Queue(QueueBulk), asynq.MaxRetry(3))+ if err != nil {+ return fmt.Errorf("failed to create campaign start task: %w", err)+ }+ _, err = p.client.Enqueue(task)+ return err+}++// EnqueueCampaignBatch enqueues a campaign batch processing task.+func (p *Producer) EnqueueCampaignBatch(campaignID uint, delay time.Duration) error {+ opts := []asynq.Option{asynq.Queue(QueueBulk), asynq.MaxRetry(3)}+ if delay > 0 {+ opts = append(opts, asynq.ProcessIn(delay))+ }+ task, err := NewCampaignBatchTask(campaignID, opts...)+ if err != nil {+ return fmt.Errorf("failed to create campaign batch task: %w", err)+ }+ _, err = p.client.Enqueue(task)+ return err+}+// Close closes the underlying Asynq client.func (p *Producer) Close() error {return p.client.Close()diff --git a/internal/worker/tasks.go b/internal/worker/tasks.goindex 78cfb5e..f5102a5 100644--- a/internal/worker/tasks.go+++ b/internal/worker/tasks.go@@ -24,7 +24,9 @@ import ()const (- TypeEmailSend = "email:send"+ TypeEmailSend = "email:send"+ TypeCampaignStart = "campaign:start"+ TypeCampaignBatch = "campaign:batch"QueueTransactional = "transactional"QueueBulk = "bulk"@@ -43,3 +45,23 @@ func NewEmailSendTask(emailID uint, opts ...asynq.Option) (*asynq.Task, error) {}return asynq.NewTask(TypeEmailSend, payload, opts...), nil}++type CampaignPayload struct {+ CampaignID uint `json:"campaign_id"`+}++func NewCampaignStartTask(campaignID uint, opts ...asynq.Option) (*asynq.Task, error) {+ payload, err := json.Marshal(CampaignPayload{CampaignID: campaignID})+ if err != nil {+ return nil, err+ }+ return asynq.NewTask(TypeCampaignStart, payload, opts...), nil+}++func NewCampaignBatchTask(campaignID uint, opts ...asynq.Option) (*asynq.Task, error) {+ payload, err := json.Marshal(CampaignPayload{CampaignID: campaignID})+ if err != nil {+ return nil, err+ }+ return asynq.NewTask(TypeCampaignBatch, payload, opts...), nil+}diff --git a/web/package-lock.json b/web/package-lock.jsonindex 1e76386..2aa9e3b 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -16,6 +16,8 @@"@mdi/font": "^7.4.47","axios": "^1.13.6","codemirror": "^6.0.2",+ "grapesjs": "^0.22.14",+ "grapesjs-preset-newsletter": "^1.0.2","pinia": "^3.0.4","vue": "^3.5.25","vue-router": "^4.6.4"@@ -1114,6 +1116,16 @@"dev": true,"license": "MIT"},+ "node_modules/@types/backbone": {+ "version": "1.4.15",+ "resolved": "https://registry.npmjs.org/@types/backbone/-/backbone-1.4.15.tgz",+ "integrity": "sha512-WWeKtYlsIMtDyLbbhkb96taJMEbfQBnuz7yw1u0pkphCOtksemoWhIXhK74VRCY9hbjnsH3rsJu2uUiFtnsEYg==",+ "license": "MIT",+ "dependencies": {+ "@types/jquery": "*",+ "@types/underscore": "*"+ }+ },"node_modules/@types/estree": {"version": "1.0.8","resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",@@ -1121,6 +1133,18 @@"dev": true,"license": "MIT"},+ "node_modules/@types/jquery": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-4.0.0.tgz",+ "integrity": "sha512-Z+to+A2VkaHq1DfI2oSwsoCdhCHMpTSgjWzNcbNlRGYzksDBpPUgEcAL+RQjOBJRaLoEAOHXxqDGBVP+BblBwg==",+ "license": "MIT"+ },+ "node_modules/@types/underscore": {+ "version": "1.13.0",+ "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.13.0.tgz",+ "integrity": "sha512-L6LBgy1f0EFQZ+7uSA57+n2g/s4Qs5r06Vwrwn0/nuK1de+adz00NWaztRQ30aEqw5qOaWbPI8u2cGQ52lj6VA==",+ "license": "MIT"+ },"node_modules/@vitejs/plugin-vue": {"version": "6.0.4","resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.4.tgz",@@ -1340,6 +1364,26 @@"proxy-from-env": "^1.1.0"}},+ "node_modules/backbone": {+ "version": "1.4.1",+ "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.1.tgz",+ "integrity": "sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==",+ "license": "MIT",+ "dependencies": {+ "underscore": ">=1.8.3"+ }+ },+ "node_modules/backbone-undo": {+ "version": "0.2.6",+ "resolved": "https://registry.npmjs.org/backbone-undo/-/backbone-undo-0.2.6.tgz",+ "integrity": "sha512-AsfpNiljLXlk7TcffDUu3EAUq7CxWbyTNwARWrql5XTzN4vh6WzEEBZYaKK4kTTz+iW1tSzqUooaGRIwO83kWA==",+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",+ "license": "MIT",+ "dependencies": {+ "backbone": ">=1.0.0",+ "underscore": ">=1.4.4"+ }+ },"node_modules/birpc": {"version": "2.9.0","resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",@@ -1377,6 +1421,12 @@"@codemirror/view": "^6.0.0"}},+ "node_modules/codemirror-formatting": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/codemirror-formatting/-/codemirror-formatting-1.0.0.tgz",+ "integrity": "sha512-br9yM6eJI3pJHekEnoyHaBEb1B7XxxDjju+vRyBe8QGLp5saTIXXkZ+eFCTqXSAtI8QEZDFVEX2/SOjH2sVWRQ==",+ "license": "MIT"+ },"node_modules/combined-stream": {"version": "1.0.8","resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",@@ -1671,6 +1721,34 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/grapesjs": {+ "version": "0.22.14",+ "resolved": "https://registry.npmjs.org/grapesjs/-/grapesjs-0.22.14.tgz",+ "integrity": "sha512-UyHKGtB9YOQ4bmvhmwY3H7J6SO30qgIH4qRp1ucUlblS21btMxY90xwQuAVIi+EFGl0wi8v1NBEYvA52eIEfyg==",+ "license": "BSD-3-Clause",+ "dependencies": {+ "@types/backbone": "1.4.15",+ "backbone": "1.4.1",+ "backbone-undo": "0.2.6",+ "codemirror": "5.63.0",+ "codemirror-formatting": "1.0.0",+ "html-entities": "~1.4.0",+ "promise-polyfill": "8.3.0",+ "underscore": "1.13.1"+ }+ },+ "node_modules/grapesjs-preset-newsletter": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/grapesjs-preset-newsletter/-/grapesjs-preset-newsletter-1.0.2.tgz",+ "integrity": "sha512-z8KJ1ZrTXfASSJZ/tHOcnpcWu4AMr2F/ZfQit+QjimNi3UGowwl7+Yjefuh3R7lbDTrXMMaxhCannCaJo/kPJw==",+ "license": "BSD-3-Clause"+ },+ "node_modules/grapesjs/node_modules/codemirror": {+ "version": "5.63.0",+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.0.tgz",+ "integrity": "sha512-KlLWRPggDg2rBD1Mx7/EqEhaBdy+ybBCVh/efgjBDsPpMeEu6MbTAJzIT4TuCzvmbTEgvKOGzVT6wdBTNusqrg==",+ "license": "MIT"+ },"node_modules/has-symbols": {"version": "1.1.0","resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",@@ -1716,6 +1794,12 @@"integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==","license": "MIT"},+ "node_modules/html-entities": {+ "version": "1.4.0",+ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",+ "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",+ "license": "MIT"+ },"node_modules/is-what": {"version": "5.5.0","resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz",@@ -1879,6 +1963,12 @@"node": "^10 || ^12 || >=14"}},+ "node_modules/promise-polyfill": {+ "version": "8.3.0",+ "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz",+ "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==",+ "license": "MIT"+ },"node_modules/proxy-from-env": {"version": "1.1.0","resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",@@ -2003,6 +2093,12 @@"node": ">=14.17"}},+ "node_modules/underscore": {+ "version": "1.13.8",+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz",+ "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==",+ "license": "MIT"+ },"node_modules/vite": {"version": "7.3.1","resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",diff --git a/web/package.json b/web/package.jsonindex 2bc5a92..6473f1d 100644--- a/web/package.json+++ b/web/package.json@@ -17,10 +17,15 @@"@mdi/font": "^7.4.47","axios": "^1.13.6","codemirror": "^6.0.2",+ "grapesjs": "^0.22.14",+ "grapesjs-preset-newsletter": "^1.0.2","pinia": "^3.0.4","vue": "^3.5.25","vue-router": "^4.6.4"},+ "overrides": {+ "underscore": ">=1.13.8"+ },"devDependencies": {"@tsconfig/node22": "^22.0.5","@vitejs/plugin-vue": "^6.0.2",diff --git a/web/src/api/admin.ts b/web/src/api/admin.tsindex a9b8a96..c6ede7c 100644--- a/web/src/api/admin.ts+++ b/web/src/api/admin.ts@@ -1,5 +1,5 @@import api from './client'-import type { ApiResponse, PaginatedResponse, User, ApiKey, Email, Event, AdminMetrics, UserDetailMetrics, CronJob } from './types'+import type { ApiResponse, PaginatedResponse, User, ApiKey, Email, Event, AdminMetrics, UserDetailMetrics, CronJob, AdminWorkspace } from './types'export const adminApi = {listUsers(page = 0, size = 20) {@@ -20,6 +20,9 @@ export const adminApi = {disable2FA(id: number) {return api.delete(`/admin/users/${id}/2fa`)},+ getUserWorkspaces(id: number) {+ return api.get<ApiResponse<AdminWorkspace[]>>(`/admin/users/${id}/workspaces`)+ },listApiKeys(page = 0, size = 20) {return api.get<PaginatedResponse<ApiKey>>('/admin/api-keys', { params: { page, size } })},diff --git a/web/src/api/auth.ts b/web/src/api/auth.tsindex 54e5ac4..0e1907f 100644--- a/web/src/api/auth.ts+++ b/web/src/api/auth.ts@@ -28,6 +28,12 @@ export const authApi = {disable2FA(code: string) {return api.post<ApiResponse<{ message: string }>>('/users/me/2fa/disable', { code })},+ requestAccountDeletion() {+ return api.post<ApiResponse<{ message: string; scheduled_deletion_at: string }>>('/users/me/delete')+ },+ cancelAccountDeletion() {+ return api.post<ApiResponse<{ message: string }>>('/users/me/cancel-deletion')+ },register(name: string, email: string, password: string) {return api.post<ApiResponse<AuthResponse>>('/auth/register', { name, email, password })},diff --git a/web/src/api/campaigns.ts b/web/src/api/campaigns.tsnew file mode 100644index 0000000..c192486--- /dev/null+++ b/web/src/api/campaigns.ts@@ -0,0 +1,62 @@+import api from './client'+import type { ApiResponse, PaginatedResponse, Campaign, CampaignMessage, CampaignAnalyticsData } from './types'++export const campaignsApi = {+ list(page = 0, size = 20, status?: string) {+ return api.get<PaginatedResponse<Campaign>>('/users/me/campaigns', { params: { page, size, status } })+ },+ get(id: number) {+ return api.get<ApiResponse<Campaign>>(`/users/me/campaigns/${id}`)+ },+ create(data: {+ name: string+ subject: string+ from_email: string+ from_name?: string+ template_id: number+ template_version_id?: number+ language?: string+ template_data?: Record<string, any>+ list_id: number+ send_rate?: number+ scheduled_at?: string+ }) {+ return api.post<ApiResponse<Campaign>>('/users/me/campaigns', data)+ },+ update(id: number, data: Partial<{+ name: string+ subject: string+ from_email: string+ from_name: string+ template_id: number+ template_version_id: number+ language: string+ template_data: Record<string, any>+ list_id: number+ send_rate: number+ scheduled_at: string+ }>) {+ return api.put<ApiResponse<Campaign>>(`/users/me/campaigns/${id}`, data)+ },+ delete(id: number) {+ return api.delete(`/users/me/campaigns/${id}`)+ },+ send(id: number) {+ return api.post<ApiResponse<Campaign>>(`/users/me/campaigns/${id}/send`)+ },+ pause(id: number) {+ return api.post<ApiResponse<Campaign>>(`/users/me/campaigns/${id}/pause`)+ },+ resume(id: number) {+ return api.post<ApiResponse<Campaign>>(`/users/me/campaigns/${id}/resume`)+ },+ cancel(id: number) {+ return api.post<ApiResponse<Campaign>>(`/users/me/campaigns/${id}/cancel`)+ },+ listMessages(id: number, page = 0, size = 20, status?: string) {+ return api.get<PaginatedResponse<CampaignMessage>>(`/users/me/campaigns/${id}/messages`, { params: { page, size, status } })+ },+ analytics(id: number) {+ return api.get<ApiResponse<CampaignAnalyticsData>>(`/users/me/campaigns/${id}/analytics`)+ },+}diff --git a/web/src/api/oauth.ts b/web/src/api/oauth.tsnew file mode 100644index 0000000..efc88b0--- /dev/null+++ b/web/src/api/oauth.ts@@ -0,0 +1,49 @@+import api from './client'+import type {+ ApiResponse,+ OAuthProviderInfo,+ OAuthLinkedAccount,+ OAuthProviderAdmin,+ OAuthProviderInput,+ WorkspaceSSOConfig,+} from './types'++export const oauthApi = {+ // Public+ providers() {+ return api.get<ApiResponse<{ providers: OAuthProviderInfo[] }>>('/auth/oauth/providers')+ },++ // Linked accounts (authenticated user)+ linkedAccounts() {+ return api.get<ApiResponse<OAuthLinkedAccount[]>>('/users/me/oauth')+ },+ unlink(providerID: number) {+ return api.delete<ApiResponse<{ message: string }>>(`/users/me/oauth/${providerID}`)+ },++ // Admin: provider management+ adminList() {+ return api.get<ApiResponse<OAuthProviderAdmin[]>>('/admin/oauth/providers')+ },+ adminCreate(data: OAuthProviderInput) {+ return api.post<ApiResponse<OAuthProviderAdmin>>('/admin/oauth/providers', data)+ },+ adminUpdate(id: number, data: Partial<OAuthProviderInput> & { enabled?: boolean }) {+ return api.put<ApiResponse<OAuthProviderAdmin>>(`/admin/oauth/providers/${id}`, data)+ },+ adminDelete(id: number) {+ return api.delete(`/admin/oauth/providers/${id}`)+ },++ // Workspace SSO+ getSSO() {+ return api.get<ApiResponse<WorkspaceSSOConfig | null>>('/workspaces/current/sso')+ },+ setSSO(data: { provider_id: number; enforce_sso: boolean; auto_provision: boolean; allowed_domains: string }) {+ return api.put<ApiResponse<{ message: string }>>('/workspaces/current/sso', data)+ },+ deleteSSO() {+ return api.delete<ApiResponse<{ message: string }>>('/workspaces/current/sso')+ },+}diff --git a/web/src/api/plans.ts b/web/src/api/plans.tsnew file mode 100644index 0000000..1c7c669--- /dev/null+++ b/web/src/api/plans.ts@@ -0,0 +1,29 @@+import api from './client'+import type { ApiResponse, PaginatedResponse, Plan, PlanInput } from './types'++export const plansApi = {+ list(page = 0, size = 20) {+ return api.get<PaginatedResponse<Plan>>('/admin/plans', { params: { page, size } })+ },+ get(id: number) {+ return api.get<ApiResponse<Plan>>(`/admin/plans/${id}`)+ },+ create(data: PlanInput) {+ return api.post<ApiResponse<Plan>>('/admin/plans', data)+ },+ update(id: number, data: Partial<PlanInput> & { is_active?: boolean; is_default?: boolean }) {+ return api.put<ApiResponse<Plan>>(`/admin/plans/${id}`, data)+ },+ delete(id: number, force = false) {+ return api.delete(`/admin/plans/${id}`, { params: force ? { force: true } : {} })+ },+ setDefault(id: number) {+ return api.patch<ApiResponse<Plan>>(`/admin/plans/${id}/default`)+ },+ assignToWorkspace(workspaceId: number, planId: number) {+ return api.post<ApiResponse<{ message: string }>>(`/admin/workspaces/${workspaceId}/plan`, { plan_id: planId })+ },+ getWorkspacePlan(workspaceId: number) {+ return api.get<ApiResponse<Plan | null>>(`/admin/workspaces/${workspaceId}/plan`)+ },+}diff --git a/web/src/api/subscriberLists.ts b/web/src/api/subscriberLists.tsnew file mode 100644index 0000000..21e5f0e--- /dev/null+++ b/web/src/api/subscriberLists.ts@@ -0,0 +1,32 @@+import api from './client'+import type { ApiResponse, PaginatedResponse, SubscriberListItem, Subscriber, FilterRule } from './types'++export const subscriberListsApi = {+ list(page = 0, size = 20) {+ return api.get<PaginatedResponse<SubscriberListItem>>('/users/me/subscriber-lists', { params: { page, size } })+ },+ get(id: number) {+ return api.get<ApiResponse<SubscriberListItem>>(`/users/me/subscriber-lists/${id}`)+ },+ create(data: { name: string; description: string; type: string; filter_rules?: FilterRule[] }) {+ return api.post<ApiResponse<SubscriberListItem>>('/users/me/subscriber-lists', data)+ },+ update(id: number, data: { name?: string; description?: string; filter_rules?: FilterRule[] }) {+ return api.put<ApiResponse<SubscriberListItem>>(`/users/me/subscriber-lists/${id}`, data)+ },+ delete(id: number) {+ return api.delete(`/users/me/subscriber-lists/${id}`)+ },+ listMembers(id: number, page = 0, size = 20) {+ return api.get<PaginatedResponse<Subscriber>>(`/users/me/subscriber-lists/${id}/members`, { params: { page, size } })+ },+ addMember(id: number, subscriberId: number) {+ return api.post<ApiResponse<null>>(`/users/me/subscriber-lists/${id}/members`, { subscriber_id: subscriberId })+ },+ removeMember(id: number, subscriberId: number) {+ return api.delete(`/users/me/subscriber-lists/${id}/members`, { data: { subscriber_id: subscriberId } })+ },+ previewSegment(filterRules: FilterRule[]) {+ return api.post<PaginatedResponse<Subscriber>>('/users/me/subscriber-lists/preview', { filter_rules: filterRules })+ },+}diff --git a/web/src/api/subscribers.ts b/web/src/api/subscribers.tsnew file mode 100644index 0000000..3206f35--- /dev/null+++ b/web/src/api/subscribers.ts@@ -0,0 +1,35 @@+import api from './client'+import type { ApiResponse, PaginatedResponse, Subscriber, BulkImportResult, SubscriberStatus } from './types'++export const subscribersApi = {+ list(page = 0, size = 20, search = '', status?: SubscriberStatus) {+ return api.get<PaginatedResponse<Subscriber>>('/users/me/subscribers', {+ params: { page, size, search: search || undefined, status: status || undefined },+ })+ },+ get(id: number) {+ return api.get<ApiResponse<Subscriber>>(`/users/me/subscribers/${id}`)+ },+ create(data: { email: string; name: string; custom_fields?: Record<string, any> }) {+ return api.post<ApiResponse<Subscriber>>('/users/me/subscribers', data)+ },+ update(id: number, data: { email?: string; name?: string; status?: SubscriberStatus; custom_fields?: Record<string, any> }) {+ return api.put<ApiResponse<Subscriber>>(`/users/me/subscribers/${id}`, data)+ },+ delete(id: number) {+ return api.delete(`/users/me/subscribers/${id}`)+ },+ bulkImportJSON(subscribers: { email: string; name?: string; custom_fields?: Record<string, any> }[]) {+ return api.post<ApiResponse<BulkImportResult>>('/users/me/subscribers/import/json', { subscribers })+ },+ bulkImportCSV(file: File, columnMapping?: Record<string, string>) {+ const formData = new FormData()+ formData.append('file', file)+ if (columnMapping) {+ formData.append('column_mapping', JSON.stringify(columnMapping))+ }+ return api.post<ApiResponse<BulkImportResult>>('/users/me/subscribers/import/csv', formData, {+ headers: { 'Content-Type': 'multipart/form-data' },+ })+ },+}diff --git a/web/src/api/templates.ts b/web/src/api/templates.tsindex 6d7601c..58319f5 100644--- a/web/src/api/templates.ts+++ b/web/src/api/templates.ts@@ -73,4 +73,11 @@ export const templatesApi = {importTemplate(data: TemplateExport) {return api.post<ApiResponse<Template>>('/users/me/templates/import', data)},+ importHTML(file: File) {+ const formData = new FormData()+ formData.append('file', file)+ return api.post<ApiResponse<Template>>('/users/me/templates/import-html', formData, {+ headers: { 'Content-Type': 'multipart/form-data' },+ })+ },}diff --git a/web/src/api/types.ts b/web/src/api/types.tsindex 6664c21..bcbb72a 100644--- a/web/src/api/types.ts+++ b/web/src/api/types.ts@@ -183,6 +183,7 @@ export interface TemplateLocalization {subject_template: stringhtml_template: stringtext_template: string+ builder_json?: stringcreated_at: stringupdated_at?: string}@@ -192,6 +193,7 @@ export interface TemplateLocalizationInput {subject_template: stringhtml_template: stringtext_template: string+ builder_json?: string}export interface Language {@@ -199,12 +201,14 @@ export interface Language {user_id: numbercode: stringname: string+ is_default: booleancreated_at: string}export interface LanguageInput {code: stringname: string+ is_default?: boolean}export interface StyleSheet {@@ -566,14 +570,9 @@ export interface Setup2FAResponse {}// User Profile (extended)-export interface UserProfile {- id: number- name: string- email: string- role: 'admin' | 'user'- two_factor_enabled: boolean+export interface UserProfile extends User {require_verified_domain: boolean- created_at: string+ scheduled_deletion_at: string | null}// User Data Export/Import@@ -646,3 +645,307 @@ export interface GDPRDeleteResult {deleted: numbermessage: string}++// Workspace Data Export/Import+export interface WorkspaceDataExport {+ posta_version?: string+ exported_at?: string+ workspace_settings: ExportWorkspaceSettings+ templates: TemplateExport[]+ stylesheets: ExportStyleSheet[]+ languages: ExportLanguage[]+ contacts: ExportContact[]+ contact_lists: ExportContactList[]+ suppressions: ExportSuppression[]+ webhooks: ExportWebhook[]+ smtp_servers: ExportSMTPServer[]+ domains: ExportDomain[]+ subscribers: ExportSubscriber[]+ subscriber_lists: ExportSubscriberList[]+}++export interface ExportWorkspaceSettings {+ name: string+ description: string+ default_language: string+}++export interface ExportSMTPServer {+ host: string+ port: number+ username: string+ encryption: string+ max_retries: number+ allowed_emails?: string[]+}++export interface ExportDomain {+ domain: string+}++export interface ExportSubscriber {+ email: string+ name: string+ status: string+ custom_fields?: Record<string, unknown>+ timezone?: string+ language?: string+}++export interface ExportSubscriberList {+ name: string+ description: string+ type: string+ filter_rules?: { field: string; operator: string; value: unknown }[]+}++// Workspaces+export type WorkspaceRole = 'owner' | 'admin' | 'editor' | 'viewer'++export interface Workspace {+ id: number+ name: string+ slug: string+ description: string+ owner_id: number+ role: WorkspaceRole+ created_at: string+}++export interface WorkspaceInput {+ name: string+ slug?: string+ description?: string+}++export interface WorkspaceMember {+ id: number+ user_id: number+ name: string+ email: string+ role: WorkspaceRole+ created_at: string+}++export interface WorkspaceInvitation {+ id: number+ workspace_id: number+ workspace?: string+ email: string+ role: WorkspaceRole+ status: 'pending' | 'accepted' | 'declined'+ expires_at: string+ created_at: string+}++export interface InviteMemberInput {+ email: string+ role: WorkspaceRole+}++export interface TransferResult {+ resource: string+ count: number+}++export interface TransferResponse {+ message: string+ results: TransferResult[]+ total: number+}++// OAuth+export interface OAuthProviderInfo {+ slug: string+ name: string+ type: 'google' | 'oidc'+}++export interface OAuthLinkedAccount {+ id: number+ provider_id: number+ provider_name: string+ provider_type: string+ email: string+ created_at: string+}++export interface OAuthProviderAdmin {+ id: number+ name: string+ slug: string+ type: string+ issuer: string+ scopes: string+ enabled: boolean+ auto_register: boolean+ allowed_domains: string+ created_at: string+}++export interface OAuthProviderInput {+ name: string+ slug: string+ type: string+ client_id: string+ client_secret: string+ issuer?: string+ auth_url?: string+ token_url?: string+ userinfo_url?: string+ scopes?: string+ auto_register?: boolean+ allowed_domains?: string+}++export interface WorkspaceSSOConfig {+ provider_id: number+ provider_name: string+ enforce_sso: boolean+ auto_provision: boolean+ allowed_domains: string+}++// Subscribers+export type SubscriberStatus = 'subscribed' | 'unsubscribed' | 'bounced' | 'complained'++export interface Subscriber {+ id: number+ email: string+ name: string+ status: SubscriberStatus+ custom_fields: Record<string, any>+ subscribed_at: string | null+ unsubscribed_at: string | null+ created_at: string+ updated_at: string | null+}++export type SubscriberListType = 'static' | 'dynamic'++export interface FilterRule {+ field: string+ operator: 'eq' | 'neq' | 'contains' | 'starts_with' | 'ends_with' | 'gt' | 'lt' | 'in'+ value: any+}++export interface SubscriberListItem {+ id: number+ name: string+ description: string+ type: SubscriberListType+ filter_rules?: FilterRule[]+ member_count: number+ created_at: string+ updated_at: string | null+}++export interface BulkImportResult {+ created: number+ skipped: number+ total: number+}++// Campaigns+export type CampaignStatus = 'draft' | 'scheduled' | 'sending' | 'sent' | 'paused' | 'cancelled'++export interface CampaignStats {+ total: number+ pending: number+ queued: number+ sent: number+ failed: number+ skipped: number+}++export interface Campaign {+ id: number+ name: string+ subject: string+ from_email: string+ from_name: string+ template_id: number+ template_version_id?: number+ language: string+ template_data?: Record<string, any>+ status: CampaignStatus+ list_id: number+ send_rate: number+ scheduled_at?: string+ started_at?: string+ completed_at?: string+ created_at: string+ updated_at?: string+ stats?: CampaignStats+}++export type CampaignMessageStatus = 'pending' | 'queued' | 'sent' | 'failed' | 'skipped'++export interface CampaignMessage {+ id: number+ campaign_id: number+ subscriber_id: number+ email_id?: number+ status: CampaignMessageStatus+ error_message?: string+ sent_at?: string+ created_at: string+ subscriber?: Subscriber+}++// Plans+export interface Plan {+ id: number+ name: string+ description: string+ is_default: boolean+ is_active: boolean+ daily_rate_limit: number+ hourly_rate_limit: number+ max_attachment_size_mb: number+ max_batch_size: number+ max_api_keys: number+ max_domains: number+ max_smtp_servers: number+ max_workspaces: number+ email_log_retention_days: number+ created_at: string+ updated_at: string+}++export interface AdminWorkspace {+ id: number+ name: string+ slug: string+ owner_id: number+ plan_id: number | null+ plan_name: string+ created_at: string+ updated_at: string+}++export interface PlanInput {+ name: string+ description: string+ is_default?: boolean+ daily_rate_limit: number+ hourly_rate_limit: number+ max_attachment_size_mb: number+ max_batch_size: number+ max_api_keys: number+ max_domains: number+ max_smtp_servers: number+ max_workspaces: number+ email_log_retention_days: number+}++export interface CampaignAnalyticsData {+ analytics: {+ total_messages: number; sent_messages: number; failed_messages: number+ opened_messages: number; clicked_messages: number; bounced_messages: number; unsubscribed: number+ delivery_rate: number; open_rate: number; click_rate: number; bounce_rate: number; unsubscribe_rate: number+ }+ links: Array<{ id: number; original_url: string; hash: string; click_count: number }>+ open_series: Array<{ time: string; count: number }>+ click_series: Array<{ time: string; count: number }>+}diff --git a/web/src/api/workspaces.ts b/web/src/api/workspaces.tsnew file mode 100644index 0000000..42c4bf8--- /dev/null+++ b/web/src/api/workspaces.ts@@ -0,0 +1,88 @@+import api from './client'+import type {+ ApiResponse,+ Workspace,+ WorkspaceInput,+ WorkspaceMember,+ WorkspaceInvitation,+ InviteMemberInput,+ WorkspaceRole,+ TransferResponse,+ WorkspaceDataExport,+ Plan,+} from './types'++export const workspaceApi = {+ list() {+ return api.get<ApiResponse<Workspace[]>>('/workspaces')+ },+ create(data: WorkspaceInput) {+ return api.post<ApiResponse<Workspace>>('/workspaces', data)+ },+ getCurrent() {+ return api.get<ApiResponse<Workspace>>('/workspaces/current')+ },+ update(data: { name?: string; description?: string }) {+ return api.put<ApiResponse<Workspace>>('/workspaces/current', data)+ },+ delete() {+ return api.delete('/workspaces/current')+ },++ // Members+ listMembers() {+ return api.get<ApiResponse<WorkspaceMember[]>>('/workspaces/current/members')+ },+ updateMemberRole(memberUserId: number, role: WorkspaceRole) {+ return api.put<ApiResponse<{ message: string }>>(`/workspaces/current/members/${memberUserId}`, { role })+ },+ removeMember(memberUserId: number) {+ return api.delete(`/workspaces/current/members/${memberUserId}`)+ },++ // Invitations (workspace-scoped)+ invite(data: InviteMemberInput) {+ return api.post<ApiResponse<WorkspaceInvitation>>('/workspaces/current/invitations', data)+ },+ listInvitations() {+ return api.get<ApiResponse<WorkspaceInvitation[]>>('/workspaces/current/invitations')+ },+ cancelInvitation(invitationId: number) {+ return api.delete(`/workspaces/current/invitations/${invitationId}`)+ },++ // User-level invitation actions+ myInvitations() {+ return api.get<ApiResponse<WorkspaceInvitation[]>>('/invitations')+ },+ acceptInvitationByToken(token: string) {+ return api.post<ApiResponse<{ message: string; workspace_id: number }>>('/invitations/accept', { token })+ },+ declineInvitationByToken(token: string) {+ return api.post<ApiResponse<{ message: string }>>('/invitations/decline', { token })+ },+ acceptInvitationById(id: number) {+ return api.post<ApiResponse<{ message: string; workspace_id: number }>>(`/invitations/${id}/accept`)+ },+ declineInvitationById(id: number) {+ return api.post<ApiResponse<{ message: string }>>(`/invitations/${id}/decline`)+ },++ // Plan+ getPlan() {+ return api.get<ApiResponse<Plan | null>>('/workspaces/current/plan')+ },++ // Data Transfer+ transferData(resources: string[]) {+ return api.post<ApiResponse<TransferResponse>>('/workspaces/current/transfer', { resources })+ },++ // Data Export/Import+ exportData() {+ return api.get<ApiResponse<WorkspaceDataExport>>('/workspaces/current/data/export')+ },+ importData(data: WorkspaceDataExport) {+ return api.post<ApiResponse<{ message: string; imported_count: number }>>('/workspaces/current/data/import', data)+ },+}diff --git a/web/src/layouts/DashboardLayout.vue b/web/src/layouts/DashboardLayout.vueindex ea5a893..d1deedf 100644--- a/web/src/layouts/DashboardLayout.vue+++ b/web/src/layouts/DashboardLayout.vue@@ -3,15 +3,18 @@ import { computed, ref, onMounted, onBeforeUnmount } from 'vue'import { useRouter, useRoute } from 'vue-router'import { useAuthStore } from '../stores/auth'import { useThemeStore } from '../stores/theme'+import { useWorkspaceStore } from '../stores/workspace'import { infoApi, type AppInfo } from '../api/info'const router = useRouter()const route = useRoute()const auth = useAuthStore()const theme = useThemeStore()+const wsStore = useWorkspaceStore()const sidebarCollapsed = ref(false)const appInfo = ref<AppInfo | null>(null)const userMenuOpen = ref(false)+const wsSwitcherOpen = ref(false)const themeModes = ['light', 'dark', 'system'] as constfunction closeUserMenu(e: MouseEvent) {@@ -44,6 +47,8 @@ onMounted(async () => {} catch {// Version display is non-critical}++ wsStore.fetchWorkspaces()})const user = computed(() => auth.user)@@ -55,36 +60,49 @@ const navItems = [{ name: 'Templates', path: '/templates', icon: 'file-text' },{ name: 'Languages', path: '/languages', icon: 'type' },{ name: 'Stylesheets', path: '/stylesheets', icon: 'edit-3' },-{ name: 'SMTP Servers', path: '/smtp-servers', icon: 'server' },- { name: 'Domains', path: '/domains', icon: 'globe' },+{ name: 'Webhooks', path: '/webhooks', icon: 'link' },{ name: 'Deliveries', path: '/webhook-deliveries', icon: 'activity' },{ name: 'Contacts', path: '/contacts', icon: 'users' },- { name: 'Lists', path: '/contact-lists', icon: 'list' },+ { name: 'Subscribers', path: '/subscribers', icon: 'users' },+ { name: 'Lists', path: '/subscriber-lists', icon: 'list' },+ { name: 'Campaigns', path: '/campaigns', icon: 'send' },{ name: 'Bounces', path: '/bounces', icon: 'alert-triangle' },{ name: 'API Keys', path: '/api-keys', icon: 'key' },{ name: 'Audit Log', path: '/audit-log', icon: 'activity' },+ { name: 'Workspaces', path: '/workspaces', icon: 'briefcase' },+ { name: 'Domains', path: '/domains', icon: 'globe' },+ { name: 'SMTP Servers', path: '/smtp-servers', icon: 'server' },{ name: 'Settings', path: '/settings', icon: 'settings' },+]const adminItems = [{ name: 'Users', path: '/admin/users', icon: 'users' },+ { name: 'Plans', path: '/admin/plans', icon: 'layers' },{ name: 'Shared Servers', path: '/admin/servers', icon: 'server' },{ name: 'Jobs', path: '/admin/jobs', icon: 'clock' },{ name: 'Metrics', path: '/admin/metrics', icon: 'bar-chart' },{ name: 'Events', path: '/admin/events', icon: 'activity' },+ { name: 'OAuth', path: '/admin/oauth', icon: 'key' },{ name: 'Settings', path: '/admin/settings', icon: 'settings' },]function isActive(path: string): boolean {if (path === '/') return route.path === '/'- return route.path.startsWith(path)+ return route.path === path || route.path.startsWith(path + '/')}function navigate(path: string) {router.push(path)}+function switchContext(wsId: number | null) {+ wsStore.setWorkspace(wsId)+ wsSwitcherOpen.value = false+ router.push('/')+}+function logout() {auth.logout()router.push('/login')@@ -104,8 +122,38 @@ function logout() {<svg width="16" height="16" viewBox="0 0 16 16" fill="none"><path :d="sidebarCollapsed ? 'M6 3l5 5-5 5' : 'M10 3L5 8l5 5'" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg></button></div>+ <!-- Workspace Switcher -->+ <div v-if="wsStore.workspaces.length > 0" class="ws-switcher" :class="{ collapsed: sidebarCollapsed }">+ <div class="ws-switcher-toggle" @click="wsSwitcherOpen = !wsSwitcherOpen">+ <div class="ws-switcher-current">+ <div class="ws-avatar">{{ wsStore.currentWorkspace?.name?.charAt(0)?.toUpperCase() || 'P' }}</div>+ <span v-if="!sidebarCollapsed" class="ws-switcher-name">{{ wsStore.contextLabel }}</span>+ </div>+ <svg v-if="!sidebarCollapsed" width="14" height="14" viewBox="0 0 16 16" fill="none"><path d="M4 6l4 4 4-4" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>+ </div>+ <div v-if="wsSwitcherOpen" class="ws-switcher-dropdown">+ <div+ class="ws-switcher-option"+ :class="{ active: wsStore.isPersonal }"+ @click="switchContext(null)"+ >+ <div class="ws-avatar-sm">P</div>+ <span>Personal</span>+ </div>+ <div+ v-for="ws in wsStore.workspaces"+ :key="ws.id"+ class="ws-switcher-option"+ :class="{ active: wsStore.currentWorkspaceId === ws.id }"+ @click="switchContext(ws.id)"+ >+ <div class="ws-avatar-sm">{{ ws.name.charAt(0).toUpperCase() }}</div>+ <span>{{ ws.name }}</span>+ <span class="ws-role-badge">{{ ws.role }}</span>+ </div>+ </div></div>- <div class="sidebar-middle">+<nav class="nav"><av-for="item in navItems"@@ -214,7 +262,7 @@ function logout() {</span></div><div class="footer-right">- <a href="https://github.com/jkaninda/posta" target="_blank" rel="noopener noreferrer" class="footer-link">+ <a href="https://github.com/goposta/posta" target="_blank" rel="noopener noreferrer" class="footer-link"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><path d="M8 1C4.13 1 1 4.13 1 8a7 7 0 004.79 6.65c.35.06.48-.15.48-.34 0-.17-.01-.71-.01-1.29-1.76.33-2.2-.43-2.34-.82-.08-.2-.42-.82-.71-.99-.24-.13-.59-.46-.01-.47.55-.01.94.51 1.07.71.63 1.05 1.63.76 2.03.57.06-.45.24-.76.44-.93-1.55-.17-3.18-.78-3.18-3.46 0-.76.27-1.39.71-1.88-.07-.17-.31-.89.07-1.85 0 0 .58-.19 1.9.71a6.5 6.5 0 013.46 0c1.32-.9 1.9-.71 1.9-.71.38.96.14 1.68.07 1.85.44.49.71 1.11.71 1.88 0 2.69-1.64 3.29-3.19 3.46.25.22.47.64.47 1.29 0 .93-.01 1.68-.01 1.91 0 .19.13.41.48.34A7 7 0 0015 8c0-3.87-3.13-7-7-7z" fill="currentColor"/></svg>GitHub</a>@@ -243,7 +291,10 @@ function getIcon(name: string): string {'book-open': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M1.5 2.25h5.25a3 3 0 013 3v10.5a2.25 2.25 0 00-2.25-2.25H1.5V2.25zM16.5 2.25h-5.25a3 3 0 00-3 3v10.5a2.25 2.25 0 012.25-2.25h6V2.25z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>','list': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M6.75 4.5h9M6.75 9h9M6.75 13.5h9M2.25 4.5h.007M2.25 9h.007M2.25 13.5h.007" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>','edit-3': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M12 2.25l3.75 3.75L6 15.75H2.25V12L12 2.25z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>',+ 'send': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M16.5 1.5L8.25 9.75M16.5 1.5l-5.25 15-3-6.75L1.5 6.75l15-5.25z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>',+ 'briefcase': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><rect x="2" y="6" width="14" height="10" rx="1.5" stroke="currentColor" stroke-width="1.5"/><path d="M12 6V4.5A1.5 1.5 0 0010.5 3h-3A1.5 1.5 0 006 4.5V6" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>','settings': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><circle cx="9" cy="9" r="2.25" stroke="currentColor" stroke-width="1.5"/><path d="M14.7 11.1a1.2 1.2 0 00.24 1.32l.04.04a1.46 1.46 0 11-2.06 2.06l-.04-.04a1.2 1.2 0 00-1.32-.24 1.2 1.2 0 00-.73 1.1v.12a1.46 1.46 0 01-2.91 0v-.06a1.2 1.2 0 00-.79-1.1 1.2 1.2 0 00-1.32.24l-.04.04a1.46 1.46 0 11-2.06-2.06l.04-.04a1.2 1.2 0 00.24-1.32 1.2 1.2 0 00-1.1-.73h-.12a1.46 1.46 0 010-2.91h.06a1.2 1.2 0 001.1-.79 1.2 1.2 0 00-.24-1.32l-.04-.04a1.46 1.46 0 112.06-2.06l.04.04a1.2 1.2 0 001.32.24h.06a1.2 1.2 0 00.73-1.1v-.12a1.46 1.46 0 012.91 0v.06a1.2 1.2 0 00.73 1.1 1.2 1.2 0 001.32-.24l.04-.04a1.46 1.46 0 112.06 2.06l-.04.04a1.2 1.2 0 00-.24 1.32v.06a1.2 1.2 0 001.1.73h.12a1.46 1.46 0 010 2.91h-.06a1.2 1.2 0 00-1.1.73z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>',+ 'layers': '<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M9 1.5L1.5 6 9 10.5 16.5 6 9 1.5z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M1.5 12L9 16.5 16.5 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M1.5 9L9 13.5 16.5 9" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>',}return icons[name] || ''}@@ -271,8 +322,7 @@ export default { methods: { getIcon } }.collapsed .sidebar { width: 64px; min-width: 64px; }.collapsed .main-content { margin-left: 64px; }-.sidebar-top { display: flex; overflow-x: auto; }-.sidebar-middle { flex: 1; overflow-y: auto; overflow-x: hidden; margin-top: 10px; padding-top: 5px;}+.sidebar-top { flex: 1; overflow-y: auto; overflow-x: hidden; }.sidebar-brand {display: flex;@@ -301,6 +351,112 @@ export default { methods: { getIcon } }letter-spacing: -0.5px;}+/* Workspace Switcher */+.ws-switcher {+ padding: 0 8px 8px;+ position: relative;+}++.ws-switcher-toggle {+ display: flex;+ align-items: center;+ justify-content: space-between;+ padding: 8px 10px;+ border-radius: var(--radius, 8px);+ cursor: pointer;+ transition: all var(--transition, 150ms ease);+ color: var(--sidebar-text);+ border: 1px solid var(--sidebar-border);+}+.ws-switcher-toggle:hover { background: var(--sidebar-hover); color: var(--sidebar-text-active); }++.ws-switcher-current {+ display: flex;+ align-items: center;+ gap: 8px;+ overflow: hidden;+}++.ws-avatar {+ width: 24px;+ height: 24px;+ border-radius: 6px;+ background: var(--primary-600, #9333ea);+ color: #fff;+ display: flex;+ align-items: center;+ justify-content: center;+ font-size: 12px;+ font-weight: 600;+ flex-shrink: 0;+}++.ws-avatar-sm {+ width: 20px;+ height: 20px;+ border-radius: 5px;+ background: var(--primary-600, #9333ea);+ color: #fff;+ display: flex;+ align-items: center;+ justify-content: center;+ font-size: 10px;+ font-weight: 600;+ flex-shrink: 0;+}++.ws-switcher-name {+ font-size: 13px;+ font-weight: 500;+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+}++.ws-switcher.collapsed .ws-switcher-toggle {+ justify-content: center;+ padding: 8px;+ border: none;+}++.ws-switcher-dropdown {+ position: absolute;+ top: calc(100% + 2px);+ left: 8px;+ right: 8px;+ background: var(--bg-primary, #fff);+ border: 1px solid var(--border-primary, #e5e7eb);+ border-radius: var(--radius, 8px);+ box-shadow: var(--shadow-lg, 0 10px 25px rgba(0,0,0,0.08));+ padding: 4px;+ z-index: 200;+ min-width: 200px;+}++.ws-switcher-option {+ display: flex;+ align-items: center;+ gap: 8px;+ padding: 8px 10px;+ font-size: 13px;+ font-weight: 500;+ color: var(--text-secondary, #4b5563);+ border-radius: var(--radius-sm, 6px);+ cursor: pointer;+ transition: all var(--transition, 150ms ease);+}+.ws-switcher-option:hover { background: var(--bg-secondary, #f9fafb); color: var(--text-primary, #111827); }+.ws-switcher-option.active { background: var(--primary-50, #faf5ff); color: var(--primary-700, #7e22ce); }++.ws-role-badge {+ margin-left: auto;+ font-size: 10px;+ font-weight: 600;+ text-transform: uppercase;+ color: var(--text-muted, #9ca3af);+ letter-spacing: 0.05em;+}+.collapse-btn {background: transparent;border: none;diff --git a/web/src/main.ts b/web/src/main.tsindex 7a0895c..0b45632 100644--- a/web/src/main.ts+++ b/web/src/main.ts@@ -7,4 +7,8 @@ import './assets/styles.css'const app = createApp(App)app.use(createPinia())app.use(router)++// Register workspace interceptor (injects X-Posta-Workspace-Id header)+import './stores/workspace'+app.mount('#app')diff --git a/web/src/router/index.ts b/web/src/router/index.tsindex 9e656b1..a1bfe8b 100644--- a/web/src/router/index.ts+++ b/web/src/router/index.ts@@ -14,6 +14,12 @@ const routes = [component: () => import('../views/auth/Register.vue'),meta: { guest: true },},+ {+ path: '/auth/oauth/callback',+ name: 'oauth-callback',+ component: () => import('../views/auth/OAuthCallback.vue'),+ meta: { guest: true },+ },{path: '/',component: () => import('../layouts/DashboardLayout.vue'),@@ -28,6 +34,7 @@ const routes = [{ path: 'templates/:id/preview', name: 'template-preview', component: () => import('../views/templates/TemplatePreview.vue') },{ path: 'templates/:id/versions', name: 'template-detail', component: () => import('../views/templates/TemplateDetail.vue') },{ path: 'templates/:id/versions/:versionId/localizations/:localizationId/edit', name: 'template-editor', component: () => import('../views/templates/TemplateEditor.vue') },+ { path: 'templates/:id/versions/:versionId/localizations/:localizationId/builder', name: 'template-builder', component: () => import('../views/templates/EmailBuilder.vue') },{ path: 'languages', name: 'languages', component: () => import('../views/languages/Languages.vue') },{ path: 'stylesheets', name: 'stylesheets', component: () => import('../views/stylesheets/Stylesheets.vue') },{ path: 'smtp-servers', name: 'smtp-servers', component: () => import('../views/smtp/SmtpServers.vue') },@@ -38,11 +45,17 @@ const routes = [{ path: 'bounces', name: 'bounces', component: () => import('../views/bounces/Bounces.vue') },{ path: 'contacts', name: 'contacts', component: () => import('../views/contacts/Contacts.vue') },{ path: 'contacts/:id', name: 'contact-detail', component: () => import('../views/contacts/ContactDetail.vue') },- { path: 'contact-lists', name: 'contact-lists', component: () => import('../views/contact-lists/ContactLists.vue') },- { path: 'contact-lists/:id/members', name: 'contact-list-members', component: () => import('../views/contact-lists/ContactListMembers.vue') },+ { path: 'subscribers', name: 'subscribers', component: () => import('../views/subscribers/Subscribers.vue') },+ { path: 'subscribers/:id', name: 'subscriber-detail', component: () => import('../views/subscribers/SubscriberDetail.vue') },+ { path: 'subscriber-lists', name: 'subscriber-lists-page', component: () => import('../views/subscriber-lists/SubscriberLists.vue') },+ { path: 'subscriber-lists/:id', name: 'subscriber-list-detail', component: () => import('../views/subscriber-lists/SubscriberListDetail.vue') },+ { path: 'campaigns', name: 'campaigns', component: () => import('../views/campaigns/Campaigns.vue') },+ { path: 'campaigns/:id', name: 'campaign-detail', component: () => import('../views/campaigns/CampaignDetail.vue') },{ path: 'analytics', name: 'analytics', component: () => import('../views/analytics/Analytics.vue') },{ path: 'audit-log', name: 'audit-log', component: () => import('../views/audit/AuditLog.vue') },{ path: 'settings', name: 'settings', component: () => import('../views/settings/Settings.vue') },+ { path: 'workspaces', name: 'workspaces', component: () => import('../views/workspaces/Workspaces.vue') },+ { path: 'workspaces/:id', name: 'workspace-detail', component: () => import('../views/workspaces/WorkspaceSettings.vue') },{ path: 'profile', name: 'profile', component: () => import('../views/auth/Profile.vue') },{ path: 'change-password', redirect: '/profile' },// Admin@@ -50,9 +63,12 @@ const routes = [{ path: 'admin/users/:id', name: 'admin-user-detail', component: () => import('../views/admin/UserDetail.vue'), meta: { admin: true } },{ path: 'admin/metrics', name: 'admin-metrics', component: () => import('../views/admin/Metrics.vue'), meta: { admin: true } },{ path: 'admin/events', name: 'admin-events', component: () => import('../views/admin/Events.vue'), meta: { admin: true } },+ { path: 'admin/plans', name: 'admin-plans', component: () => import('../views/admin/Plans.vue'), meta: { admin: true } },+ { path: 'admin/plans/:id', name: 'admin-plan-detail', component: () => import('../views/admin/PlanDetail.vue'), meta: { admin: true } },{ path: 'admin/servers', name: 'admin-servers', component: () => import('../views/admin/Servers.vue'), meta: { admin: true } },{ path: 'admin/servers/:id', name: 'admin-server-detail', component: () => import('../views/admin/ServerDetail.vue'), meta: { admin: true } },{ path: 'admin/jobs', name: 'admin-jobs', component: () => import('../views/admin/Jobs.vue'), meta: { admin: true } },+ { path: 'admin/oauth', name: 'admin-oauth', component: () => import('../views/admin/OAuthProviders.vue'), meta: { admin: true } },{ path: 'admin/settings', name: 'admin-settings', component: () => import('../views/admin/Settings.vue'), meta: { admin: true } },],},diff --git a/web/src/stores/auth.ts b/web/src/stores/auth.tsindex 80271ac..24ca317 100644--- a/web/src/stores/auth.ts+++ b/web/src/stores/auth.ts@@ -32,6 +32,8 @@ export const useAuthStore = defineStore('auth', () => {user.value = nulllocalStorage.removeItem('posta_token')localStorage.removeItem('posta_user')+ // Clear workspace state+ localStorage.removeItem('posta_workspace_id')}async function fetchUser() {diff --git a/web/src/stores/workspace.ts b/web/src/stores/workspace.tsnew file mode 100644index 0000000..3935a02--- /dev/null+++ b/web/src/stores/workspace.ts@@ -0,0 +1,78 @@+import { defineStore } from 'pinia'+import { ref, computed } from 'vue'+import api from '../api/client'+import { workspaceApi } from '../api/workspaces'+import type { Workspace } from '../api/types'++const STORAGE_KEY = 'posta_workspace_id'++export const useWorkspaceStore = defineStore('workspace', () => {+ const workspaces = ref<Workspace[]>([])+ const currentWorkspaceId = ref<number | null>(+ (() => {+ const stored = localStorage.getItem(STORAGE_KEY)+ return stored ? Number(stored) : null+ })()+ )++ const currentWorkspace = computed(() =>+ workspaces.value.find((w) => w.id === currentWorkspaceId.value) ?? null+ )++ const currentRole = computed(() => currentWorkspace.value?.role ?? null)+ const isPersonal = computed(() => currentWorkspaceId.value === null)+ const isWorkspaceContext = computed(() => currentWorkspaceId.value !== null)+ const isWorkspaceAdmin = computed(() => currentRole.value === 'owner' || currentRole.value === 'admin')++ const contextLabel = computed(() => currentWorkspace.value?.name ?? 'Personal')++ function setWorkspace(wsId: number | null) {+ currentWorkspaceId.value = wsId+ if (wsId) {+ localStorage.setItem(STORAGE_KEY, String(wsId))+ } else {+ localStorage.removeItem(STORAGE_KEY)+ }+ }++ async function fetchWorkspaces() {+ try {+ const res = await workspaceApi.list()+ workspaces.value = res.data.data ?? []+ // If stored workspace no longer valid, clear it+ if (currentWorkspaceId.value && !workspaces.value.find((w) => w.id === currentWorkspaceId.value)) {+ setWorkspace(null)+ }+ } catch {+ workspaces.value = []+ }+ }++ function clear() {+ workspaces.value = []+ setWorkspace(null)+ }++ return {+ workspaces,+ currentWorkspaceId,+ currentWorkspace,+ currentRole,+ isPersonal,+ isWorkspaceContext,+ isWorkspaceAdmin,+ contextLabel,+ setWorkspace,+ fetchWorkspaces,+ clear,+ }+})++// Axios interceptor: inject X-Posta-Workspace-Id header when a workspace is selected+api.interceptors.request.use((config) => {+ const stored = localStorage.getItem(STORAGE_KEY)+ if (stored) {+ config.headers['X-Posta-Workspace-Id'] = stored+ }+ return config+})diff --git a/web/src/views/admin/OAuthProviders.vue b/web/src/views/admin/OAuthProviders.vuenew file mode 100644index 0000000..ac5a512--- /dev/null+++ b/web/src/views/admin/OAuthProviders.vue@@ -0,0 +1,196 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { oauthApi } from '../../api/oauth'+import type { OAuthProviderAdmin } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'++const notify = useNotificationStore()+const { confirm } = useConfirm()++const providers = ref<OAuthProviderAdmin[]>([])+const loading = ref(true)++const showCreateModal = ref(false)+const creating = ref(false)+const form = ref({+ name: '', slug: '', type: 'oidc',+ client_id: '', client_secret: '', issuer: '',+ auth_url: '', token_url: '', userinfo_url: '',+ scopes: 'openid email profile',+ auto_register: true, allowed_domains: '',+})++async function fetchProviders() {+ loading.value = true+ try {+ const res = await oauthApi.adminList()+ providers.value = res.data.data ?? []+ } catch {+ notify.error('Failed to load OAuth providers')+ } finally {+ loading.value = false+ }+}++function autoSlug() {+ form.value.slug = form.value.name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '')+}++async function createProvider() {+ if (!form.value.name || !form.value.slug || !form.value.client_id || !form.value.client_secret) return+ creating.value = true+ try {+ await oauthApi.adminCreate(form.value)+ notify.success('Provider created')+ showCreateModal.value = false+ form.value = { name: '', slug: '', type: 'oidc', client_id: '', client_secret: '', issuer: '', auth_url: '', token_url: '', userinfo_url: '', scopes: 'openid email profile', auto_register: true, allowed_domains: '' }+ await fetchProviders()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to create provider')+ } finally {+ creating.value = false+ }+}++async function toggleEnabled(p: OAuthProviderAdmin) {+ try {+ await oauthApi.adminUpdate(p.id, { enabled: !p.enabled })+ notify.success(p.enabled ? 'Provider disabled' : 'Provider enabled')+ await fetchProviders()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to update')+ }+}++async function deleteProvider(p: OAuthProviderAdmin) {+ const ok = await confirm({ title: 'Delete Provider', message: `Delete "${p.name}"? Users won't be able to sign in with this provider.`, confirmText: 'Delete', variant: 'danger' })+ if (!ok) return+ try {+ await oauthApi.adminDelete(p.id)+ notify.success('Provider deleted')+ await fetchProviders()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to delete')+ }+}++function formatDate(d: string) {+ return new Date(d).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++onMounted(fetchProviders)+</script>++<template>+ <div>+ <div class="page-header">+ <h1>OAuth Providers</h1>+ <button class="btn btn-primary" @click="showCreateModal = true">Add Provider</button>+ </div>++ <div v-if="loading" class="loading-page"><div class="spinner"></div></div>++ <div v-else class="card">+ <div v-if="providers.length === 0" class="empty-state">+ <h3>No OAuth providers</h3>+ <p>Add a provider to enable social login (Google, OIDC).</p>+ </div>+ <div v-else class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Name</th>+ <th>Slug</th>+ <th>Type</th>+ <th>Status</th>+ <th>Auto Register</th>+ <th>Created</th>+ <th>Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="p in providers" :key="p.id">+ <td style="font-weight: 500;">{{ p.name }}</td>+ <td><code>{{ p.slug }}</code></td>+ <td><span class="badge badge-neutral">{{ p.type }}</span></td>+ <td><span class="badge" :class="p.enabled ? 'badge-primary' : 'badge-neutral'">{{ p.enabled ? 'enabled' : 'disabled' }}</span></td>+ <td>{{ p.auto_register ? 'Yes' : 'No' }}</td>+ <td>{{ formatDate(p.created_at) }}</td>+ <td>+ <div style="display: flex; gap: 6px;">+ <button class="btn btn-secondary btn-sm" @click="toggleEnabled(p)">+ {{ p.enabled ? 'Disable' : 'Enable' }}+ </button>+ <button class="btn btn-danger btn-sm" @click="deleteProvider(p)">Delete</button>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Create Modal -->+ <div v-if="showCreateModal" class="modal-overlay" @click.self="showCreateModal = false">+ <div class="modal" style="max-width: 560px;">+ <div class="modal-header"><h3>Add OAuth Provider</h3></div>+ <form @submit.prevent="createProvider">+ <div class="modal-body">+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 16px;">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="form.name" class="form-input" placeholder="Google" required @input="autoSlug" />+ </div>+ <div class="form-group">+ <label class="form-label">Slug</label>+ <input v-model="form.slug" class="form-input" placeholder="google" required />+ </div>+ </div>+ <div class="form-group">+ <label class="form-label">Type</label>+ <select v-model="form.type" class="form-select">+ <option value="google">Google</option>+ <option value="oidc">OIDC</option>+ </select>+ </div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 16px;">+ <div class="form-group">+ <label class="form-label">Client ID</label>+ <input v-model="form.client_id" class="form-input" required />+ </div>+ <div class="form-group">+ <label class="form-label">Client Secret</label>+ <input v-model="form.client_secret" class="form-input" type="password" required />+ </div>+ </div>+ <div v-if="form.type === 'oidc'" class="form-group">+ <label class="form-label">Issuer URL</label>+ <input v-model="form.issuer" class="form-input" placeholder="https://accounts.google.com" />+ <small style="font-size: 12px; color: var(--text-muted); display: block; margin-top: 4px;">Used for OIDC auto-discovery</small>+ </div>+ <div class="form-group">+ <label class="form-label">Scopes</label>+ <input v-model="form.scopes" class="form-input" placeholder="openid email profile" />+ </div>+ <div class="form-group">+ <label class="form-label">Allowed Domains (optional)</label>+ <input v-model="form.allowed_domains" class="form-input" placeholder="example.com, company.org" />+ <small style="font-size: 12px; color: var(--text-muted); display: block; margin-top: 4px;">Comma-separated. Leave empty to allow all.</small>+ </div>+ <div class="form-group">+ <label style="display: flex; align-items: center; gap: 8px; cursor: pointer; font-size: 13px;">+ <input type="checkbox" v-model="form.auto_register" />+ Auto-register new users on first login+ </label>+ </div>+ </div>+ <div class="modal-footer">+ <button type="button" class="btn btn-secondary" @click="showCreateModal = false">Cancel</button>+ <button type="submit" class="btn btn-primary" :disabled="creating">{{ creating ? 'Creating...' : 'Create' }}</button>+ </div>+ </form>+ </div>+ </div>+ </div>+</template>diff --git a/web/src/views/admin/PlanDetail.vue b/web/src/views/admin/PlanDetail.vuenew file mode 100644index 0000000..73f49d9--- /dev/null+++ b/web/src/views/admin/PlanDetail.vue@@ -0,0 +1,375 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { plansApi } from '../../api/plans'+import type { Plan, PlanInput } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'+import { useModalSafeClose } from '../../composables/useModalSafeClose'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const plan = ref<Plan | null>(null)+const loading = ref(true)++const showModal = ref(false)+const saving = ref(false)+const form = ref<PlanInput>({+ name: '',+ description: '',+ is_default: false,+ daily_rate_limit: 0,+ hourly_rate_limit: 0,+ max_attachment_size_mb: 0,+ max_batch_size: 0,+ max_api_keys: 0,+ max_domains: 0,+ max_smtp_servers: 0,+ max_workspaces: 0,+ email_log_retention_days: 0,+})++async function fetchPlan() {+ loading.value = true+ try {+ const id = Number(route.params.id)+ const res = await plansApi.get(id)+ plan.value = res.data.data+ } catch {+ notify.error('Failed to load plan')+ } finally {+ loading.value = false+ }+}++function openEdit() {+ if (!plan.value) return+ form.value = {+ name: plan.value.name,+ description: plan.value.description,+ is_default: plan.value.is_default,+ daily_rate_limit: plan.value.daily_rate_limit,+ hourly_rate_limit: plan.value.hourly_rate_limit,+ max_attachment_size_mb: plan.value.max_attachment_size_mb,+ max_batch_size: plan.value.max_batch_size,+ max_api_keys: plan.value.max_api_keys,+ max_domains: plan.value.max_domains,+ max_smtp_servers: plan.value.max_smtp_servers,+ max_workspaces: plan.value.max_workspaces,+ email_log_retention_days: plan.value.email_log_retention_days,+ }+ showModal.value = true+}++async function save() {+ if (!plan.value) return+ saving.value = true+ try {+ await plansApi.update(plan.value.id, form.value)+ notify.success('Plan updated')+ showModal.value = false+ await fetchPlan()+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to update plan'+ notify.error(message)+ } finally {+ saving.value = false+ }+}++async function toggleActive() {+ if (!plan.value) return+ try {+ await plansApi.update(plan.value.id, { is_active: !plan.value.is_active })+ notify.success(plan.value.is_active ? 'Plan deactivated' : 'Plan activated')+ await fetchPlan()+ } catch {+ notify.error('Failed to update plan status')+ }+}++async function setDefault() {+ if (!plan.value) return+ try {+ await plansApi.setDefault(plan.value.id)+ notify.success(`"${plan.value.name}" set as default`)+ await fetchPlan()+ } catch {+ notify.error('Failed to set default plan')+ }+}++async function deletePlan() {+ if (!plan.value) return+ const confirmed = await confirm({+ title: 'Delete Plan',+ message: `Are you sure you want to delete "${plan.value.name}"? Workspaces using this plan will fall back to the default plan or global settings.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await plansApi.delete(plan.value.id, true)+ notify.success('Plan deleted')+ router.push('/admin/plans')+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to delete plan'+ notify.error(message)+ }+}++function formatLimit(value: number): string {+ return value === 0 ? 'Unlimited' : value.toLocaleString()+}++function formatDate(date: string | null) {+ if (!date) return '-'+ return new Date(date).toLocaleString()+}++const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {+ showModal.value = false+})++onMounted(fetchPlan)+</script>++<template>+ <div>+ <div class="page-header">+ <div>+ <h1>{{ plan?.name ?? 'Plan Details' }}</h1>+ </div>+ <div class="flex gap-2">+ <button class="btn btn-secondary" @click="router.push('/admin/plans')">Back</button>+ </div>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else-if="plan">+ <!-- Info Card -->+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header">+ <h2>{{ plan.name }}</h2>+ <div class="flex gap-2">+ <span class="badge badge-success" v-if="plan.is_active">Active</span>+ <span class="badge badge-neutral" v-else>Inactive</span>+ <span class="badge badge-info" v-if="plan.is_default">Default</span>+ </div>+ </div>+ <div class="card-body">+ <div v-if="plan.description" style="margin-bottom: 16px; color: var(--text-secondary)">{{ plan.description }}</div>+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 200px">Created</td>+ <td>{{ formatDate(plan.created_at) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Updated</td>+ <td>{{ formatDate(plan.updated_at) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Rate Limits -->+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header"><h2>Rate Limits</h2></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 200px">Hourly Rate Limit</td>+ <td>{{ formatLimit(plan.hourly_rate_limit) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Daily Rate Limit</td>+ <td>{{ formatLimit(plan.daily_rate_limit) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Email Constraints -->+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header"><h2>Email Constraints</h2></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 200px">Max Attachment Size</td>+ <td>{{ plan.max_attachment_size_mb === 0 ? 'Unlimited' : plan.max_attachment_size_mb + ' MB' }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Max Batch Size</td>+ <td>{{ formatLimit(plan.max_batch_size) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Resource Limits -->+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header"><h2>Resource Limits</h2></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 200px">Max API Keys</td>+ <td>{{ formatLimit(plan.max_api_keys) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Max Domains</td>+ <td>{{ formatLimit(plan.max_domains) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Max SMTP Servers</td>+ <td>{{ formatLimit(plan.max_smtp_servers) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Max Workspaces</td>+ <td>{{ formatLimit(plan.max_workspaces) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Data Retention -->+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header"><h2>Data Retention</h2></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 200px">Email Log Retention</td>+ <td>{{ plan.email_log_retention_days === 0 ? 'Global setting' : plan.email_log_retention_days + ' days' }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Actions -->+ <div class="card">+ <div class="card-header"><h2>Actions</h2></div>+ <div class="card-body">+ <div class="flex gap-2">+ <button class="btn btn-primary" @click="openEdit">Edit</button>+ <button class="btn btn-secondary" @click="toggleActive">+ {{ plan.is_active ? 'Deactivate' : 'Activate' }}+ </button>+ <button v-if="!plan.is_default" class="btn btn-secondary" @click="setDefault">Set as Default</button>+ <button class="btn btn-danger" @click="deletePlan">Delete</button>+ </div>+ </div>+ </div>+ </template>++ <div v-else class="empty-state">+ <h3>Plan not found</h3>+ </div>++ <!-- Edit Modal -->+ <div v-if="showModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">+ <div class="modal" @mousedown.stop @mouseup.stop style="max-width: 640px">+ <div class="modal-header">+ <h3>Edit Plan</h3>+ </div>+ <form @submit.prevent="save">+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="form.name" type="text" class="form-input" required />+ </div>+ <div class="form-group">+ <label class="form-label">Description</label>+ <input v-model="form.description" type="text" class="form-input" />+ </div>+ <div class="form-group">+ <label class="form-label">+ <input type="checkbox" v-model="form.is_default" style="margin-right: 6px" />+ Set as default plan+ </label>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Rate Limits</div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 12px">+ <div class="form-group">+ <label class="form-label">Hourly Rate Limit</label>+ <input v-model.number="form.hourly_rate_limit" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Daily Rate Limit</label>+ <input v-model.number="form.daily_rate_limit" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Email Constraints</div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 12px">+ <div class="form-group">+ <label class="form-label">Max Attachment Size (MB)</label>+ <input v-model.number="form.max_attachment_size_mb" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max Batch Size</label>+ <input v-model.number="form.max_batch_size" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Resource Limits</div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 12px">+ <div class="form-group">+ <label class="form-label">Max API Keys</label>+ <input v-model.number="form.max_api_keys" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max Domains</label>+ <input v-model.number="form.max_domains" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max SMTP Servers</label>+ <input v-model.number="form.max_smtp_servers" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max Workspaces</label>+ <input v-model.number="form.max_workspaces" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Data Retention</div>+ <div class="form-group">+ <label class="form-label">Email Log Retention (days)</label>+ <input v-model.number="form.email_log_retention_days" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = use global retention setting</span>+ </div>+ </div>+ <div class="modal-footer">+ <button type="button" class="btn btn-secondary" @click="showModal = false">Cancel</button>+ <button type="submit" class="btn btn-primary" :disabled="saving">+ {{ saving ? 'Saving...' : 'Update' }}+ </button>+ </div>+ </form>+ </div>+ </div>+ </div>+</template>diff --git a/web/src/views/admin/Plans.vue b/web/src/views/admin/Plans.vuenew file mode 100644index 0000000..5888b59--- /dev/null+++ b/web/src/views/admin/Plans.vue@@ -0,0 +1,328 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { useRouter } from 'vue-router'+import { plansApi } from '../../api/plans'+import type { Plan, PlanInput, Pageable } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'+import { useModalSafeClose } from '../../composables/useModalSafeClose'++const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const plans = ref<Plan[]>([])+const pageable = ref<Pageable | null>(null)+const loading = ref(true)+const currentPage = ref(0)++const showModal = ref(false)+const editing = ref<Plan | null>(null)+const saving = ref(false)++const defaultForm = (): PlanInput => ({+ name: '',+ description: '',+ is_default: false,+ daily_rate_limit: 0,+ hourly_rate_limit: 0,+ max_attachment_size_mb: 0,+ max_batch_size: 0,+ max_api_keys: 0,+ max_domains: 0,+ max_smtp_servers: 0,+ max_workspaces: 0,+ email_log_retention_days: 0,+})++const form = ref<PlanInput>(defaultForm())++async function fetchPlans() {+ loading.value = true+ try {+ const res = await plansApi.list(currentPage.value)+ plans.value = res.data.data+ pageable.value = res.data.pageable+ } catch {+ notify.error('Failed to load plans')+ } finally {+ loading.value = false+ }+}++function openCreate() {+ editing.value = null+ form.value = defaultForm()+ showModal.value = true+}++function openEdit(plan: Plan) {+ editing.value = plan+ form.value = {+ name: plan.name,+ description: plan.description,+ is_default: plan.is_default,+ daily_rate_limit: plan.daily_rate_limit,+ hourly_rate_limit: plan.hourly_rate_limit,+ max_attachment_size_mb: plan.max_attachment_size_mb,+ max_batch_size: plan.max_batch_size,+ max_api_keys: plan.max_api_keys,+ max_domains: plan.max_domains,+ max_smtp_servers: plan.max_smtp_servers,+ max_workspaces: plan.max_workspaces,+ email_log_retention_days: plan.email_log_retention_days,+ }+ showModal.value = true+}++async function save() {+ saving.value = true+ try {+ if (editing.value) {+ await plansApi.update(editing.value.id, form.value)+ notify.success('Plan updated')+ } else {+ await plansApi.create(form.value)+ notify.success('Plan created')+ }+ showModal.value = false+ await fetchPlans()+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to save plan'+ notify.error(message)+ } finally {+ saving.value = false+ }+}++async function deletePlan(plan: Plan) {+ const confirmed = await confirm({+ title: 'Delete Plan',+ message: `Are you sure you want to delete "${plan.name}"? Workspaces using this plan will fall back to the default plan or global settings.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await plansApi.delete(plan.id, true)+ notify.success('Plan deleted')+ await fetchPlans()+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to delete plan'+ notify.error(message)+ }+}++async function setDefault(plan: Plan) {+ try {+ await plansApi.setDefault(plan.id)+ notify.success(`"${plan.name}" set as default`)+ await fetchPlans()+ } catch {+ notify.error('Failed to set default plan')+ }+}++function formatLimit(value: number): string {+ return value === 0 ? 'Unlimited' : value.toLocaleString()+}++function prevPage() {+ if (currentPage.value > 0) {+ currentPage.value--+ fetchPlans()+ }+}++function nextPage() {+ if (pageable.value && currentPage.value < pageable.value.total_pages - 1) {+ currentPage.value+++ fetchPlans()+ }+}++const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {+ showModal.value = false+})++onMounted(fetchPlans)+</script>++<template>+ <div>+ <div class="page-header">+ <div>+ <h1>Plans</h1>+ <p class="page-description">Manage usage plans and packages. Plans control rate limits, resource quotas, and retention policies for workspaces.</p>+ </div>+ <button class="btn btn-primary" @click="openCreate">Create Plan</button>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else>+ <div class="card">+ <div class="table-wrapper" v-if="plans.length > 0">+ <table>+ <thead>+ <tr>+ <th>Name</th>+ <th>Status</th>+ <th>Rate Limits</th>+ <th>Resources</th>+ <th>Workspaces</th>+ <th>Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="plan in plans" :key="plan.id">+ <td>+ <strong>{{ plan.name }}</strong>+ <span v-if="plan.is_default" class="badge badge-info" style="margin-left: 8px">Default</span>+ <div v-if="plan.description" class="text-muted" style="font-size: 13px; margin-top: 2px">{{ plan.description }}</div>+ </td>+ <td>+ <span class="badge badge-success" v-if="plan.is_active">Active</span>+ <span class="badge badge-neutral" v-else>Inactive</span>+ </td>+ <td>+ <div style="font-size: 13px">+ <div>{{ formatLimit(plan.hourly_rate_limit) }}/hr</div>+ <div>{{ formatLimit(plan.daily_rate_limit) }}/day</div>+ </div>+ </td>+ <td>+ <div style="font-size: 13px">+ <div>Keys: {{ formatLimit(plan.max_api_keys) }}</div>+ <div>Domains: {{ formatLimit(plan.max_domains) }}</div>+ <div>SMTP: {{ formatLimit(plan.max_smtp_servers) }}</div>+ </div>+ </td>+ <td>{{ formatLimit(plan.max_workspaces) }}</td>+ <td>+ <div class="flex gap-2">+ <button class="btn btn-secondary btn-sm" @click="router.push(`/admin/plans/${plan.id}`)">View</button>+ <button class="btn btn-secondary btn-sm" @click="openEdit(plan)">Edit</button>+ <button v-if="!plan.is_default" class="btn btn-secondary btn-sm" @click="setDefault(plan)">Set Default</button>+ <button class="btn btn-danger btn-sm" @click="deletePlan(plan)">Delete</button>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>++ <div v-else class="empty-state">+ <h3>No plans</h3>+ <p>Create a plan to define usage limits and resource quotas for workspaces.</p>+ </div>++ <div v-if="pageable && !pageable.empty" class="pagination">+ <span class="pagination-info">+ Page {{ pageable.current_page + 1 }} of {{ pageable.total_pages }}+ ({{ pageable.total_elements }} total)+ </span>+ <div class="pagination-buttons">+ <button class="btn btn-secondary btn-sm" :disabled="currentPage === 0" @click="prevPage">Previous</button>+ <button class="btn btn-secondary btn-sm" :disabled="currentPage >= pageable.total_pages - 1" @click="nextPage">Next</button>+ </div>+ </div>+ </div>+ </template>++ <!-- Create/Edit Modal -->+ <div v-if="showModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">+ <div class="modal" @mousedown.stop @mouseup.stop style="max-width: 640px">+ <div class="modal-header">+ <h3>{{ editing ? 'Edit Plan' : 'Create Plan' }}</h3>+ </div>+ <form @submit.prevent="save">+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="form.name" type="text" class="form-input" placeholder="e.g. Starter, Pro, Enterprise" required />+ </div>+ <div class="form-group">+ <label class="form-label">Description</label>+ <input v-model="form.description" type="text" class="form-input" placeholder="Brief description of this plan" />+ </div>+ <div class="form-group">+ <label class="form-label">+ <input type="checkbox" v-model="form.is_default" style="margin-right: 6px" />+ Set as default plan+ </label>+ <span class="form-hint">New workspaces without a plan will use the default plan's limits.</span>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Rate Limits</div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 12px">+ <div class="form-group">+ <label class="form-label">Hourly Rate Limit</label>+ <input v-model.number="form.hourly_rate_limit" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Daily Rate Limit</label>+ <input v-model.number="form.daily_rate_limit" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Email Constraints</div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 12px">+ <div class="form-group">+ <label class="form-label">Max Attachment Size (MB)</label>+ <input v-model.number="form.max_attachment_size_mb" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max Batch Size</label>+ <input v-model.number="form.max_batch_size" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Resource Limits</div>+ <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 12px">+ <div class="form-group">+ <label class="form-label">Max API Keys</label>+ <input v-model.number="form.max_api_keys" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max Domains</label>+ <input v-model.number="form.max_domains" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max SMTP Servers</label>+ <input v-model.number="form.max_smtp_servers" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ <div class="form-group">+ <label class="form-label">Max Workspaces</label>+ <input v-model.number="form.max_workspaces" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = unlimited</span>+ </div>+ </div>++ <div style="margin: 16px 0 8px; font-weight: 600; font-size: 14px">Data Retention</div>+ <div class="form-group">+ <label class="form-label">Email Log Retention (days)</label>+ <input v-model.number="form.email_log_retention_days" type="number" class="form-input" min="0" />+ <span class="form-hint">0 = use global retention setting</span>+ </div>+ </div>+ <div class="modal-footer">+ <button type="button" class="btn btn-secondary" @click="showModal = false">Cancel</button>+ <button type="submit" class="btn btn-primary" :disabled="saving">+ {{ saving ? 'Saving...' : (editing ? 'Update' : 'Create') }}+ </button>+ </div>+ </form>+ </div>+ </div>+ </div>+</template>diff --git a/web/src/views/admin/UserDetail.vue b/web/src/views/admin/UserDetail.vueindex 623d676..12973ae 100644--- a/web/src/views/admin/UserDetail.vue+++ b/web/src/views/admin/UserDetail.vue@@ -2,8 +2,9 @@import { ref, onMounted } from 'vue'import { useRoute, useRouter } from 'vue-router'import { adminApi } from '../../api/admin'+import { plansApi } from '../../api/plans'import { useNotificationStore } from '../../stores/notification'-import type { UserDetailMetrics } from '../../api/types'+import type { UserDetailMetrics, AdminWorkspace, Plan } from '../../api/types'const route = useRoute()const router = useRouter()@@ -11,14 +12,23 @@ const notification = useNotificationStore()const loading = ref(true)const metrics = ref<UserDetailMetrics | null>(null)const disabling2FA = ref(false)+const workspaces = ref<AdminWorkspace[]>([])+const plans = ref<Plan[]>([])+const changingPlan = ref<number | null>(null)onMounted(async () => {try {const id = Number(route.params.id)- const res = await adminApi.getUserMetrics(id)- metrics.value = res.data.data+ const [metricsRes, workspacesRes, plansRes] = await Promise.all([+ adminApi.getUserMetrics(id),+ adminApi.getUserWorkspaces(id),+ plansApi.list(0, 100),+ ])+ metrics.value = metricsRes.data.data+ workspaces.value = workspacesRes.data.data+ plans.value = plansRes.data.data} catch (e) {- console.error('Failed to load user metrics', e)+ console.error('Failed to load user details', e)} finally {loading.value = false}@@ -38,6 +48,23 @@ async function handleDisable2FA() {}}+async function handleChangePlan(workspace: AdminWorkspace, planId: number | null) {+ changingPlan.value = workspace.id+ try {+ if (planId) {+ await plansApi.assignToWorkspace(workspace.id, planId)+ const plan = plans.value.find(p => p.id === planId)+ workspace.plan_id = planId+ workspace.plan_name = plan?.name || ''+ notification.success(`Plan updated for workspace "${workspace.name}".`)+ }+ } catch {+ notification.error('Failed to update workspace plan.')+ } finally {+ changingPlan.value = null+ }+}+function roleBadgeClass(role: string) {switch (role) {case 'admin': return 'badge badge-info'@@ -170,6 +197,48 @@ function formatDate(date: string) {<div class="stat-value">{{ metrics.total_smtp_servers }}</div></div></div>++ <!-- Workspaces Section -->+ <div class="card" style="margin-top: 24px;">+ <div class="card-header">+ <h2>Workspaces</h2>+ </div>+ <div class="card-body">+ <div v-if="workspaces.length === 0" class="empty-state" style="padding: 24px 0;">+ <p>This user has no workspaces.</p>+ </div>+ <table v-else class="table">+ <thead>+ <tr>+ <th>Name</th>+ <th>Slug</th>+ <th>Plan</th>+ <th>Created</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="ws in workspaces" :key="ws.id">+ <td>{{ ws.name }}</td>+ <td><code>{{ ws.slug }}</code></td>+ <td>+ <select+ class="form-select form-select-sm"+ :value="ws.plan_id || ''"+ :disabled="changingPlan === ws.id"+ @change="handleChangePlan(ws, Number($event.target.value) || null)"+ >+ <option value="">No plan (use default)</option>+ <option v-for="plan in plans" :key="plan.id" :value="plan.id">+ {{ plan.name }}{{ !plan.is_active ? ' (inactive)' : '' }}{{ plan.is_default ? ' (default)' : '' }}+ </option>+ </select>+ </td>+ <td>{{ formatDate(ws.created_at) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div></template><div v-else class="empty-state">diff --git a/web/src/views/auth/Login.vue b/web/src/views/auth/Login.vueindex a00a211..9bb4184 100644--- a/web/src/views/auth/Login.vue+++ b/web/src/views/auth/Login.vue@@ -2,9 +2,11 @@import { ref, onMounted } from 'vue'import { useRouter } from 'vue-router'import { authApi } from '../../api/auth'+import { oauthApi } from '../../api/oauth'import { useAuthStore } from '../../stores/auth'import { useNotificationStore } from '../../stores/notification'import { useThemeStore } from '../../stores/theme'+import type { OAuthProviderInfo } from '../../api/types'const router = useRouter()const auth = useAuthStore()@@ -17,14 +19,25 @@ const twoFactorCode = ref('')const loading = ref(false)const requires2FA = ref(false)const registrationEnabled = ref(false)+const oauthProviders = ref<OAuthProviderInfo[]>([])+const loginError = ref(router.currentRoute.value.query.error as string || '')onMounted(async () => {try {- const res = await authApi.registrationStatus()- registrationEnabled.value = res.data.data.registration_enabled+ const [regRes, oauthRes] = await Promise.all([+ authApi.registrationStatus(),+ oauthApi.providers(),+ ])+ registrationEnabled.value = regRes.data.data.registration_enabled+ oauthProviders.value = oauthRes.data.data.providers || []} catch { /* ignore */ }})+function oauthLogin(slug: string) {+ // Full page navigation to the backend OAuth authorize endpoint+ window.location.href = `/api/v1/auth/oauth/${slug}/authorize`+}+async function handleLogin() {if (!email.value || !password.value) {notification.error('Please fill in all fields.')@@ -115,6 +128,30 @@ function resetLogin() {</button></form>+ <!-- OAuth Providers -->+ <div v-if="oauthProviders.length > 0 && !requires2FA" class="oauth-section">+ <div class="oauth-divider">+ <span>or</span>+ </div>+ <div class="oauth-buttons">+ <button+ v-for="p in oauthProviders"+ :key="p.slug"+ class="btn btn-secondary auth-btn oauth-btn"+ @click="oauthLogin(p.slug)"+ >+ <svg v-if="p.type === 'google'" width="18" height="18" viewBox="0 0 24 24"><path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92a5.06 5.06 0 01-2.2 3.32v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.1z" fill="#4285F4"/><path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853"/><path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18A10.97 10.97 0 001 12c0 1.77.42 3.45 1.18 4.93l3.66-2.84z" fill="#FBBC05"/><path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335"/></svg>+ <svg v-else width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg>+ Sign in with {{ p.name }}+ </button>+ </div>+ </div>++ <!-- Login error from OAuth redirect -->+ <div v-if="loginError" class="oauth-error-msg">+ Authentication failed: {{ loginError.replace(/_/g, ' ') }}+ </div>+<div class="auth-footer"><template v-if="registrationEnabled"><span>Don't have an account?</span>@@ -223,4 +260,42 @@ function resetLogin() {box-shadow: var(--shadow-sm);}.theme-btn:hover { color: var(--text-primary); border-color: var(--border-input); }++.oauth-section { padding: 0 32px 20px; }++.oauth-divider {+ display: flex;+ align-items: center;+ gap: 12px;+ margin-bottom: 16px;+}+.oauth-divider::before, .oauth-divider::after {+ content: '';+ flex: 1;+ height: 1px;+ background: var(--border-primary);+}+.oauth-divider span {+ font-size: 12px;+ color: var(--text-muted);+ text-transform: uppercase;+ letter-spacing: 0.05em;+}++.oauth-buttons { display: flex; flex-direction: column; gap: 8px; }++.oauth-btn {+ display: flex;+ align-items: center;+ justify-content: center;+ gap: 10px;+ font-weight: 500;+}++.oauth-error-msg {+ padding: 10px 32px 16px;+ font-size: 13px;+ color: var(--danger-600);+ text-align: center;+}</style>diff --git a/web/src/views/auth/OAuthCallback.vue b/web/src/views/auth/OAuthCallback.vuenew file mode 100644index 0000000..ad30c8e--- /dev/null+++ b/web/src/views/auth/OAuthCallback.vue@@ -0,0 +1,84 @@+<script setup lang="ts">+import { onMounted, ref } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { useAuthStore } from '../../stores/auth'++const route = useRoute()+const router = useRouter()+const auth = useAuthStore()+const error = ref('')++onMounted(async () => {+ const token = route.query.token as string+ const errorParam = route.query.error as string++ if (errorParam) {+ error.value = errorParam.replace(/_/g, ' ')+ setTimeout(() => router.push('/login'), 3000)+ return+ }++ if (!token) {+ error.value = 'No token received'+ setTimeout(() => router.push('/login'), 3000)+ return+ }++ // Set token and fetch user profile+ localStorage.setItem('posta_token', token)+ auth.token = token++ try {+ await auth.fetchUser()+ router.push('/')+ } catch {+ error.value = 'Failed to load user profile'+ setTimeout(() => router.push('/login'), 3000)+ }+})+</script>++<template>+ <div class="oauth-callback">+ <div v-if="error" class="oauth-error">+ <h2>Authentication Error</h2>+ <p>{{ error }}</p>+ <p style="font-size: 13px; color: var(--text-muted);">Redirecting to login...</p>+ </div>+ <div v-else class="oauth-loading">+ <div class="spinner"></div>+ <p>Completing sign in...</p>+ </div>+ </div>+</template>++<style scoped>+.oauth-callback {+ display: flex;+ align-items: center;+ justify-content: center;+ min-height: 100vh;+ background: var(--bg-secondary);+}++.oauth-loading, .oauth-error {+ text-align: center;+ padding: 40px;+}++.oauth-loading p {+ margin-top: 16px;+ font-size: 14px;+ color: var(--text-secondary);+}++.oauth-error h2 {+ color: var(--danger-600);+ margin-bottom: 8px;+}++.oauth-error p {+ color: var(--text-secondary);+ font-size: 14px;+}+</style>diff --git a/web/src/views/auth/Profile.vue b/web/src/views/auth/Profile.vueindex 53e853c..cd25c2a 100644--- a/web/src/views/auth/Profile.vue+++ b/web/src/views/auth/Profile.vue@@ -1,5 +1,6 @@<script setup lang="ts">import { ref, onMounted } from 'vue'+import { useRouter } from 'vue-router'import { authApi } from '../../api/auth'import { sessionsApi, type Session } from '../../api/sessions'import { useAuthStore } from '../../stores/auth'@@ -8,20 +9,24 @@ import { useConfirm } from '../../composables/useConfirm'const auth = useAuthStore()const notify = useNotificationStore()const { confirm } = useConfirm()+const router = useRouter()// Profileconst name = ref('')const email = ref('')const profileLoading = ref(false)const twoFactorEnabled = ref(false)+const scheduledDeletionAt = ref<string | null>(null)+const deletionLoading = ref(false)onMounted(async () => {name.value = auth.user?.name || ''email.value = auth.user?.email || ''- // Fetch fresh profile to get 2FA status+ // Fetch fresh profile to get 2FA status and deletion statustry {const res = await authApi.me()twoFactorEnabled.value = res.data.data.two_factor_enabled+ scheduledDeletionAt.value = res.data.data.scheduled_deletion_at} catch { /* ignore */ }})@@ -231,6 +236,57 @@ function formatSessionDate(dateStr: string): string {})}+// Account Deletion+async function requestAccountDeletion() {+ const confirmed = await confirm({+ title: 'Delete Account',+ message: 'Are you sure you want to delete your account? Your account will be deactivated immediately and permanently deleted after 7 days. You can cancel this during the 7-day period.',+ confirmText: 'Delete My Account',+ variant: 'danger',+ })+ if (!confirmed) return++ deletionLoading.value = true+ try {+ const res = await authApi.requestAccountDeletion()+ scheduledDeletionAt.value = res.data.data.scheduled_deletion_at+ notify.success('Account scheduled for deletion in 7 days')+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to schedule account deletion'+ notify.error(message)+ } finally {+ deletionLoading.value = false+ }+}++async function cancelAccountDeletion() {+ const confirmed = await confirm({+ title: 'Cancel Account Deletion',+ message: 'Are you sure you want to cancel the scheduled deletion and reactivate your account?',+ confirmText: 'Keep My Account',+ variant: 'danger',+ })+ if (!confirmed) return++ deletionLoading.value = true+ try {+ await authApi.cancelAccountDeletion()+ scheduledDeletionAt.value = null+ notify.success('Account deletion cancelled')+ } catch (e: any) {+ const message = e?.response?.data?.error?.message || 'Failed to cancel account deletion'+ notify.error(message)+ } finally {+ deletionLoading.value = false+ }+}++function formatDeletionDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, {+ year: 'numeric', month: 'long', day: 'numeric',+ })+}+// Load sessions on mountonMounted(() => { loadSessions() })</script>@@ -422,6 +478,33 @@ onMounted(() => { loadSessions() })</form></div></div>++ <!-- Danger Zone -->+ <div class="card danger-card" v-if="auth.user?.role !== 'admin'">+ <div class="card-header"><h2>Danger Zone</h2></div>+ <div class="card-body">+ <!-- Deletion already scheduled -->+ <template v-if="scheduledDeletionAt">+ <div class="deletion-notice">+ <p class="deletion-warning">Your account is scheduled for permanent deletion on <strong>{{ formatDeletionDate(scheduledDeletionAt) }}</strong>.</p>+ <p class="tfa-description">Your account has been deactivated. All your data will be permanently removed after this date. You can cancel the deletion to reactivate your account.</p>+ <button class="btn btn-primary" :disabled="deletionLoading" @click="cancelAccountDeletion">+ {{ deletionLoading ? 'Cancelling...' : 'Cancel Deletion' }}+ </button>+ </div>+ </template>++ <!-- No deletion scheduled -->+ <template v-else>+ <p class="tfa-description">+ Permanently delete your account and all associated data. Your account will be deactivated immediately and permanently deleted after 7 days. This gives you time to change your mind.+ </p>+ <button class="btn btn-danger" :disabled="deletionLoading" @click="requestAccountDeletion">+ {{ deletionLoading ? 'Processing...' : 'Delete My Account' }}+ </button>+ </template>+ </div>+ </div></div></div></template>@@ -528,4 +611,23 @@ onMounted(() => { loadSessions() })color: var(--text-muted);margin-top: 2px;}++.danger-card {+ border-color: var(--danger-200, #fecaca);+}++.danger-card .card-header h2 {+ color: var(--danger-600, #dc2626);+}++.deletion-notice {+ display: grid;+ gap: 12px;+}++.deletion-warning {+ font-size: 14px;+ color: var(--danger-600, #dc2626);+ margin: 0;+}</style>diff --git a/web/src/views/campaigns/CampaignDetail.vue b/web/src/views/campaigns/CampaignDetail.vuenew file mode 100644index 0000000..2c4442e--- /dev/null+++ b/web/src/views/campaigns/CampaignDetail.vue@@ -0,0 +1,516 @@+<script setup lang="ts">+import { ref, computed, onMounted } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { campaignsApi } from '../../api/campaigns'+import type { Campaign, CampaignMessage, CampaignMessageStatus, CampaignAnalyticsData, Pageable } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const campaignId = Number(route.params.id)+const campaign = ref<Campaign | null>(null)+const messages = ref<CampaignMessage[]>([])+const pageable = ref<Pageable>({ current_page: 0, size: 20, total_pages: 0, total_elements: 0, empty: true })+const loading = ref(true)+const messagesLoading = ref(false)+const messageStatusFilter = ref('')+const actionLoading = ref(false)++// Analytics+const activeTab = ref<'messages' | 'analytics'>('messages')+const analyticsData = ref<CampaignAnalyticsData | null>(null)+const analyticsLoading = ref(false)++const canSend = computed(() => campaign.value?.status === 'draft')+const canPause = computed(() => campaign.value?.status === 'sending')+const canResume = computed(() => campaign.value?.status === 'paused')+const canCancel = computed(() => ['sending', 'paused', 'scheduled'].includes(campaign.value?.status ?? ''))+const canDelete = computed(() => ['draft', 'cancelled'].includes(campaign.value?.status ?? ''))+const showAnalyticsTab = computed(() => ['sending', 'sent', 'paused', 'cancelled'].includes(campaign.value?.status ?? ''))++async function loadCampaign() {+ loading.value = true+ try {+ const res = await campaignsApi.get(campaignId)+ campaign.value = res.data.data+ } catch {+ notify.error('Failed to load campaign')+ router.push('/campaigns')+ } finally {+ loading.value = false+ }+}++async function loadMessages(page = 0) {+ messagesLoading.value = true+ try {+ const res = await campaignsApi.listMessages(campaignId, page, pageable.value.size, messageStatusFilter.value || undefined)+ messages.value = res.data.data ?? []+ pageable.value = res.data.pageable+ } catch {+ notify.error('Failed to load messages')+ } finally {+ messagesLoading.value = false+ }+}++async function loadAnalytics() {+ analyticsLoading.value = true+ try {+ const res = await campaignsApi.analytics(campaignId)+ analyticsData.value = res.data.data+ } catch {+ notify.error('Failed to load analytics')+ } finally {+ analyticsLoading.value = false+ }+}++function switchTab(tab: 'messages' | 'analytics') {+ activeTab.value = tab+ if (tab === 'analytics' && !analyticsData.value) {+ loadAnalytics()+ }+}++function switchMessageStatus(status: string) {+ messageStatusFilter.value = status+ loadMessages(0)+}++async function sendCampaign() {+ const confirmed = await confirm({+ title: 'Send Campaign',+ message: `Are you sure you want to send "${campaign.value?.name}"? This will start delivering emails to all subscribers in the list.`,+ confirmText: 'Send',+ variant: 'primary',+ })+ if (!confirmed) return+ actionLoading.value = true+ try {+ await campaignsApi.send(campaignId)+ notify.success('Campaign is being sent')+ await loadCampaign()+ await loadMessages(0)+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to send campaign')+ } finally {+ actionLoading.value = false+ }+}++async function pauseCampaign() {+ actionLoading.value = true+ try {+ await campaignsApi.pause(campaignId)+ notify.success('Campaign paused')+ await loadCampaign()+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to pause campaign')+ } finally {+ actionLoading.value = false+ }+}++async function resumeCampaign() {+ actionLoading.value = true+ try {+ await campaignsApi.resume(campaignId)+ notify.success('Campaign resumed')+ await loadCampaign()+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to resume campaign')+ } finally {+ actionLoading.value = false+ }+}++async function cancelCampaign() {+ const confirmed = await confirm({+ title: 'Cancel Campaign',+ message: `Are you sure you want to cancel "${campaign.value?.name}"? Pending messages will not be sent.`,+ confirmText: 'Cancel Campaign',+ variant: 'danger',+ })+ if (!confirmed) return+ actionLoading.value = true+ try {+ await campaignsApi.cancel(campaignId)+ notify.success('Campaign cancelled')+ await loadCampaign()+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to cancel campaign')+ } finally {+ actionLoading.value = false+ }+}++async function deleteCampaign() {+ const confirmed = await confirm({+ title: 'Delete Campaign',+ message: `Are you sure you want to delete "${campaign.value?.name}"? This action cannot be undone.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await campaignsApi.delete(campaignId)+ notify.success('Campaign deleted')+ router.push('/campaigns')+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to delete campaign')+ }+}++function statusBadgeClass(status: string): string {+ switch (status) {+ case 'draft': return 'badge badge-neutral'+ case 'scheduled': return 'badge badge-info'+ case 'sending': return 'badge badge-primary'+ case 'sent': return 'badge badge-success'+ case 'paused': return 'badge badge-warning'+ case 'cancelled': case 'failed': return 'badge badge-danger'+ case 'pending': return 'badge badge-neutral'+ case 'queued': return 'badge badge-info'+ case 'skipped': return 'badge badge-warning'+ default: return 'badge'+ }+}++function formatDate(dateStr?: string): string {+ if (!dateStr) return '-'+ return new Date(dateStr).toLocaleString(undefined, {+ year: 'numeric', month: 'short', day: 'numeric',+ hour: '2-digit', minute: '2-digit',+ })+}++function formatRate(value: number): string {+ return value.toFixed(1) + '%'+}++function maxSeriesCount(series: Array<{ time: string; count: number }>): number {+ if (series.length === 0) return 1+ return Math.max(...series.map(p => p.count), 1)+}++const messageStatusTabs: { label: string; value: string }[] = [+ { label: 'All', value: '' },+ { label: 'Pending', value: 'pending' },+ { label: 'Queued', value: 'queued' },+ { label: 'Sent', value: 'sent' },+ { label: 'Failed', value: 'failed' },+ { label: 'Skipped', value: 'skipped' },+]++onMounted(async () => {+ await loadCampaign()+ await loadMessages()+})+</script>++<template>+ <div>+ <div class="page-header">+ <div>+ <button class="btn btn-secondary btn-sm" @click="router.push('/campaigns')" style="margin-bottom: 8px;">← Back to Campaigns</button>+ <h1 v-if="campaign">{{ campaign.name }}</h1>+ </div>+ <div v-if="campaign" style="display: flex; gap: 8px; align-items: flex-start;">+ <button v-if="canSend" class="btn btn-primary" :disabled="actionLoading" @click="sendCampaign">Send</button>+ <button v-if="canPause" class="btn btn-warning" :disabled="actionLoading" @click="pauseCampaign">Pause</button>+ <button v-if="canResume" class="btn btn-primary" :disabled="actionLoading" @click="resumeCampaign">Resume</button>+ <button v-if="canCancel" class="btn btn-danger" :disabled="actionLoading" @click="cancelCampaign">Cancel</button>+ <button v-if="canDelete" class="btn btn-danger" @click="deleteCampaign">Delete</button>+ </div>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else-if="campaign">+ <!-- Campaign Info -->+ <div class="card" style="margin-bottom: 24px;">+ <div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); gap: 16px;">+ <div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Status</div>+ <span :class="statusBadgeClass(campaign.status)" style="margin-top: 4px;">{{ campaign.status }}</span>+ </div>+ <div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Subject</div>+ <div style="font-weight: 500;">{{ campaign.subject }}</div>+ </div>+ <div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">From</div>+ <div>{{ campaign.from_name ? `${campaign.from_name} <${campaign.from_email}>` : campaign.from_email }}</div>+ </div>+ <div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Send Rate</div>+ <div>{{ campaign.send_rate > 0 ? `${campaign.send_rate} msgs/min` : 'Unlimited' }}</div>+ </div>+ <div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Created</div>+ <div>{{ formatDate(campaign.created_at) }}</div>+ </div>+ <div v-if="campaign.started_at">+ <div style="font-size: 0.85em; color: var(--text-secondary);">Started</div>+ <div>{{ formatDate(campaign.started_at) }}</div>+ </div>+ <div v-if="campaign.completed_at">+ <div style="font-size: 0.85em; color: var(--text-secondary);">Completed</div>+ <div>{{ formatDate(campaign.completed_at) }}</div>+ </div>+ <div v-if="campaign.scheduled_at">+ <div style="font-size: 0.85em; color: var(--text-secondary);">Scheduled</div>+ <div>{{ formatDate(campaign.scheduled_at) }}</div>+ </div>+ </div>+ </div>++ <!-- Stats -->+ <div v-if="campaign.stats && campaign.stats.total > 0" class="card" style="margin-bottom: 24px;">+ <h3 style="margin-bottom: 12px;">Delivery Stats</h3>+ <div style="display: flex; gap: 24px; flex-wrap: wrap;">+ <div style="text-align: center;">+ <div style="font-size: 1.5em; font-weight: 600;">{{ campaign.stats.total }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Total</div>+ </div>+ <div style="text-align: center;">+ <div style="font-size: 1.5em; font-weight: 600; color: var(--success-600);">{{ campaign.stats.sent }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Sent</div>+ </div>+ <div style="text-align: center;">+ <div style="font-size: 1.5em; font-weight: 600;">{{ campaign.stats.queued }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Queued</div>+ </div>+ <div style="text-align: center;">+ <div style="font-size: 1.5em; font-weight: 600;">{{ campaign.stats.pending }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Pending</div>+ </div>+ <div style="text-align: center;">+ <div style="font-size: 1.5em; font-weight: 600; color: var(--danger-600);">{{ campaign.stats.failed }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Failed</div>+ </div>+ <div style="text-align: center;">+ <div style="font-size: 1.5em; font-weight: 600;">{{ campaign.stats.skipped }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary);">Skipped</div>+ </div>+ </div>++ <!-- Progress bar -->+ <div v-if="campaign.stats.total > 0" style="margin-top: 16px;">+ <div style="width: 100%; height: 8px; background: var(--bg-secondary); border-radius: 4px; overflow: hidden; display: flex;">+ <div :style="{ width: (campaign.stats.sent / campaign.stats.total * 100) + '%', background: 'var(--success-600)' }"></div>+ <div :style="{ width: (campaign.stats.failed / campaign.stats.total * 100) + '%', background: 'var(--danger-600)' }"></div>+ <div :style="{ width: (campaign.stats.queued / campaign.stats.total * 100) + '%', background: 'var(--primary-600)' }"></div>+ </div>+ </div>+ </div>++ <!-- Tab navigation -->+ <div class="tabs" style="margin-bottom: 16px;">+ <button+ class="btn btn-sm"+ :class="activeTab === 'messages' ? 'btn-primary' : 'btn-secondary'"+ @click="switchTab('messages')"+ style="margin-right: 4px;"+ >+ Messages+ </button>+ <button+ v-if="showAnalyticsTab"+ class="btn btn-sm"+ :class="activeTab === 'analytics' ? 'btn-primary' : 'btn-secondary'"+ @click="switchTab('analytics')"+ style="margin-right: 4px;"+ >+ Analytics+ </button>+ </div>++ <!-- Messages Tab -->+ <div v-if="activeTab === 'messages'" class="card">+ <h3 style="margin-bottom: 12px;">Messages</h3>++ <div class="tabs" style="margin-bottom: 16px;">+ <button+ v-for="tab in messageStatusTabs"+ :key="tab.value"+ class="btn btn-sm"+ :class="messageStatusFilter === tab.value ? 'btn-primary' : 'btn-secondary'"+ @click="switchMessageStatus(tab.value)"+ style="margin-right: 4px;"+ >+ {{ tab.label }}+ </button>+ </div>++ <div v-if="messagesLoading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else>+ <div v-if="messages.length === 0" class="empty-state">+ <p>No messages yet.</p>+ </div>++ <template v-else>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Subscriber</th>+ <th>Status</th>+ <th>Error</th>+ <th>Sent At</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="msg in messages" :key="msg.id">+ <td>{{ msg.subscriber?.email ?? `#${msg.subscriber_id}` }}</td>+ <td><span :class="statusBadgeClass(msg.status)">{{ msg.status }}</span></td>+ <td style="max-width: 300px; overflow: hidden; text-overflow: ellipsis;">{{ msg.error_message || '-' }}</td>+ <td>{{ formatDate(msg.sent_at) }}</td>+ </tr>+ </tbody>+ </table>+ </div>++ <div class="pagination">+ <span class="pagination-info">+ Page {{ pageable.current_page + 1 }} of {{ pageable.total_pages }} ({{ pageable.total_elements }} messages)+ </span>+ <div class="pagination-buttons">+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page === 0" @click="loadMessages(pageable.current_page - 1)">Previous</button>+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page >= pageable.total_pages - 1" @click="loadMessages(pageable.current_page + 1)">Next</button>+ </div>+ </div>+ </template>+ </template>+ </div>++ <!-- Analytics Tab -->+ <div v-if="activeTab === 'analytics'">+ <div v-if="analyticsLoading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else-if="analyticsData">+ <!-- Rate Cards -->+ <div class="card" style="margin-bottom: 24px;">+ <h3 style="margin-bottom: 16px;">Engagement Rates</h3>+ <div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 16px;">+ <div style="text-align: center; padding: 16px; background: var(--bg-secondary); border-radius: 8px;">+ <div style="font-size: 1.8em; font-weight: 700; color: var(--success-600);">{{ formatRate(analyticsData.analytics.delivery_rate) }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary); margin-top: 4px;">Delivery Rate</div>+ <div style="font-size: 0.75em; color: var(--text-secondary);">{{ analyticsData.analytics.sent_messages }} / {{ analyticsData.analytics.total_messages }}</div>+ </div>+ <div style="text-align: center; padding: 16px; background: var(--bg-secondary); border-radius: 8px;">+ <div style="font-size: 1.8em; font-weight: 700; color: var(--primary-600);">{{ formatRate(analyticsData.analytics.open_rate) }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary); margin-top: 4px;">Open Rate</div>+ <div style="font-size: 0.75em; color: var(--text-secondary);">{{ analyticsData.analytics.opened_messages }} opened</div>+ </div>+ <div style="text-align: center; padding: 16px; background: var(--bg-secondary); border-radius: 8px;">+ <div style="font-size: 1.8em; font-weight: 700; color: var(--primary-600);">{{ formatRate(analyticsData.analytics.click_rate) }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary); margin-top: 4px;">Click Rate</div>+ <div style="font-size: 0.75em; color: var(--text-secondary);">{{ analyticsData.analytics.clicked_messages }} clicked</div>+ </div>+ <div style="text-align: center; padding: 16px; background: var(--bg-secondary); border-radius: 8px;">+ <div style="font-size: 1.8em; font-weight: 700; color: var(--danger-600);">{{ formatRate(analyticsData.analytics.bounce_rate) }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary); margin-top: 4px;">Bounce Rate</div>+ <div style="font-size: 0.75em; color: var(--text-secondary);">{{ analyticsData.analytics.bounced_messages }} bounced</div>+ </div>+ <div style="text-align: center; padding: 16px; background: var(--bg-secondary); border-radius: 8px;">+ <div style="font-size: 1.8em; font-weight: 700; color: var(--warning-600);">{{ formatRate(analyticsData.analytics.unsubscribe_rate) }}</div>+ <div style="font-size: 0.85em; color: var(--text-secondary); margin-top: 4px;">Unsubscribe Rate</div>+ <div style="font-size: 0.75em; color: var(--text-secondary);">{{ analyticsData.analytics.unsubscribed }} unsubscribed</div>+ </div>+ </div>+ </div>++ <!-- Link Click Table -->+ <div v-if="analyticsData.links && analyticsData.links.length > 0" class="card" style="margin-bottom: 24px;">+ <h3 style="margin-bottom: 12px;">Link Clicks</h3>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>URL</th>+ <th style="text-align: right; width: 120px;">Clicks</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="link in analyticsData.links" :key="link.id">+ <td style="max-width: 500px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">+ <a :href="link.original_url" target="_blank" rel="noopener" style="color: var(--primary-600);">{{ link.original_url }}</a>+ </td>+ <td style="text-align: right; font-weight: 600;">{{ link.click_count }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Time Series: Opens -->+ <div v-if="analyticsData.open_series && analyticsData.open_series.length > 0" class="card" style="margin-bottom: 24px;">+ <h3 style="margin-bottom: 12px;">Opens Over Time</h3>+ <div style="display: flex; align-items: flex-end; gap: 2px; height: 120px; padding: 8px 0;">+ <div+ v-for="(point, idx) in analyticsData.open_series"+ :key="'open-' + idx"+ :title="point.time + ': ' + point.count + ' opens'"+ :style="{+ flex: '1',+ minWidth: '4px',+ maxWidth: '32px',+ height: Math.max((point.count / maxSeriesCount(analyticsData.open_series)) * 100, 2) + '%',+ background: 'var(--primary-600)',+ borderRadius: '2px 2px 0 0',+ }"+ ></div>+ </div>+ <div style="display: flex; justify-content: space-between; font-size: 0.7em; color: var(--text-secondary); margin-top: 4px;">+ <span>{{ analyticsData.open_series[0]?.time }}</span>+ <span>{{ analyticsData.open_series[analyticsData.open_series.length - 1]?.time }}</span>+ </div>+ </div>++ <!-- Time Series: Clicks -->+ <div v-if="analyticsData.click_series && analyticsData.click_series.length > 0" class="card" style="margin-bottom: 24px;">+ <h3 style="margin-bottom: 12px;">Clicks Over Time</h3>+ <div style="display: flex; align-items: flex-end; gap: 2px; height: 120px; padding: 8px 0;">+ <div+ v-for="(point, idx) in analyticsData.click_series"+ :key="'click-' + idx"+ :title="point.time + ': ' + point.count + ' clicks'"+ :style="{+ flex: '1',+ minWidth: '4px',+ maxWidth: '32px',+ height: Math.max((point.count / maxSeriesCount(analyticsData.click_series)) * 100, 2) + '%',+ background: 'var(--success-600)',+ borderRadius: '2px 2px 0 0',+ }"+ ></div>+ </div>+ <div style="display: flex; justify-content: space-between; font-size: 0.7em; color: var(--text-secondary); margin-top: 4px;">+ <span>{{ analyticsData.click_series[0]?.time }}</span>+ <span>{{ analyticsData.click_series[analyticsData.click_series.length - 1]?.time }}</span>+ </div>+ </div>+ </template>++ <div v-else class="card">+ <div class="empty-state">+ <p>No analytics data available yet.</p>+ </div>+ </div>+ </div>+ </template>+ </div>+</template>diff --git a/web/src/views/campaigns/Campaigns.vue b/web/src/views/campaigns/Campaigns.vuenew file mode 100644index 0000000..0ffe982--- /dev/null+++ b/web/src/views/campaigns/Campaigns.vue@@ -0,0 +1,307 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { useRouter } from 'vue-router'+import { campaignsApi } from '../../api/campaigns'+import { subscriberListsApi } from '../../api/subscriberLists'+import type { Campaign, CampaignStatus, Pageable, SubscriberListItem } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'+import { useModalSafeClose } from '../../composables/useModalSafeClose'++const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const campaigns = ref<Campaign[]>([])+const pageable = ref<Pageable>({ current_page: 0, size: 20, total_pages: 0, total_elements: 0, empty: true })+const loading = ref(true)+const statusFilter = ref<string>('')++const statusTabs: { label: string; value: string }[] = [+ { label: 'All', value: '' },+ { label: 'Draft', value: 'draft' },+ { label: 'Scheduled', value: 'scheduled' },+ { label: 'Sending', value: 'sending' },+ { label: 'Sent', value: 'sent' },+ { label: 'Paused', value: 'paused' },+ { label: 'Cancelled', value: 'cancelled' },+]++// Create modal+const showModal = ref(false)+const formName = ref('')+const formSubject = ref('')+const formFromEmail = ref('')+const formFromName = ref('')+const formTemplateId = ref<number | null>(null)+const formListId = ref<number | null>(null)+const formSendRate = ref(0)+const saving = ref(false)++// Lists for the create form+const lists = ref<SubscriberListItem[]>([])+const templates = ref<{ id: number; name: string }[]>([])++async function loadCampaigns(page = 0) {+ loading.value = true+ try {+ const res = await campaignsApi.list(page, pageable.value.size, statusFilter.value || undefined)+ campaigns.value = res.data.data ?? []+ pageable.value = res.data.pageable+ } catch {+ notify.error('Failed to load campaigns')+ } finally {+ loading.value = false+ }+}++function switchStatus(status: string) {+ statusFilter.value = status+ loadCampaigns(0)+}++async function loadFormData() {+ try {+ const [listsRes] = await Promise.all([+ subscriberListsApi.list(0, 100),+ ])+ lists.value = listsRes.data.data ?? []+ } catch {+ // non-critical+ }+ try {+ const { default: api } = await import('../../api/client')+ const res = await api.get<any>('/users/me/templates', { params: { page: 0, size: 100 } })+ templates.value = (res.data.data ?? []).map((t: any) => ({ id: t.id, name: t.name }))+ } catch {+ // non-critical+ }+}++function openCreate() {+ formName.value = ''+ formSubject.value = ''+ formFromEmail.value = ''+ formFromName.value = ''+ formTemplateId.value = null+ formListId.value = null+ formSendRate.value = 0+ showModal.value = true+ loadFormData()+}++async function saveCampaign() {+ if (!formName.value.trim() || !formSubject.value.trim() || !formFromEmail.value.trim() || !formTemplateId.value || !formListId.value) {+ notify.error('Please fill in all required fields')+ return+ }+ saving.value = true+ try {+ await campaignsApi.create({+ name: formName.value.trim(),+ subject: formSubject.value.trim(),+ from_email: formFromEmail.value.trim(),+ from_name: formFromName.value.trim(),+ template_id: formTemplateId.value,+ list_id: formListId.value,+ send_rate: formSendRate.value,+ })+ notify.success('Campaign created')+ showModal.value = false+ await loadCampaigns(pageable.value.current_page)+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to create campaign')+ } finally {+ saving.value = false+ }+}++async function deleteCampaign(campaign: Campaign) {+ const confirmed = await confirm({+ title: 'Delete Campaign',+ message: `Are you sure you want to delete "${campaign.name}"? This action cannot be undone.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await campaignsApi.delete(campaign.id)+ notify.success('Campaign deleted')+ await loadCampaigns(pageable.value.current_page)+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to delete campaign')+ }+}++function statusBadgeClass(status: CampaignStatus): string {+ switch (status) {+ case 'draft': return 'badge badge-neutral'+ case 'scheduled': return 'badge badge-info'+ case 'sending': return 'badge badge-primary'+ case 'sent': return 'badge badge-success'+ case 'paused': return 'badge badge-warning'+ case 'cancelled': return 'badge badge-danger'+ default: return 'badge'+ }+}++function formatDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++function statsLabel(campaign: Campaign): string {+ if (!campaign.stats) return '-'+ const s = campaign.stats+ if (s.total === 0) return '0'+ return `${s.sent}/${s.total} sent`+}++const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {+ showModal.value = false+})++onMounted(() => loadCampaigns())+</script>++<template>+ <div>+ <div class="page-header">+ <h1>Campaigns</h1>+ <button class="btn btn-primary" @click="openCreate">Create Campaign</button>+ </div>++ <!-- Status filter tabs -->+ <div class="tabs" style="margin-bottom: 16px;">+ <button+ v-for="tab in statusTabs"+ :key="tab.value"+ class="btn btn-sm"+ :class="statusFilter === tab.value ? 'btn-primary' : 'btn-secondary'"+ @click="switchStatus(tab.value)"+ style="margin-right: 4px;"+ >+ {{ tab.label }}+ </button>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <div v-else class="card">+ <div v-if="campaigns.length === 0" class="empty-state">+ <h3>No Campaigns</h3>+ <p>Create a campaign to start sending emails to your subscribers.</p>+ </div>++ <template v-else>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Name</th>+ <th>Status</th>+ <th>Progress</th>+ <th>Created</th>+ <th>Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="campaign in campaigns" :key="campaign.id">+ <td>+ <a class="link" @click="router.push(`/campaigns/${campaign.id}`)">{{ campaign.name }}</a>+ <div style="font-size: 0.85em; color: var(--text-secondary)">{{ campaign.subject }}</div>+ </td>+ <td><span :class="statusBadgeClass(campaign.status)">{{ campaign.status }}</span></td>+ <td>{{ statsLabel(campaign) }}</td>+ <td>{{ formatDate(campaign.created_at) }}</td>+ <td>+ <div style="display: flex; gap: 6px">+ <button class="btn btn-secondary btn-sm" @click="router.push(`/campaigns/${campaign.id}`)">View</button>+ <button+ v-if="campaign.status === 'draft' || campaign.status === 'cancelled'"+ class="btn btn-danger btn-sm"+ @click="deleteCampaign(campaign)"+ >Delete</button>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>++ <div class="pagination">+ <span class="pagination-info">+ Page {{ pageable.current_page + 1 }} of {{ pageable.total_pages }} ({{ pageable.total_elements }} campaigns)+ </span>+ <div class="pagination-buttons">+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page === 0" @click="loadCampaigns(pageable.current_page - 1)">Previous</button>+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page >= pageable.total_pages - 1" @click="loadCampaigns(pageable.current_page + 1)">Next</button>+ </div>+ </div>+ </template>+ </div>++ <!-- Create Modal -->+ <div v-if="showModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">+ <div class="modal" @mousedown.stop @mouseup.stop>+ <div class="modal-header">+ <h3>Create Campaign</h3>+ </div>+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Name *</label>+ <input v-model="formName" class="form-input" placeholder="e.g. March Newsletter" />+ </div>+ <div class="form-group">+ <label class="form-label">Subject *</label>+ <input v-model="formSubject" class="form-input" placeholder="Email subject line" />+ </div>+ <div class="form-group">+ <label class="form-label">From Email *</label>+ <input v-model="formFromEmail" class="form-input" placeholder="[email protected]" />+ </div>+ <div class="form-group">+ <label class="form-label">From Name</label>+ <input v-model="formFromName" class="form-input" placeholder="Sender Name" />+ </div>+ <div class="form-group">+ <label class="form-label">Template *</label>+ <select v-model="formTemplateId" class="form-select">+ <option :value="null" disabled>Select template</option>+ <option v-for="t in templates" :key="t.id" :value="t.id">{{ t.name }}</option>+ </select>+ </div>+ <div class="form-group">+ <label class="form-label">Subscriber List *</label>+ <select v-model="formListId" class="form-select">+ <option :value="null" disabled>Select list</option>+ <option v-for="l in lists" :key="l.id" :value="l.id">{{ l.name }} ({{ l.member_count }} members)</option>+ </select>+ </div>+ <div class="form-group">+ <label class="form-label">Send Rate (msgs/min, 0 = unlimited)</label>+ <input v-model.number="formSendRate" type="number" class="form-input" min="0" />+ </div>+ </div>+ <div class="modal-footer">+ <button class="btn btn-secondary" @click="showModal = false">Cancel</button>+ <button class="btn btn-primary" :disabled="saving" @click="saveCampaign">+ {{ saving ? 'Creating...' : 'Create' }}+ </button>+ </div>+ </div>+ </div>+ </div>+</template>++<style scoped>+.link {+ color: var(--primary-600);+ cursor: pointer;+ font-weight: 500;+}+.link:hover {+ text-decoration: underline;+}+</style>diff --git a/web/src/views/emails/Emails.vue b/web/src/views/emails/Emails.vueindex 3c4df3e..70de61c 100644--- a/web/src/views/emails/Emails.vue+++ b/web/src/views/emails/Emails.vue@@ -2,13 +2,16 @@import { ref } from 'vue'import { useRouter } from 'vue-router'import { emailsApi } from '../../api/emails'+import { useNotificationStore } from '../../stores/notification'import type { Email } from '../../api/types'import Pagination from '../../components/Pagination.vue'import { usePagination } from '../../composables/usePagination'const router = useRouter()+const notify = useNotificationStore()const loading = ref(true)const emails = ref<Email[]>([])+const retryingId = ref<string | null>(null)const { pageable, goToPage } = usePagination(async (page) => {loading.value = true@@ -23,6 +26,23 @@ const { pageable, goToPage } = usePagination(async (page) => {}})+async function retryEmail(e: Event, em: Email) {+ e.stopPropagation()+ if (retryingId.value) return+ retryingId.value = em.uuid+ try {+ const res = await emailsApi.retry(em.uuid)+ em.status = res.data.data.status as Email['status']+ em.error_message = ''+ notify.success('Email re-queued for delivery')+ } catch (err: any) {+ const msg = err.response?.data?.error?.message || 'Failed to retry email'+ notify.error(msg)+ } finally {+ retryingId.value = null+ }+}+function statusBadgeClass(status: string) {switch (status) {case 'sent': return 'badge badge-success'@@ -45,7 +65,7 @@ function formatDate(date: string | null) {<template><div><div class="page-header">- <h1>Email Logs</h1>+ <h1>Emails</h1><button class="btn btn-secondary" @click="router.push('/emails/preview')">Preview Template</button></div>@@ -68,6 +88,7 @@ function formatDate(date: string | null) {<th>Recipients</th><th>Status</th><th>Sent At</th>+ <th></th></tr></thead><tbody>@@ -82,6 +103,16 @@ function formatDate(date: string | null) {<td>{{ email.recipients.join(', ') }}</td><td><span :class="statusBadgeClass(email.status)">{{ email.status }}</span></td><td>{{ formatDate(email.sent_at) }}</td>+ <td>+ <button+ v-if="email.status === 'failed'"+ class="btn btn-secondary btn-sm"+ :disabled="retryingId === email.uuid"+ @click="retryEmail($event, email)"+ >+ {{ retryingId === email.uuid ? 'Retrying...' : 'Retry' }}+ </button>+ </td></tr></tbody></table>diff --git a/web/src/views/languages/Languages.vue b/web/src/views/languages/Languages.vueindex e5326e6..826b99b 100644--- a/web/src/views/languages/Languages.vue+++ b/web/src/views/languages/Languages.vue@@ -20,10 +20,11 @@ const saving = ref(false)const form = ref<LanguageInput>({code: '',name: '',+ is_default: false,})function resetForm() {- form.value = { code: '', name: '' }+ form.value = { code: '', name: '', is_default: false }editing.value = null}@@ -37,6 +38,7 @@ function openEdit(lang: Language) {form.value = {code: lang.code,name: lang.name,+ is_default: lang.is_default,}showModal.value = true}@@ -129,6 +131,7 @@ onMounted(() => loadLanguages())<tr><th>Code</th><th>Name</th>+ <th>Default</th><th>Created</th><th>Actions</th></tr>@@ -137,6 +140,7 @@ onMounted(() => loadLanguages())<tr v-for="lang in languages" :key="lang.id"><td><span class="badge badge-neutral">{{ lang.code }}</span></td><td>{{ lang.name }}</td>+ <td><span v-if="lang.is_default" class="badge badge-success">Default</span></td><td>{{ formatDate(lang.created_at) }}</td><td><div class="flex gap-2">@@ -190,6 +194,13 @@ onMounted(() => loadLanguages())<label class="form-label">Name</label><input v-model="form.name" class="form-input" placeholder="e.g. English, French" /></div>+ <div class="form-group">+ <label class="form-checkbox">+ <input type="checkbox" v-model="form.is_default" />+ <span>Set as default language</span>+ </label>+ <span class="form-hint">The default language is used for new subscribers and as the fallback for campaigns.</span>+ </div></div><div class="modal-footer"><button class="btn btn-secondary" @click="closeModal">Cancel</button>diff --git a/web/src/views/settings/Settings.vue b/web/src/views/settings/Settings.vueindex 73c1aca..67fadb1 100644--- a/web/src/views/settings/Settings.vue+++ b/web/src/views/settings/Settings.vue@@ -3,13 +3,16 @@ import { ref, onMounted } from 'vue'import { settingsApi } from '../../api/settings'import { authApi } from '../../api/auth'import { userDataApi } from '../../api/userData'+import { workspaceApi } from '../../api/workspaces'import { useAuthStore } from '../../stores/auth'+import { useWorkspaceStore } from '../../stores/workspace'import { useThemeStore, type ThemeMode } from '../../stores/theme'import { useNotificationStore } from '../../stores/notification'import { useConfirm } from '../../composables/useConfirm'import type { UserSettings } from '../../api/types'const auth = useAuthStore()+const wsStore = useWorkspaceStore()const theme = useThemeStore()const notify = useNotificationStore()const { confirm } = useConfirm()@@ -108,12 +111,18 @@ async function save() {async function exportData() {exporting.value = truetry {- const res = await userDataApi.exportAll()+ const isWorkspace = wsStore.isWorkspaceContext+ const res = isWorkspace+ ? await workspaceApi.exportData()+ : await userDataApi.exportAll()const blob = new Blob([JSON.stringify(res.data.data, null, 2)], { type: 'application/json' })const url = URL.createObjectURL(blob)const a = document.createElement('a')a.href = url- a.download = `posta-export-${new Date().toISOString().slice(0, 10)}.json`+ const prefix = isWorkspace+ ? `posta-workspace-export-${wsStore.currentWorkspace?.slug || 'ws'}`+ : 'posta-export'+ a.download = `${prefix}-${new Date().toISOString().slice(0, 10)}.json`a.click()URL.revokeObjectURL(url)notify.success('Data exported successfully')@@ -132,9 +141,14 @@ async function handleImportFile(event: Event) {const file = (event.target as HTMLInputElement).files?.[0]if (!file) return+ const isWorkspace = wsStore.isWorkspaceContext+ const importMessage = isWorkspace+ ? 'This will import data into the current workspace. Duplicate items will be skipped. SMTP servers will be imported as disabled. Domains will require re-verification. Continue?'+ : 'This will import data from the selected file. Duplicate items will be skipped. Continue?'+const confirmed = await confirm({- title: 'Import Data',- message: 'This will import data from the selected file. Duplicate items will be skipped. Continue?',+ title: isWorkspace ? 'Import Workspace Data' : 'Import Data',+ message: importMessage,confirmText: 'Import',variant: 'danger',})@@ -147,7 +161,9 @@ async function handleImportFile(event: Event) {try {const text = await file.text()const data = JSON.parse(text)- const res = await userDataApi.importAll(data)+ const res = isWorkspace+ ? await workspaceApi.importData(data)+ : await userDataApi.importAll(data)notify.success(res.data.data.message || 'Data imported successfully')} catch (e: any) {if (e instanceof SyntaxError) {@@ -369,15 +385,26 @@ async function toggleDomainSecurity() {<!-- Data Export/Import --><div class="card">- <div class="card-header"><h2>Data Export / Import</h2></div>+ <div class="card-header">+ <h2>Data Export / Import</h2>+ <span v-if="wsStore.isWorkspaceContext" class="badge badge-primary">{{ wsStore.contextLabel }}</span>+ </div><div class="card-body">- <p class="section-description">+ <p v-if="wsStore.isWorkspaceContext" class="section-description">+ Export all workspace data (settings, templates, stylesheets, languages, contacts, contact lists, webhooks, SMTP servers, domains, subscribers, subscriber lists, and suppressions) as a JSON file.+ You can import this file to restore data on this or another workspace.+ </p>+ <p v-else class="section-description">Export all your data (templates, stylesheets, languages, contacts, contact lists, webhooks, suppressions, and settings) as a JSON file.You can import this file later to restore your data on this or another Posta instance.</p>+ <p v-if="wsStore.isWorkspaceContext" class="section-hint">+ Note: SMTP server passwords are not included in exports. Imported SMTP servers will be disabled until passwords are reconfigured.+ Imported domains will require re-verification.+ </p><div class="flex gap-2"><button class="btn btn-primary" :disabled="exporting" @click="exportData">- {{ exporting ? 'Exporting...' : 'Export All Data' }}+ {{ exporting ? 'Exporting...' : wsStore.isWorkspaceContext ? 'Export Workspace Data' : 'Export All Data' }}</button><button class="btn btn-secondary" :disabled="importing" @click="triggerImport">{{ importing ? 'Importing...' : 'Import Data' }}@@ -582,4 +609,10 @@ async function toggleDomainSecurity() {color: var(--text-primary);margin: 0 0 4px;}++.section-hint {+ font-size: 12px;+ color: var(--text-muted);+ margin-bottom: 16px;+}</style>diff --git a/web/src/views/subscriber-lists/SubscriberListDetail.vue b/web/src/views/subscriber-lists/SubscriberListDetail.vuenew file mode 100644index 0000000..34a6623--- /dev/null+++ b/web/src/views/subscriber-lists/SubscriberListDetail.vue@@ -0,0 +1,395 @@+<script setup lang="ts">+import { ref, computed, onMounted } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { subscriberListsApi } from '../../api/subscriberLists'+import { subscribersApi } from '../../api/subscribers'+import type { SubscriberListItem, Subscriber, FilterRule, Pageable } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'+import { useModalSafeClose } from '../../composables/useModalSafeClose'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const listId = Number(route.params.id)+const list = ref<SubscriberListItem | null>(null)+const members = ref<Subscriber[]>([])+const pageable = ref<Pageable>({ current_page: 0, size: 20, total_pages: 0, total_elements: 0, empty: true })+const loading = ref(true)+const saving = ref(false)++// Edit form+const editName = ref('')+const editDescription = ref('')++// Add member (static lists)+const showAddModal = ref(false)+const allSubscribers = ref<Subscriber[]>([])+const selectedSubscriberId = ref<number | null>(null)+const addingMember = ref(false)++// Dynamic preview+const previewMembers = ref<Subscriber[]>([])+const previewLoading = ref(false)+const previewCount = ref<number | null>(null)++const isDynamic = computed(() => list.value?.type === 'dynamic')++const operatorLabels: Record<string, string> = {+ eq: 'equals',+ neq: 'not equals',+ contains: 'contains',+ starts_with: 'starts with',+ ends_with: 'ends with',+ gt: 'greater than',+ lt: 'less than',+ in: 'in',+}++async function loadList() {+ try {+ const res = await subscriberListsApi.get(listId)+ list.value = res.data.data+ editName.value = list.value.name+ editDescription.value = list.value.description+ } catch {+ notify.error('Subscriber list not found')+ router.push({ name: 'subscriber-lists-page' })+ }+}++async function loadMembers(page = 0) {+ loading.value = true+ try {+ const res = await subscriberListsApi.listMembers(listId, page, pageable.value.size)+ members.value = res.data.data ?? []+ pageable.value = res.data.pageable+ } catch {+ notify.error('Failed to load members')+ } finally {+ loading.value = false+ }+}++async function saveDetails() {+ if (!list.value || !editName.value.trim()) return+ saving.value = true+ try {+ const res = await subscriberListsApi.update(listId, {+ name: editName.value.trim(),+ description: editDescription.value.trim(),+ })+ list.value = res.data.data+ notify.success('List updated')+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to update list')+ } finally {+ saving.value = false+ }+}++async function openAddMember() {+ selectedSubscriberId.value = null+ showAddModal.value = true+ try {+ const res = await subscribersApi.list(0, 100)+ allSubscribers.value = res.data.data ?? []+ } catch {+ notify.error('Failed to load subscribers')+ }+}++async function addMember() {+ if (!selectedSubscriberId.value) return+ addingMember.value = true+ try {+ await subscriberListsApi.addMember(listId, selectedSubscriberId.value)+ notify.success('Member added')+ showAddModal.value = false+ await loadMembers(pageable.value.current_page)+ await loadList()+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to add member')+ } finally {+ addingMember.value = false+ }+}++async function removeMember(subscriber: Subscriber) {+ const confirmed = await confirm({+ title: 'Remove Member',+ message: `Remove "${subscriber.email}" from this list?`,+ confirmText: 'Remove',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await subscriberListsApi.removeMember(listId, subscriber.id)+ notify.success('Member removed')+ await loadMembers(pageable.value.current_page)+ await loadList()+ } catch {+ notify.error('Failed to remove member')+ }+}++async function previewSegment() {+ if (!list.value?.filter_rules) return+ previewLoading.value = true+ try {+ const res = await subscriberListsApi.previewSegment(list.value.filter_rules)+ previewMembers.value = res.data.data ?? []+ previewCount.value = res.data.pageable.total_elements+ } catch {+ notify.error('Failed to preview segment')+ } finally {+ previewLoading.value = false+ }+}++function statusBadgeClass(status: string): string {+ switch (status) {+ case 'subscribed': return 'badge badge-primary'+ case 'unsubscribed': return 'badge badge-neutral'+ case 'bounced': return 'badge badge-warning'+ case 'complained': return 'badge badge-warning'+ default: return 'badge'+ }+}++function formatDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {+ showAddModal.value = false+})++onMounted(async () => {+ await loadList()+ await loadMembers()+})+</script>++<template>+ <div>+ <div class="page-header">+ <div>+ <div class="breadcrumb">+ <router-link :to="{ name: 'subscriber-lists-page' }">Lists</router-link>+ <span class="separator">/</span>+ <span>{{ list?.name || '...' }}</span>+ </div>+ <h1>{{ list?.name || 'List Detail' }}</h1>+ <p v-if="list?.description" class="page-description">{{ list.description }}</p>+ </div>+ <button v-if="!isDynamic" class="btn btn-primary" @click="openAddMember">Add Member</button>+ </div>++ <!-- Edit Details -->+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header">+ <h2>Details</h2>+ </div>+ <div class="card-body">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="editName" class="form-input" />+ </div>+ <div class="form-group">+ <label class="form-label">Description</label>+ <input v-model="editDescription" class="form-input" />+ </div>+ <div style="margin-top: 12px">+ <button class="btn btn-primary" :disabled="saving || !editName.trim()" @click="saveDetails">+ {{ saving ? 'Saving...' : 'Save' }}+ </button>+ </div>+ </div>+ </div>++ <!-- Dynamic: Filter Rules -->+ <div v-if="isDynamic && list?.filter_rules" class="card" style="margin-bottom: 24px">+ <div class="card-header">+ <h2>Filter Rules</h2>+ <button class="btn btn-secondary" :disabled="previewLoading" @click="previewSegment">+ {{ previewLoading ? 'Loading...' : 'Preview Matches' }}+ </button>+ </div>+ <div class="card-body">+ <div v-if="list.filter_rules.length === 0" class="empty-state">+ <p>No filter rules defined.</p>+ </div>+ <table v-else>+ <thead>+ <tr>+ <th>Field</th>+ <th>Operator</th>+ <th>Value</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="(rule, index) in list.filter_rules" :key="index">+ <td>{{ rule.field }}</td>+ <td>{{ operatorLabels[rule.operator] || rule.operator }}</td>+ <td>{{ typeof rule.value === 'object' ? JSON.stringify(rule.value) : String(rule.value) }}</td>+ </tr>+ </tbody>+ </table>++ <div v-if="previewCount !== null" style="margin-top: 16px">+ <p><strong>{{ previewCount }}</strong> subscribers match these rules.</p>+ </div>+ </div>+ </div>++ <!-- Dynamic: Preview Results -->+ <div v-if="isDynamic && previewMembers.length > 0" class="card" style="margin-bottom: 24px">+ <div class="card-header">+ <h2>Matching Subscribers</h2>+ </div>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Email</th>+ <th>Name</th>+ <th>Status</th>+ <th>Created</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="sub in previewMembers" :key="sub.id">+ <td>{{ sub.email }}</td>+ <td>{{ sub.name || '-' }}</td>+ <td><span :class="statusBadgeClass(sub.status)">{{ sub.status }}</span></td>+ <td>{{ formatDate(sub.created_at) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Static: Members Table -->+ <div v-if="!isDynamic" class="card">+ <div class="card-header">+ <h2>Members</h2>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else>+ <div v-if="members.length === 0" class="empty-state">+ <h3>No Members</h3>+ <p>Add subscribers to this list.</p>+ </div>++ <template v-else>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Email</th>+ <th>Name</th>+ <th>Status</th>+ <th>Created</th>+ <th style="width: 1%"></th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="member in members" :key="member.id">+ <td>{{ member.email }}</td>+ <td>{{ member.name || '-' }}</td>+ <td><span :class="statusBadgeClass(member.status)">{{ member.status }}</span></td>+ <td>{{ formatDate(member.created_at) }}</td>+ <td>+ <button class="btn btn-danger btn-sm" @click="removeMember(member)">Remove</button>+ </td>+ </tr>+ </tbody>+ </table>+ </div>++ <div class="pagination">+ <span class="pagination-info">+ Page {{ pageable.current_page + 1 }} of {{ pageable.total_pages }} ({{ pageable.total_elements }} members)+ </span>+ <div class="pagination-buttons">+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page === 0" @click="loadMembers(pageable.current_page - 1)">Previous</button>+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page >= pageable.total_pages - 1" @click="loadMembers(pageable.current_page + 1)">Next</button>+ </div>+ </div>+ </template>+ </template>+ </div>++ <!-- Add Member Modal -->+ <div v-if="showAddModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">+ <div class="modal" @mousedown.stop @mouseup.stop>+ <div class="modal-header">+ <h2>Add Member</h2>+ </div>+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Subscriber</label>+ <select v-model="selectedSubscriberId" class="form-select">+ <option :value="null" disabled>Select a subscriber...</option>+ <option v-for="sub in allSubscribers" :key="sub.id" :value="sub.id">+ {{ sub.email }} {{ sub.name ? `(${sub.name})` : '' }}+ </option>+ </select>+ </div>+ <div v-if="allSubscribers.length === 0" class="empty-hint">+ No subscribers found. Create subscribers first.+ </div>+ </div>+ <div class="modal-footer">+ <button class="btn btn-secondary" @click="showAddModal = false">Cancel</button>+ <button class="btn btn-primary" :disabled="addingMember || !selectedSubscriberId" @click="addMember">+ {{ addingMember ? 'Adding...' : 'Add' }}+ </button>+ </div>+ </div>+ </div>+ </div>+</template>++<style scoped>+.breadcrumb {+ display: flex;+ align-items: center;+ gap: 8px;+ font-size: 14px;+ margin-bottom: 4px;+ color: var(--text-secondary);+}++.breadcrumb a {+ color: var(--primary-600);+ text-decoration: none;+}++.breadcrumb a:hover {+ text-decoration: underline;+}++.breadcrumb .separator {+ color: var(--text-tertiary);+}++.page-description {+ color: var(--text-secondary);+ margin-top: 4px;+ font-size: 14px;+}++.empty-hint {+ color: var(--text-secondary);+ font-size: 13px;+ font-style: italic;+}+</style>diff --git a/web/src/views/subscriber-lists/SubscriberLists.vue b/web/src/views/subscriber-lists/SubscriberLists.vuenew file mode 100644index 0000000..04a98d3--- /dev/null+++ b/web/src/views/subscriber-lists/SubscriberLists.vue@@ -0,0 +1,236 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { useRouter } from 'vue-router'+import { subscriberListsApi } from '../../api/subscriberLists'+import type { SubscriberListItem, SubscriberListType, FilterRule, Pageable } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'+import { useModalSafeClose } from '../../composables/useModalSafeClose'++const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const lists = ref<SubscriberListItem[]>([])+const pageable = ref<Pageable>({ current_page: 0, size: 20, total_pages: 0, total_elements: 0, empty: true })+const loading = ref(true)++// Create modal+const showModal = ref(false)+const formName = ref('')+const formDescription = ref('')+const formType = ref<SubscriberListType>('static')+const formFilterRules = ref<FilterRule[]>([])+const saving = ref(false)++const operatorOptions = [+ { value: 'eq', label: 'equals' },+ { value: 'neq', label: 'not equals' },+ { value: 'contains', label: 'contains' },+ { value: 'starts_with', label: 'starts with' },+ { value: 'ends_with', label: 'ends with' },+ { value: 'gt', label: 'greater than' },+ { value: 'lt', label: 'less than' },+ { value: 'in', label: 'in' },+]++async function loadLists(page = 0) {+ loading.value = true+ try {+ const res = await subscriberListsApi.list(page, pageable.value.size)+ lists.value = res.data.data ?? []+ pageable.value = res.data.pageable+ } catch {+ notify.error('Failed to load subscriber lists')+ } finally {+ loading.value = false+ }+}++function openCreate() {+ formName.value = ''+ formDescription.value = ''+ formType.value = 'static'+ formFilterRules.value = []+ showModal.value = true+}++function addFilterRule() {+ formFilterRules.value.push({ field: '', operator: 'eq', value: '' })+}++function removeFilterRule(index: number) {+ formFilterRules.value.splice(index, 1)+}++async function saveList() {+ if (!formName.value.trim()) return+ saving.value = true+ try {+ await subscriberListsApi.create({+ name: formName.value.trim(),+ description: formDescription.value.trim(),+ type: formType.value,+ filter_rules: formType.value === 'dynamic' ? formFilterRules.value : undefined,+ })+ notify.success('Subscriber list created')+ showModal.value = false+ await loadLists(pageable.value.current_page)+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to create subscriber list')+ } finally {+ saving.value = false+ }+}++async function deleteList(list: SubscriberListItem) {+ const confirmed = await confirm({+ title: 'Delete List',+ message: `Are you sure you want to delete "${list.name}"? This action cannot be undone.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await subscriberListsApi.delete(list.id)+ notify.success('Subscriber list deleted')+ await loadLists(pageable.value.current_page)+ } catch {+ notify.error('Failed to delete subscriber list')+ }+}++function typeBadgeClass(listType: SubscriberListType): string {+ return listType === 'dynamic' ? 'badge badge-primary' : 'badge badge-neutral'+}++function formatDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++const { watchClickStart, confirmClickEnd } = useModalSafeClose(() => {+ showModal.value = false+})++onMounted(() => loadLists())+</script>++<template>+ <div>+ <div class="page-header">+ <h1>Lists</h1>+ <button class="btn btn-primary" @click="openCreate">Create List</button>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <div v-else class="card">+ <div v-if="lists.length === 0" class="empty-state">+ <h3>No Lists</h3>+ <p>Create a segment to organize your subscribers.</p>+ </div>++ <template v-else>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Name</th>+ <th>Type</th>+ <th>Members</th>+ <th>Created</th>+ <th>Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="list in lists" :key="list.id">+ <td>+ <a class="link" @click="router.push(`/subscriber-lists/${list.id}`)">{{ list.name }}</a>+ </td>+ <td><span :class="typeBadgeClass(list.type)">{{ list.type }}</span></td>+ <td>{{ list.member_count }}</td>+ <td>{{ formatDate(list.created_at) }}</td>+ <td>+ <div style="display: flex; gap: 6px">+ <button class="btn btn-secondary btn-sm" @click="router.push(`/subscriber-lists/${list.id}`)">View</button>+ <button class="btn btn-danger btn-sm" @click="deleteList(list)">Delete</button>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>++ <div class="pagination">+ <span class="pagination-info">+ Page {{ pageable.current_page + 1 }} of {{ pageable.total_pages }} ({{ pageable.total_elements }} segments)+ </span>+ <div class="pagination-buttons">+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page === 0" @click="loadLists(pageable.current_page - 1)">Previous</button>+ <button class="btn btn-secondary btn-sm" :disabled="pageable.current_page >= pageable.total_pages - 1" @click="loadLists(pageable.current_page + 1)">Next</button>+ </div>+ </div>+ </template>+ </div>++ <!-- Create Modal -->+ <div v-if="showModal" class="modal-overlay" @mousedown="watchClickStart" @mouseup="confirmClickEnd">+ <div class="modal" @mousedown.stop @mouseup.stop>+ <div class="modal-header">+ <h3>Create List</h3>+ </div>+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="formName" class="form-input" placeholder="e.g. Active Users" @keyup.enter="saveList" />+ </div>+ <div class="form-group">+ <label class="form-label">Description</label>+ <input v-model="formDescription" class="form-input" placeholder="Optional description" />+ </div>+ <div class="form-group">+ <label class="form-label">Type</label>+ <select v-model="formType" class="form-select">+ <option value="static">Static</option>+ <option value="dynamic">Dynamic</option>+ </select>+ </div>++ <template v-if="formType === 'dynamic'">+ <div class="form-group">+ <label class="form-label">Filter Rules</label>+ <div v-for="(rule, index) in formFilterRules" :key="index" style="display: flex; gap: 8px; margin-bottom: 8px; align-items: center">+ <input v-model="rule.field" class="form-input" placeholder="Field" style="flex: 1" />+ <select v-model="rule.operator" class="form-select" style="flex: 1">+ <option v-for="op in operatorOptions" :key="op.value" :value="op.value">{{ op.label }}</option>+ </select>+ <input v-model="rule.value" class="form-input" placeholder="Value" style="flex: 1" />+ <button class="btn btn-danger btn-sm" @click="removeFilterRule(index)">Remove</button>+ </div>+ <button class="btn btn-secondary btn-sm" @click="addFilterRule">Add Rule</button>+ </div>+ </template>+ </div>+ <div class="modal-footer">+ <button class="btn btn-secondary" @click="showModal = false">Cancel</button>+ <button class="btn btn-primary" :disabled="saving || !formName.trim()" @click="saveList">+ {{ saving ? 'Creating...' : 'Create' }}+ </button>+ </div>+ </div>+ </div>+ </div>+</template>++<style scoped>+.link {+ color: var(--primary-600);+ cursor: pointer;+ font-weight: 500;+}+.link:hover {+ text-decoration: underline;+}+</style>diff --git a/web/src/views/subscribers/SubscriberDetail.vue b/web/src/views/subscribers/SubscriberDetail.vuenew file mode 100644index 0000000..a302a9a--- /dev/null+++ b/web/src/views/subscribers/SubscriberDetail.vue@@ -0,0 +1,218 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { subscribersApi } from '../../api/subscribers'+import type { Subscriber, SubscriberStatus } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useConfirm } from '../../composables/useConfirm'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()+const { confirm } = useConfirm()++const loading = ref(true)+const saving = ref(false)+const subscriber = ref<Subscriber | null>(null)++const editForm = ref({+ email: '',+ name: '',+ status: '' as SubscriberStatus,+ custom_fields: '',+})++onMounted(async () => {+ try {+ const id = Number(route.params.id)+ const res = await subscribersApi.get(id)+ subscriber.value = res.data.data+ editForm.value = {+ email: subscriber.value.email,+ name: subscriber.value.name,+ status: subscriber.value.status,+ custom_fields: JSON.stringify(subscriber.value.custom_fields || {}, null, 2),+ }+ } catch {+ notify.error('Failed to load subscriber')+ } finally {+ loading.value = false+ }+})++async function saveSubscriber() {+ if (!subscriber.value) return+ saving.value = true+ try {+ let customFields: Record<string, any> = {}+ if (editForm.value.custom_fields.trim()) {+ customFields = JSON.parse(editForm.value.custom_fields)+ }+ const res = await subscribersApi.update(subscriber.value.id, {+ email: editForm.value.email.trim(),+ name: editForm.value.name.trim(),+ status: editForm.value.status,+ custom_fields: customFields,+ })+ subscriber.value = res.data.data+ notify.success('Subscriber updated')+ } catch (e: any) {+ if (e instanceof SyntaxError) {+ notify.error('Invalid JSON in custom fields')+ } else {+ notify.error(e?.response?.data?.error?.message || 'Failed to update subscriber')+ }+ } finally {+ saving.value = false+ }+}++async function deleteSubscriber() {+ if (!subscriber.value) return+ const confirmed = await confirm({+ title: 'Delete Subscriber',+ message: `Are you sure you want to delete "${subscriber.value.email}"? This action cannot be undone.`,+ confirmText: 'Delete',+ variant: 'danger',+ })+ if (!confirmed) return+ try {+ await subscribersApi.delete(subscriber.value.id)+ notify.success('Subscriber deleted')+ router.push('/subscribers')+ } catch {+ notify.error('Failed to delete subscriber')+ }+}++function statusBadgeClass(status: SubscriberStatus): string {+ switch (status) {+ case 'subscribed': return 'badge badge-primary'+ case 'unsubscribed': return 'badge badge-neutral'+ case 'bounced': return 'badge badge-warning'+ case 'complained': return 'badge badge-warning'+ default: return 'badge'+ }+}++function formatDate(date: string | null) {+ if (!date) return '-'+ return new Date(date).toLocaleString()+}++const customFieldEntries = (fields: Record<string, any>) => {+ if (!fields) return []+ return Object.entries(fields)+}+</script>++<template>+ <div>+ <div class="page-header">+ <h1>Subscriber Detail</h1>+ <div style="display: flex; gap: 8px">+ <button class="btn btn-secondary" @click="router.push('/subscribers')">Back to Subscribers</button>+ </div>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else-if="subscriber">+ <div class="card" style="margin-bottom: 24px">+ <div class="card-header">+ <h2>{{ subscriber.email }}</h2>+ <span :class="statusBadgeClass(subscriber.status)">{{ subscriber.status }}</span>+ </div>+ <div class="card-body">+ <div class="form-group">+ <label class="form-label">Email</label>+ <input v-model="editForm.email" type="email" class="form-input" />+ </div>+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="editForm.name" type="text" class="form-input" />+ </div>+ <div class="form-group">+ <label class="form-label">Status</label>+ <select v-model="editForm.status" class="form-select">+ <option value="subscribed">Subscribed</option>+ <option value="unsubscribed">Unsubscribed</option>+ <option value="bounced">Bounced</option>+ <option value="complained">Complained</option>+ </select>+ </div>+ <div class="form-group">+ <label class="form-label">Custom Fields (JSON)</label>+ <textarea v-model="editForm.custom_fields" class="form-input" rows="6"></textarea>+ </div>+ <div style="display: flex; gap: 8px; margin-top: 16px">+ <button class="btn btn-primary" :disabled="saving" @click="saveSubscriber">+ {{ saving ? 'Saving...' : 'Save Changes' }}+ </button>+ <button class="btn btn-danger" @click="deleteSubscriber">Delete</button>+ </div>+ </div>+ </div>++ <div class="card" style="margin-bottom: 24px">+ <div class="card-header">+ <h2>Custom Fields</h2>+ </div>+ <div class="card-body">+ <div v-if="customFieldEntries(subscriber.custom_fields).length === 0" class="empty-state">+ <p>No custom fields set.</p>+ </div>+ <table v-else>+ <thead>+ <tr>+ <th>Field</th>+ <th>Value</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="[key, value] in customFieldEntries(subscriber.custom_fields)" :key="key">+ <td style="font-weight: 600">{{ key }}</td>+ <td>{{ typeof value === 'object' ? JSON.stringify(value) : String(value) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <div class="card">+ <div class="card-header">+ <h2>Details</h2>+ </div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 160px">Subscribed At</td>+ <td>{{ formatDate(subscriber.subscribed_at) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Unsubscribed At</td>+ <td>{{ formatDate(subscriber.unsubscribed_at) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Created At</td>+ <td>{{ formatDate(subscriber.created_at) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Updated At</td>+ <td>{{ formatDate(subscriber.updated_at) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>+ </template>++ <div v-else class="empty-state">+ <h3>Subscriber not found</h3>+ <p>The subscriber you are looking for does not exist.</p>+ </div>+ </div>+</template>diff --git a/web/src/views/subscribers/Subscribers.vue b/web/src/views/subscribers/Subscribers.vuenew file mode 100644index 0000000..7c09149--- /dev/null+++ b/web/src/views/subscribers/Subscribers.vue@@ -0,0 +1,290 @@+<script setup lang="ts">+import { ref } from 'vue'+import { useRouter } from 'vue-router'+import { subscribersApi } from '../../api/subscribers'+import type { Subscriber, SubscriberStatus } from '../../api/types'+import Pagination from '../../components/Pagination.vue'+import { usePagination } from '../../composables/usePagination'+import { useNotificationStore } from '../../stores/notification'+import { useModalSafeClose } from '../../composables/useModalSafeClose'++const router = useRouter()+const notify = useNotificationStore()++const subscribers = ref<Subscriber[]>([])+const loading = ref(true)+const search = ref('')+const statusFilter = ref<SubscriberStatus | ''>('')+let searchTimeout: ReturnType<typeof setTimeout> | null = null++// Create modal+const showCreateModal = ref(false)+const createForm = ref({ email: '', name: '', custom_fields: '' })+const creating = ref(false)++// Import JSON modal+const showImportJsonModal = ref(false)+const importJsonText = ref('')+const importing = ref(false)++// CSV import+const csvFileInput = ref<HTMLInputElement | null>(null)+const importingCsv = ref(false)++const { pageable, goToPage } = usePagination(loadSubscribers)++async function loadSubscribers(page = 0) {+ loading.value = true+ try {+ const res = await subscribersApi.list(page, pageable.value.size, search.value, statusFilter.value || undefined)+ subscribers.value = res.data.data ?? []+ pageable.value = res.data.pageable+ } catch {+ notify.error('Failed to load subscribers')+ } finally {+ loading.value = false+ }+}++function onSearchInput() {+ if (searchTimeout) clearTimeout(searchTimeout)+ searchTimeout = setTimeout(() => goToPage(0), 300)+}++function onStatusChange() {+ goToPage(0)+}++function openCreate() {+ createForm.value = { email: '', name: '', custom_fields: '' }+ showCreateModal.value = true+}++async function createSubscriber() {+ if (!createForm.value.email.trim()) return+ creating.value = true+ try {+ let customFields: Record<string, any> = {}+ if (createForm.value.custom_fields.trim()) {+ customFields = JSON.parse(createForm.value.custom_fields)+ }+ await subscribersApi.create({+ email: createForm.value.email.trim(),+ name: createForm.value.name.trim(),+ custom_fields: customFields,+ })+ notify.success('Subscriber created')+ showCreateModal.value = false+ await loadSubscribers(pageable.value.current_page)+ } catch (e: any) {+ if (e instanceof SyntaxError) {+ notify.error('Invalid JSON in custom fields')+ } else {+ notify.error(e?.response?.data?.error?.message || 'Failed to create subscriber')+ }+ } finally {+ creating.value = false+ }+}++function openImportJson() {+ importJsonText.value = ''+ showImportJsonModal.value = true+}++async function importJson() {+ if (!importJsonText.value.trim()) return+ importing.value = true+ try {+ const data = JSON.parse(importJsonText.value)+ const subscribers = Array.isArray(data) ? data : [data]+ const res = await subscribersApi.bulkImportJSON(subscribers)+ const result = res.data.data+ notify.success(`Import complete: ${result.created} created, ${result.skipped} skipped out of ${result.total}`)+ showImportJsonModal.value = false+ await loadSubscribers(pageable.value.current_page)+ } catch (e: any) {+ if (e instanceof SyntaxError) {+ notify.error('Invalid JSON format')+ } else {+ notify.error(e?.response?.data?.error?.message || 'Failed to import subscribers')+ }+ } finally {+ importing.value = false+ }+}++function triggerCsvUpload() {+ csvFileInput.value?.click()+}++async function onCsvFileSelected(event: Event) {+ const input = event.target as HTMLInputElement+ const file = input.files?.[0]+ if (!file) return+ importingCsv.value = true+ try {+ const res = await subscribersApi.bulkImportCSV(file)+ const result = res.data.data+ notify.success(`CSV import complete: ${result.created} created, ${result.skipped} skipped out of ${result.total}`)+ await loadSubscribers(pageable.value.current_page)+ } catch (e: any) {+ notify.error(e?.response?.data?.error?.message || 'Failed to import CSV')+ } finally {+ importingCsv.value = false+ input.value = ''+ }+}++function statusBadgeClass(status: SubscriberStatus): string {+ switch (status) {+ case 'subscribed': return 'badge badge-primary'+ case 'unsubscribed': return 'badge badge-neutral'+ case 'bounced': return 'badge badge-warning'+ case 'complained': return 'badge badge-warning'+ default: return 'badge'+ }+}++function truncateCustomFields(fields: Record<string, any>): string {+ if (!fields || Object.keys(fields).length === 0) return '-'+ const str = JSON.stringify(fields)+ return str.length > 60 ? str.substring(0, 60) + '...' : str+}++function formatDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++const { watchClickStart: watchCreateStart, confirmClickEnd: confirmCreateEnd } = useModalSafeClose(() => {+ showCreateModal.value = false+})+const { watchClickStart: watchImportStart, confirmClickEnd: confirmImportEnd } = useModalSafeClose(() => {+ showImportJsonModal.value = false+})+</script>++<template>+ <div>+ <div class="page-header">+ <h1>Subscribers</h1>+ <div style="display: flex; gap: 8px">+ <button class="btn btn-secondary" @click="openImportJson">Import JSON</button>+ <button class="btn btn-secondary" :disabled="importingCsv" @click="triggerCsvUpload">+ {{ importingCsv ? 'Importing...' : 'Import CSV' }}+ </button>+ <button class="btn btn-primary" @click="openCreate">Add Subscriber</button>+ <input ref="csvFileInput" type="file" accept=".csv" style="display: none" @change="onCsvFileSelected" />+ </div>+ </div>++ <div class="card">+ <div class="card-header" style="display: flex; gap: 12px; align-items: center">+ <input+ v-model="search"+ type="text"+ class="form-input"+ placeholder="Search by email or name..."+ style="max-width: 320px"+ @input="onSearchInput"+ />+ <select v-model="statusFilter" class="form-select" style="max-width: 180px" @change="onStatusChange">+ <option value="">All Statuses</option>+ <option value="subscribed">Subscribed</option>+ <option value="unsubscribed">Unsubscribed</option>+ <option value="bounced">Bounced</option>+ <option value="complained">Complained</option>+ </select>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else>+ <div v-if="subscribers.length === 0" class="empty-state">+ <h3>No Subscribers</h3>+ <p v-if="search || statusFilter">No subscribers matching your filters.</p>+ <p v-else>Add subscribers manually or import them from a file.</p>+ </div>++ <template v-else>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Email</th>+ <th>Name</th>+ <th>Status</th>+ <th>Custom Fields</th>+ <th>Created</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="sub in subscribers" :key="sub.id" style="cursor: pointer" @click="router.push(`/subscribers/${sub.id}`)">+ <td>{{ sub.email }}</td>+ <td>{{ sub.name || '-' }}</td>+ <td><span :class="statusBadgeClass(sub.status)">{{ sub.status }}</span></td>+ <td>{{ truncateCustomFields(sub.custom_fields) }}</td>+ <td>{{ formatDate(sub.created_at) }}</td>+ </tr>+ </tbody>+ </table>+ </div>++ <Pagination :pageable="pageable" @page="goToPage" />+ </template>+ </template>+ </div>++ <!-- Create Subscriber Modal -->+ <div v-if="showCreateModal" class="modal-overlay" @mousedown="watchCreateStart" @mouseup="confirmCreateEnd">+ <div class="modal" @mousedown.stop @mouseup.stop>+ <div class="modal-header">+ <h2>Add Subscriber</h2>+ </div>+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Email</label>+ <input v-model="createForm.email" type="email" class="form-input" placeholder="[email protected]" />+ </div>+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="createForm.name" type="text" class="form-input" placeholder="Name (optional)" />+ </div>+ <div class="form-group">+ <label class="form-label">Custom Fields (JSON)</label>+ <textarea v-model="createForm.custom_fields" class="form-input" rows="4" placeholder='{"company": "Acme", "plan": "pro"}'></textarea>+ </div>+ </div>+ <div class="modal-footer">+ <button class="btn btn-secondary" @click="showCreateModal = false">Cancel</button>+ <button class="btn btn-primary" :disabled="creating || !createForm.email.trim()" @click="createSubscriber">+ {{ creating ? 'Creating...' : 'Create' }}+ </button>+ </div>+ </div>+ </div>++ <!-- Import JSON Modal -->+ <div v-if="showImportJsonModal" class="modal-overlay" @mousedown="watchImportStart" @mouseup="confirmImportEnd">+ <div class="modal" @mousedown.stop @mouseup.stop>+ <div class="modal-header">+ <h2>Import Subscribers (JSON)</h2>+ </div>+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">JSON Data</label>+ <textarea v-model="importJsonText" class="form-input" rows="10" placeholder='[{"email": "[email protected]", "name": "User"}]'></textarea>+ </div>+ </div>+ <div class="modal-footer">+ <button class="btn btn-secondary" @click="showImportJsonModal = false">Cancel</button>+ <button class="btn btn-primary" :disabled="importing || !importJsonText.trim()" @click="importJson">+ {{ importing ? 'Importing...' : 'Import' }}+ </button>+ </div>+ </div>+ </div>+ </div>+</template>diff --git a/web/src/views/templates/EmailBuilder.vue b/web/src/views/templates/EmailBuilder.vuenew file mode 100644index 0000000..95540d9--- /dev/null+++ b/web/src/views/templates/EmailBuilder.vue@@ -0,0 +1,305 @@+<script setup lang="ts">+import { ref, onMounted, onBeforeUnmount } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { templatesApi } from '../../api/templates'+import type {+ Template,+ TemplateVersion,+ TemplateLocalization,+} from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import grapesjs from 'grapesjs'+import type { Editor } from 'grapesjs'+import 'grapesjs/dist/css/grapes.min.css'+import grapesjsNewsletter from 'grapesjs-preset-newsletter'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()++const templateId = Number(route.params.id)+const versionId = Number(route.params.versionId)+const localizationId = Number(route.params.localizationId)++const template = ref<Template | null>(null)+const version = ref<TemplateVersion | null>(null)+const localization = ref<TemplateLocalization | null>(null)+const loading = ref(true)+const saving = ref(false)+const hasChanges = ref(false)++const editorContainer = ref<HTMLElement | null>(null)+let editor: Editor | null = null++function initGrapesJS() {+ if (!editorContainer.value) return++ editor = grapesjs.init({+ container: editorContainer.value,+ height: '100%',+ width: 'auto',+ fromElement: false,+ storageManager: false,+ plugins: [grapesjsNewsletter],+ pluginsOpts: {+ [grapesjsNewsletter as any]: {+ modalTitleImport: 'Import HTML',+ modalTitleExport: 'Export HTML',+ },+ },+ canvas: {+ styles: [+ 'https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap',+ ],+ },+ deviceManager: {+ devices: [+ { name: 'Desktop', width: '' },+ { name: 'Tablet', width: '768px', widthMedia: '992px' },+ { name: 'Mobile', width: '375px', widthMedia: '480px' },+ ],+ },+ })++ // Load existing content+ if (localization.value) {+ if (localization.value.builder_json) {+ try {+ const projectData = JSON.parse(localization.value.builder_json)+ editor.loadProjectData(projectData)+ } catch {+ // Fall back to loading raw HTML+ if (localization.value.html_template) {+ editor.setComponents(localization.value.html_template)+ }+ }+ } else if (localization.value.html_template) {+ editor.setComponents(localization.value.html_template)+ }+ }++ // Track changes+ editor.on('change:changesCount', () => {+ hasChanges.value = true+ })+}++async function save() {+ if (!editor || !localization.value) return+ saving.value = true++ try {+ const html = editor.getHtml()+ const css = editor.getCss()+ const fullHtml = injectStyles(html, css || '')+ const projectData = JSON.stringify(editor.getProjectData())++ const res = await templatesApi.updateLocalization(localizationId, {+ html_template: fullHtml,+ builder_json: projectData,+ })+ localization.value = res.data.data+ hasChanges.value = false+ notify.success('Template saved')+ } catch (e: any) {+ notify.error(e.response?.data?.error?.message || 'Failed to save')+ } finally {+ saving.value = false+ }+}++function injectStyles(html: string, css: string): string {+ if (!css) return html+ const styleTag = `<style>${css}</style>`+ if (html.includes('</head>')) {+ return html.replace('</head>', `${styleTag}</head>`)+ }+ if (html.includes('<body')) {+ return html.replace('<body', `${styleTag}<body`)+ }+ return styleTag + html+}++function handleKeydown(e: KeyboardEvent) {+ if ((e.metaKey || e.ctrlKey) && e.key === 's') {+ e.preventDefault()+ save()+ }+}++function goBack() {+ router.push(`/templates/${templateId}/versions`)+}++function switchToCodeEditor() {+ router.push(`/templates/${templateId}/versions/${versionId}/localizations/${localizationId}/edit`)+}++onMounted(async () => {+ document.addEventListener('keydown', handleKeydown)++ try {+ const [tmplRes, versionsRes, locsRes] = await Promise.all([+ templatesApi.list(0, 100),+ templatesApi.listVersions(templateId),+ templatesApi.listLocalizations(templateId, versionId),+ ])++ template.value = tmplRes.data.data.find((t: Template) => t.id === templateId) || null+ version.value = (versionsRes.data.data || []).find((v: TemplateVersion) => v.id === versionId) || null++ const locs: TemplateLocalization[] = locsRes.data.data || []+ localization.value = locs.find((l) => l.id === localizationId) || null++ if (!template.value || !version.value || !localization.value) {+ notify.error('Template, version, or localization not found')+ loading.value = false+ return+ }++ loading.value = false++ // Initialize GrapesJS after DOM renders+ setTimeout(() => initGrapesJS(), 0)+ } catch {+ notify.error('Failed to load template data')+ loading.value = false+ }+})++onBeforeUnmount(() => {+ document.removeEventListener('keydown', handleKeydown)+ if (editor) {+ editor.destroy()+ editor = null+ }+})+</script>++<template>+ <div class="builder-page">+ <!-- Header -->+ <div class="builder-header">+ <div class="builder-header-left">+ <button class="btn btn-secondary btn-sm" @click="goBack">+ <span class="mdi mdi-arrow-left"></span> Back+ </button>+ <div class="builder-title">+ <h2>{{ template?.name || 'Template' }}</h2>+ <div class="builder-meta">+ <span class="badge badge-accent">Visual Builder</span>+ <span class="badge badge-info">{{ localization?.language }}</span>+ <span class="badge badge-neutral">v{{ version?.version }}</span>+ <span v-if="hasChanges" class="badge badge-warning">Unsaved</span>+ </div>+ </div>+ </div>+ <div class="builder-header-right">+ <button class="btn btn-secondary btn-sm" @click="switchToCodeEditor">+ <span class="mdi mdi-code-tags"></span> Code Editor+ </button>+ <button+ class="btn btn-primary btn-sm"+ :disabled="saving || !hasChanges"+ @click="save"+ >+ {{ saving ? 'Saving...' : 'Save' }}+ </button>+ </div>+ </div>++ <!-- Loading -->+ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <!-- GrapesJS Editor -->+ <div v-else-if="template && localization" ref="editorContainer" class="builder-editor"></div>++ <!-- Not found -->+ <div v-else class="empty-state">+ <h3>Not found</h3>+ <p>The template, version, or localization was not found.</p>+ <button class="btn btn-secondary" @click="goBack">Go Back</button>+ </div>+ </div>+</template>++<style scoped>+.builder-page {+ display: flex;+ flex-direction: column;+ height: calc(100vh - 60px);+ margin: -24px;+ overflow: hidden;+}++.builder-header {+ display: flex;+ align-items: center;+ justify-content: space-between;+ padding: 10px 16px;+ border-bottom: 1px solid var(--border-primary);+ background: var(--bg-primary);+ flex-shrink: 0;+ z-index: 10;+}++.builder-header-left {+ display: flex;+ align-items: center;+ gap: 12px;+}++.builder-header-right {+ display: flex;+ align-items: center;+ gap: 8px;+}++.builder-title h2 {+ font-size: 15px;+ font-weight: 600;+ margin: 0;+ color: var(--text-primary);+}++.builder-meta {+ display: flex;+ gap: 6px;+ margin-top: 2px;+}++.builder-editor {+ flex: 1;+ overflow: hidden;+}++/* GrapesJS overrides for theme integration */+.builder-editor :deep(.gjs-one-bg) {+ background-color: var(--bg-secondary);+}++.builder-editor :deep(.gjs-two-color) {+ color: var(--text-primary);+}++.builder-editor :deep(.gjs-three-bg) {+ background-color: var(--bg-tertiary);+}++.builder-editor :deep(.gjs-four-color),+.builder-editor :deep(.gjs-four-color-h:hover) {+ color: var(--primary-600);+}++.badge-accent {+ background: var(--primary-50);+ color: var(--primary-600);+}++.badge-warning {+ background: var(--warning-50);+ color: var(--warning-600);+}+</style>diff --git a/web/src/views/templates/TemplateDetail.vue b/web/src/views/templates/TemplateDetail.vueindex c644aad..c9fc5a9 100644--- a/web/src/views/templates/TemplateDetail.vue+++ b/web/src/views/templates/TemplateDetail.vue@@ -23,6 +23,13 @@ const notify = useNotificationStore();const { confirm } = useConfirm();const templateId = Number(route.params.id);+const idCopied = ref(false);++function copyTemplateId() {+ navigator.clipboard.writeText(String(templateId));+ idCopied.value = true;+ setTimeout(() => (idCopied.value = false), 2000);+}const template = ref<Template | null>(null);const versions = ref<TemplateVersion[]>([]);@@ -415,6 +422,17 @@ onMounted(loadAll);<div class="card-body"><table><tbody>+ <tr>+ <td class="info-label">Template ID</td>+ <td>+ <code class="template-id">{{ template.id }}</code>+ <button class="btn-copy" @click="copyTemplateId" :title="idCopied ? 'Copied!' : 'Copy ID'">+ <span v-if="idCopied">✓</span>+ <span v-else>📋</span>+ </button>+ <span v-if="idCopied" class="copied-label">Copied!</span>+ </td>+ </tr><tr><td class="info-label">Name</td><td>{{ template.name }}</td>@@ -841,6 +859,40 @@ onMounted(loadAll);color: var(--text-secondary);}+.template-id {+ font-family: "JetBrains Mono", "Fira Code", monospace;+ font-size: 13px;+ background: var(--bg-tertiary);+ padding: 2px 8px;+ border-radius: var(--radius);+ border: 1px solid var(--border-primary);+ user-select: all;+}++.btn-copy {+ background: none;+ border: 1px solid var(--border-primary);+ border-radius: var(--radius);+ cursor: pointer;+ padding: 2px 6px;+ margin-left: 6px;+ font-size: 13px;+ color: var(--text-secondary);+ vertical-align: middle;+ transition: background 0.15s, color 0.15s;+}++.btn-copy:hover {+ background: var(--bg-tertiary);+ color: var(--text-primary);+}++.copied-label {+ font-size: 12px;+ color: var(--success-600, #16a34a);+ margin-left: 6px;+}+.row-selected {background: var(--bg-tertiary);}diff --git a/web/src/views/templates/TemplateEditor.vue b/web/src/views/templates/TemplateEditor.vueindex 868078c..f07bb0e 100644--- a/web/src/views/templates/TemplateEditor.vue+++ b/web/src/views/templates/TemplateEditor.vue@@ -257,6 +257,10 @@ onBeforeUnmount(() => {function goBack() {router.push(`/templates/${templateId}/versions`)}++function switchToVisualBuilder() {+ router.push(`/templates/${templateId}/versions/${versionId}/localizations/${localizationId}/builder`)+}</script><template>@@ -277,6 +281,9 @@ function goBack() {</div></div><div class="editor-header-right">+ <button class="btn btn-secondary btn-sm" @click="switchToVisualBuilder">+ <span class="mdi mdi-palette-outline"></span> Visual Builder+ </button><buttonclass="btn btn-secondary btn-sm"@click="showPreviewPanel = !showPreviewPanel"diff --git a/web/src/views/templates/Templates.vue b/web/src/views/templates/Templates.vueindex 3080140..c71ca70 100644--- a/web/src/views/templates/Templates.vue+++ b/web/src/views/templates/Templates.vue@@ -159,13 +159,20 @@ async function handleImportFile(event: Event) {importing.value = true;try {- const text = await file.text();- const data: TemplateExport = JSON.parse(text);- await templatesApi.importTemplate(data);- notify.success("Template imported");+ const name = file.name.toLowerCase();+ if (name.endsWith(".html") || name.endsWith(".htm")) {+ await templatesApi.importHTML(file);+ notify.success("HTML template imported");+ } else {+ const text = await file.text();+ const data: TemplateExport = JSON.parse(text);+ await templatesApi.importTemplate(data);+ notify.success("Template imported");+ }await loadTemplates(pageable.value.current_page);- } catch {- notify.error("Failed to import template. Please check the file format.");+ } catch (e: any) {+ const msg = e?.response?.data?.message || "Failed to import template. Please check the file format.";+ notify.error(msg);} finally {importing.value = false;input.value = "";@@ -197,7 +204,7 @@ onMounted(() => {<inputref="importInput"type="file"- accept=".json"+ accept=".json,.html,.htm"style="display: none"@change="handleImportFile"/>diff --git a/web/src/views/workspaces/WorkspaceSettings.vue b/web/src/views/workspaces/WorkspaceSettings.vuenew file mode 100644index 0000000..5de1ed1--- /dev/null+++ b/web/src/views/workspaces/WorkspaceSettings.vue@@ -0,0 +1,793 @@+<script setup lang="ts">+import { ref, onMounted, computed } from 'vue'+import { useRoute, useRouter } from 'vue-router'+import { workspaceApi } from '../../api/workspaces'+import type { Workspace, WorkspaceMember, WorkspaceInvitation, WorkspaceRole, TransferResult, Plan } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useWorkspaceStore } from '../../stores/workspace'+import { useConfirm } from '../../composables/useConfirm'++const route = useRoute()+const router = useRouter()+const notify = useNotificationStore()+const wsStore = useWorkspaceStore()+const { confirm } = useConfirm()++const wsId = Number(route.params.id)+const ws = ref<Workspace | null>(null)+const loading = ref(true)++// Tabs+const activeTab = ref<'members' | 'invitations' | 'plan' | 'transfer' | 'settings'>('members')++// Members+const members = ref<WorkspaceMember[]>([])+const membersLoading = ref(false)++// Invitations+const invitations = ref<WorkspaceInvitation[]>([])+const invitationsLoading = ref(false)++// Plan+const currentPlan = ref<Plan | null>(null)+const planLoading = ref(false)+const planSource = ref<string | null>(null)++// Invite modal+const showInviteModal = ref(false)+const inviteEmail = ref('')+const inviteRole = ref<WorkspaceRole>('editor')+const inviting = ref(false)++// Data Export/Import+const exporting = ref(false)+const importing = ref(false)+const importFileRef = ref<HTMLInputElement | null>(null)++// Settings+const editName = ref('')+const editDescription = ref('')+const saving = ref(false)++// Data Transfer+const availableResources = [+ { key: 'templates', label: 'Templates' },+ { key: 'stylesheets', label: 'Stylesheets' },+ { key: 'languages', label: 'Languages' },+ { key: 'smtp_servers', label: 'SMTP Servers' },+ { key: 'domains', label: 'Domains' },+ { key: 'webhooks', label: 'Webhooks' },+ { key: 'contacts', label: 'Contacts' },+ { key: 'subscribers', label: 'Subscribers' },+ { key: 'subscriber_lists', label: 'Lists' },+ { key: 'suppressions', label: 'Suppressions' },+ { key: 'api_keys', label: 'API Keys' },+ { key: 'bounces', label: 'Bounces' },+ { key: 'emails', label: 'Emails' },+]+const selectedResources = ref<string[]>([])+const transferring = ref(false)+const transferResults = ref<TransferResult[] | null>(null)+const transferTotal = ref(0)++const myRole = computed(() => {+ const membership = wsStore.workspaces.find(w => w.id === wsId)+ return membership?.role ?? 'viewer'+})++const isAdminOrOwner = computed(() => myRole.value === 'owner' || myRole.value === 'admin')+const isOwner = computed(() => myRole.value === 'owner')++async function fetchWorkspace() {+ loading.value = true+ // Temporarily set workspace context for API calls+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ const res = await workspaceApi.getCurrent()+ ws.value = res.data.data+ editName.value = ws.value.name+ editDescription.value = ws.value.description || ''+ } catch {+ notify.error('Failed to load workspace')+ router.push('/workspaces')+ } finally {+ loading.value = false+ wsStore.setWorkspace(prevWs)+ }+}++async function fetchMembers() {+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ membersLoading.value = true+ try {+ const res = await workspaceApi.listMembers()+ members.value = res.data.data ?? []+ } catch {+ notify.error('Failed to load members')+ } finally {+ membersLoading.value = false+ wsStore.setWorkspace(prevWs)+ }+}++async function fetchInvitations() {+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ invitationsLoading.value = true+ try {+ const res = await workspaceApi.listInvitations()+ invitations.value = res.data.data ?? []+ } catch {+ notify.error('Failed to load invitations')+ } finally {+ invitationsLoading.value = false+ wsStore.setWorkspace(prevWs)+ }+}++async function fetchPlan() {+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ planLoading.value = true+ try {+ const res = await workspaceApi.getPlan()+ const data = res.data.data+ if (data && typeof data === 'object' && 'id' in data) {+ currentPlan.value = data as Plan+ planSource.value = null+ } else if (data && typeof data === 'object' && 'source' in data) {+ currentPlan.value = null+ planSource.value = (data as any).source ?? 'global_settings'+ } else {+ currentPlan.value = null+ planSource.value = 'global_settings'+ }+ } catch {+ currentPlan.value = null+ planSource.value = 'global_settings'+ } finally {+ planLoading.value = false+ wsStore.setWorkspace(prevWs)+ }+}++function formatLimit(value: number): string {+ return value === 0 ? 'Unlimited' : value.toLocaleString()+}++async function inviteMember() {+ if (!inviteEmail.value.trim()) return+ inviting.value = true+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ await workspaceApi.invite({ email: inviteEmail.value.trim(), role: inviteRole.value })+ notify.success('Invitation sent')+ showInviteModal.value = false+ inviteEmail.value = ''+ inviteRole.value = 'editor'+ await fetchInvitations()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to invite')+ } finally {+ inviting.value = false+ wsStore.setWorkspace(prevWs)+ }+}++async function updateRole(member: WorkspaceMember, newRole: WorkspaceRole) {+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ await workspaceApi.updateMemberRole(member.user_id, newRole)+ notify.success('Role updated')+ await fetchMembers()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to update role')+ } finally {+ wsStore.setWorkspace(prevWs)+ }+}++async function removeMember(member: WorkspaceMember) {+ const ok = await confirm({ title: 'Remove Member', message: `Remove ${member.name || member.email} from this workspace?`, confirmText: 'Remove', variant: 'danger' })+ if (!ok) return+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ await workspaceApi.removeMember(member.user_id)+ notify.success('Member removed')+ await fetchMembers()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to remove')+ } finally {+ wsStore.setWorkspace(prevWs)+ }+}++async function revokeInvitation(inv: WorkspaceInvitation) {+ const ok = await confirm({ title: 'Revoke Invitation', message: `Revoke the invitation for ${inv.email}?`, confirmText: 'Revoke', variant: 'warning' })+ if (!ok) return+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ await workspaceApi.cancelInvitation(inv.id)+ notify.success('Invitation revoked')+ await fetchInvitations()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to revoke')+ } finally {+ wsStore.setWorkspace(prevWs)+ }+}++async function saveSettings() {+ saving.value = true+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ await workspaceApi.update({ name: editName.value.trim(), description: editDescription.value.trim() })+ notify.success('Workspace updated')+ await wsStore.fetchWorkspaces()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to update')+ } finally {+ saving.value = false+ wsStore.setWorkspace(prevWs)+ }+}++async function deleteWorkspace() {+ const ok = await confirm({ title: 'Delete Workspace', message: 'Are you sure you want to delete this workspace? This cannot be undone.', confirmText: 'Delete', variant: 'danger' })+ if (!ok) return+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ await workspaceApi.delete()+ notify.success('Workspace deleted')+ wsStore.setWorkspace(null)+ await wsStore.fetchWorkspaces()+ router.push('/workspaces')+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to delete')+ wsStore.setWorkspace(prevWs)+ }+}++function toggleResource(key: string) {+ const idx = selectedResources.value.indexOf(key)+ if (idx >= 0) {+ selectedResources.value.splice(idx, 1)+ } else {+ selectedResources.value.push(key)+ }+}++function selectAllResources() {+ if (selectedResources.value.length === availableResources.length) {+ selectedResources.value = []+ } else {+ selectedResources.value = availableResources.map(r => r.key)+ }+}++async function transferData() {+ if (selectedResources.value.length === 0) return+ const ok = await confirm({ title: 'Transfer Data', message: `Transfer ${selectedResources.value.length} resource type(s) from your personal account to this workspace? This cannot be undone.`, confirmText: 'Transfer', variant: 'warning' })+ if (!ok) return++ transferring.value = true+ transferResults.value = null+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ const res = await workspaceApi.transferData(selectedResources.value)+ transferResults.value = res.data.data.results+ transferTotal.value = res.data.data.total+ notify.success(res.data.data.message)+ selectedResources.value = []+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to transfer data')+ } finally {+ transferring.value = false+ wsStore.setWorkspace(prevWs)+ }+}++async function exportWorkspaceData() {+ exporting.value = true+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ const res = await workspaceApi.exportData()+ const blob = new Blob([JSON.stringify(res.data.data, null, 2)], { type: 'application/json' })+ const url = URL.createObjectURL(blob)+ const a = document.createElement('a')+ a.href = url+ a.download = `posta-workspace-export-${ws.value?.slug || wsId}-${new Date().toISOString().slice(0, 10)}.json`+ a.click()+ URL.revokeObjectURL(url)+ notify.success('Workspace data exported successfully')+ } catch {+ notify.error('Failed to export workspace data')+ } finally {+ exporting.value = false+ wsStore.setWorkspace(prevWs)+ }+}++function triggerWorkspaceImport() {+ importFileRef.value?.click()+}++async function handleWorkspaceImportFile(event: Event) {+ const file = (event.target as HTMLInputElement).files?.[0]+ if (!file) return++ const confirmed = await confirm({+ title: 'Import Workspace Data',+ message: 'This will import data into this workspace from the selected file. Duplicate items will be skipped. SMTP servers will be imported as disabled (passwords are not exported). Domains will require re-verification. Continue?',+ confirmText: 'Import',+ variant: 'danger',+ })+ if (!confirmed) {+ if (importFileRef.value) importFileRef.value.value = ''+ return+ }++ importing.value = true+ const prevWs = wsStore.currentWorkspaceId+ wsStore.setWorkspace(wsId)+ try {+ const text = await file.text()+ const data = JSON.parse(text)+ const res = await workspaceApi.importData(data)+ notify.success(res.data.data.message || 'Workspace data imported successfully')+ } catch (e: any) {+ if (e instanceof SyntaxError) {+ notify.error('Invalid JSON file')+ } else {+ notify.error(e.response?.data?.error?.message || 'Failed to import workspace data')+ }+ } finally {+ importing.value = false+ if (importFileRef.value) importFileRef.value.value = ''+ wsStore.setWorkspace(prevWs)+ }+}++function roleBadgeClass(role: string): string {+ if (role === 'owner') return 'badge-primary'+ if (role === 'admin') return 'badge-warning'+ return 'badge-neutral'+}++function formatDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++onMounted(async () => {+ await fetchWorkspace()+ await Promise.all([fetchMembers(), fetchInvitations(), fetchPlan()])+})+</script>++<template>+ <div>+ <div class="page-header">+ <div>+ <h1>{{ ws?.name || 'Workspace' }}</h1>+ <p v-if="ws?.slug" style="color: var(--text-muted); font-size: 13px; margin-top: 2px;">+ <code>{{ ws.slug }}</code>+ </p>+ </div>+ <button class="btn btn-secondary" @click="router.push('/workspaces')">Back</button>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else>+ <!-- Tabs -->+ <div class="tabs">+ <button :class="['tab', { active: activeTab === 'members' }]" @click="activeTab = 'members'">+ Members ({{ members.length }})+ </button>+ <button :class="['tab', { active: activeTab === 'invitations' }]" @click="activeTab = 'invitations'">+ Invitations ({{ invitations.length }})+ </button>+ <button :class="['tab', { active: activeTab === 'plan' }]" @click="activeTab = 'plan'">+ Plan+ </button>+ <button v-if="isAdminOrOwner" :class="['tab', { active: activeTab === 'transfer' }]" @click="activeTab = 'transfer'">+ Data Transfer+ </button>+ <button v-if="isAdminOrOwner" :class="['tab', { active: activeTab === 'settings' }]" @click="activeTab = 'settings'">+ Settings+ </button>+ </div>++ <!-- Members Tab -->+ <div v-if="activeTab === 'members'" class="card">+ <div class="card-header">+ <span>Members</span>+ <button v-if="isAdminOrOwner" class="btn btn-primary btn-sm" @click="showInviteModal = true">Invite</button>+ </div>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Name</th>+ <th>Email</th>+ <th>Role</th>+ <th>Joined</th>+ <th v-if="isAdminOrOwner">Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="m in members" :key="m.id">+ <td style="font-weight: 500;">{{ m.name }}</td>+ <td>{{ m.email }}</td>+ <td>+ <select+ v-if="isAdminOrOwner && m.role !== 'owner'"+ :value="m.role"+ class="form-select form-select-sm"+ @change="updateRole(m, ($event.target as HTMLSelectElement).value as WorkspaceRole)"+ >+ <option value="admin">Admin</option>+ <option value="editor">Editor</option>+ <option value="viewer">Viewer</option>+ </select>+ <span v-else class="badge" :class="roleBadgeClass(m.role)">{{ m.role }}</span>+ </td>+ <td>{{ formatDate(m.created_at) }}</td>+ <td v-if="isAdminOrOwner">+ <button v-if="m.role !== 'owner'" class="btn btn-danger btn-sm" @click="removeMember(m)">Remove</button>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Invitations Tab -->+ <div v-if="activeTab === 'invitations'" class="card">+ <div class="card-header">+ <span>Pending Invitations</span>+ <button v-if="isAdminOrOwner" class="btn btn-primary btn-sm" @click="showInviteModal = true">Invite</button>+ </div>+ <div v-if="invitations.length === 0" class="empty-state">+ <p>No pending invitations.</p>+ </div>+ <div v-else class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Email</th>+ <th>Role</th>+ <th>Expires</th>+ <th>Sent</th>+ <th v-if="isAdminOrOwner">Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="inv in invitations" :key="inv.id">+ <td>{{ inv.email }}</td>+ <td><span class="badge" :class="roleBadgeClass(inv.role)">{{ inv.role }}</span></td>+ <td>{{ formatDate(inv.expires_at) }}</td>+ <td>{{ formatDate(inv.created_at) }}</td>+ <td v-if="isAdminOrOwner">+ <button class="btn btn-danger btn-sm" @click="revokeInvitation(inv)">Revoke</button>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Plan Tab -->+ <div v-if="activeTab === 'plan'">+ <div v-if="planLoading" class="loading-page"><div class="spinner"></div></div>+ <template v-else-if="currentPlan">+ <div class="card" style="margin-bottom: 16px">+ <div class="card-header">+ <div>+ <h2 style="margin: 0">{{ currentPlan.name }}</h2>+ <p v-if="currentPlan.description" style="margin: 4px 0 0; font-size: 13px; color: var(--text-secondary)">{{ currentPlan.description }}</p>+ </div>+ <div class="flex gap-2">+ <span class="badge badge-success" v-if="currentPlan.is_active">Active</span>+ <span class="badge badge-info" v-if="currentPlan.is_default">Default</span>+ </div>+ </div>+ </div>++ <div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); gap: 16px;">+ <!-- Rate Limits -->+ <div class="card">+ <div class="card-header"><h3 style="margin: 0; font-size: 14px">Rate Limits</h3></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 140px">Hourly</td>+ <td>{{ formatLimit(currentPlan.hourly_rate_limit) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Daily</td>+ <td>{{ formatLimit(currentPlan.daily_rate_limit) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Email Constraints -->+ <div class="card">+ <div class="card-header"><h3 style="margin: 0; font-size: 14px">Email Constraints</h3></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 140px">Attachment</td>+ <td>{{ currentPlan.max_attachment_size_mb === 0 ? 'Unlimited' : currentPlan.max_attachment_size_mb + ' MB' }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Batch Size</td>+ <td>{{ formatLimit(currentPlan.max_batch_size) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Resource Limits -->+ <div class="card">+ <div class="card-header"><h3 style="margin: 0; font-size: 14px">Resource Limits</h3></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 140px">API Keys</td>+ <td>{{ formatLimit(currentPlan.max_api_keys) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Domains</td>+ <td>{{ formatLimit(currentPlan.max_domains) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">SMTP Servers</td>+ <td>{{ formatLimit(currentPlan.max_smtp_servers) }}</td>+ </tr>+ <tr>+ <td style="font-weight: 600">Workspaces</td>+ <td>{{ formatLimit(currentPlan.max_workspaces) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Retention -->+ <div class="card">+ <div class="card-header"><h3 style="margin: 0; font-size: 14px">Data Retention</h3></div>+ <div class="card-body">+ <table>+ <tbody>+ <tr>+ <td style="font-weight: 600; width: 140px">Email Logs</td>+ <td>{{ currentPlan.email_log_retention_days === 0 ? 'Default' : currentPlan.email_log_retention_days + ' days' }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>+ </div>+ </template>+ <div v-else class="card">+ <div class="empty-state">+ <h3>No plan assigned</h3>+ <p>This workspace is using the platform's global default settings. Contact your administrator to assign a plan.</p>+ </div>+ </div>+ </div>++ <!-- Data Transfer Tab -->+ <div v-if="activeTab === 'transfer' && isAdminOrOwner" class="card">+ <div class="card-header"><span>Transfer Personal Data to Workspace</span></div>+ <div class="card-body">+ <p style="font-size: 13px; color: var(--text-secondary); margin-bottom: 16px;">+ Move your personal resources into this workspace. Transferred data will no longer appear in your personal account.+ </p>++ <div style="margin-bottom: 16px;">+ <label class="form-label" style="margin-bottom: 8px;">Select resources to transfer</label>+ <div style="margin-bottom: 8px;">+ <label style="display: flex; align-items: center; gap: 8px; cursor: pointer; font-size: 13px; font-weight: 600; color: var(--text-primary); padding: 6px 0;">+ <input+ type="checkbox"+ :checked="selectedResources.length === availableResources.length"+ @change="selectAllResources"+ />+ Select All+ </label>+ </div>+ <div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); gap: 4px;">+ <label+ v-for="res in availableResources"+ :key="res.key"+ style="display: flex; align-items: center; gap: 8px; cursor: pointer; font-size: 13px; color: var(--text-secondary); padding: 6px 8px; border-radius: var(--radius-sm); transition: background var(--transition);"+ :style="{ background: selectedResources.includes(res.key) ? 'var(--primary-50)' : 'transparent' }"+ >+ <input+ type="checkbox"+ :checked="selectedResources.includes(res.key)"+ @change="toggleResource(res.key)"+ />+ {{ res.label }}+ </label>+ </div>+ </div>++ <button+ class="btn btn-primary"+ :disabled="transferring || selectedResources.length === 0"+ @click="transferData"+ >+ {{ transferring ? 'Transferring...' : `Transfer ${selectedResources.length} resource type(s)` }}+ </button>++ <!-- Transfer Results -->+ <div v-if="transferResults" style="margin-top: 20px; border-top: 1px solid var(--border-primary); padding-top: 16px;">+ <h4 style="font-size: 14px; font-weight: 600; margin-bottom: 12px;">+ Transfer Complete — {{ transferTotal }} record(s) moved+ </h4>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Resource</th>+ <th>Records Transferred</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="r in transferResults" :key="r.resource">+ <td style="font-weight: 500; text-transform: capitalize;">{{ r.resource.replace(/_/g, ' ') }}</td>+ <td>+ <span v-if="r.count > 0" class="badge badge-primary">{{ r.count }}</span>+ <span v-else style="color: var(--text-muted);">0</span>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>+ </div>+ </div>++ <!-- Settings Tab -->+ <div v-if="activeTab === 'settings' && isAdminOrOwner" class="card">+ <div class="card-header"><span>Workspace Settings</span></div>+ <div class="card-body">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input v-model="editName" class="form-input" />+ </div>+ <div class="form-group">+ <label class="form-label">Description</label>+ <input v-model="editDescription" class="form-input" placeholder="Optional description" />+ </div>+ <div class="form-group">+ <label class="form-label">Slug</label>+ <input :value="ws?.slug" class="form-input" disabled />+ <small style="font-size: 12px; color: var(--text-muted); margin-top: 4px; display: block;">Slug cannot be changed after creation.</small>+ </div>+ <button class="btn btn-primary" :disabled="saving" @click="saveSettings">+ {{ saving ? 'Saving...' : 'Save Changes' }}+ </button>+ </div>++ <div class="card-body" style="border-top: 1px solid var(--border-primary);">+ <h4 style="font-size: 14px; font-weight: 600; margin-bottom: 8px;">Data Export / Import</h4>+ <p style="font-size: 13px; color: var(--text-secondary); margin-bottom: 12px;">+ Export all workspace data (settings, templates, stylesheets, languages, contacts, contact lists, webhooks,+ SMTP servers, domains, subscribers, subscriber lists, and suppressions) as a JSON file.+ </p>+ <p style="font-size: 12px; color: var(--text-muted); margin-bottom: 16px;">+ SMTP server passwords are not included in exports. Imported SMTP servers will be disabled until reconfigured.+ Imported domains will require re-verification.+ </p>+ <div style="display: flex; gap: 8px; flex-wrap: wrap;">+ <button class="btn btn-primary" :disabled="exporting" @click="exportWorkspaceData">+ {{ exporting ? 'Exporting...' : 'Export Workspace Data' }}+ </button>+ <button class="btn btn-secondary" :disabled="importing" @click="triggerWorkspaceImport">+ {{ importing ? 'Importing...' : 'Import Data' }}+ </button>+ <input ref="importFileRef" type="file" accept=".json" style="display: none" @change="handleWorkspaceImportFile" />+ </div>+ </div>++ <div v-if="isOwner" class="card-body" style="border-top: 1px solid var(--border-primary);">+ <h4 style="color: var(--danger-600); margin-bottom: 8px;">Danger Zone</h4>+ <p style="font-size: 13px; color: var(--text-muted); margin-bottom: 12px;">+ Deleting this workspace will permanently remove all its resources. This cannot be undone.+ </p>+ <button class="btn btn-danger" @click="deleteWorkspace">Delete Workspace</button>+ </div>+ </div>+ </template>++ <!-- Invite Modal -->+ <div v-if="showInviteModal" class="modal-overlay" @click.self="showInviteModal = false">+ <div class="modal">+ <div class="modal-header">+ <h3>Invite Member</h3>+ </div>+ <form @submit.prevent="inviteMember">+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Email Address</label>+ <input v-model="inviteEmail" type="email" class="form-input" placeholder="[email protected]" required />+ </div>+ <div class="form-group">+ <label class="form-label">Role</label>+ <select v-model="inviteRole" class="form-select">+ <option value="admin">Admin</option>+ <option value="editor">Editor</option>+ <option value="viewer">Viewer</option>+ </select>+ </div>+ </div>+ <div class="modal-footer">+ <button type="button" class="btn btn-secondary" @click="showInviteModal = false">Cancel</button>+ <button type="submit" class="btn btn-primary" :disabled="inviting || !inviteEmail.trim()">+ {{ inviting ? 'Sending...' : 'Send Invitation' }}+ </button>+ </div>+ </form>+ </div>+ </div>+ </div>+</template>++<style scoped>+.tabs {+ display: flex;+ gap: 0;+ border-bottom: 1px solid var(--border-primary);+ margin-bottom: 20px;+}+.tab {+ padding: 10px 20px;+ font-size: 14px;+ font-weight: 500;+ color: var(--text-muted);+ background: none;+ border: none;+ border-bottom: 2px solid transparent;+ cursor: pointer;+ transition: all var(--transition);+}+.tab:hover { color: var(--text-primary); }+.tab.active {+ color: var(--primary-600);+ border-bottom-color: var(--primary-600);+}++.card-header {+ display: flex;+ align-items: center;+ justify-content: space-between;+ padding: 14px 20px;+ border-bottom: 1px solid var(--border-primary);+ font-weight: 600;+ font-size: 14px;+}++.card-body { padding: 20px; }+</style>diff --git a/web/src/views/workspaces/Workspaces.vue b/web/src/views/workspaces/Workspaces.vuenew file mode 100644index 0000000..4ebba8f--- /dev/null+++ b/web/src/views/workspaces/Workspaces.vue@@ -0,0 +1,254 @@+<script setup lang="ts">+import { ref, onMounted } from 'vue'+import { useRouter } from 'vue-router'+import { workspaceApi } from '../../api/workspaces'+import type { Workspace, WorkspaceInvitation } from '../../api/types'+import { useNotificationStore } from '../../stores/notification'+import { useWorkspaceStore } from '../../stores/workspace'++const router = useRouter()+const notify = useNotificationStore()+const wsStore = useWorkspaceStore()++const workspaces = ref<Workspace[]>([])+const invitations = ref<WorkspaceInvitation[]>([])+const loading = ref(true)++const showCreateModal = ref(false)+const newName = ref('')+const newSlug = ref('')+const newDescription = ref('')+const creating = ref(false)++async function fetchData() {+ loading.value = true+ try {+ const [wsRes, invRes] = await Promise.all([+ workspaceApi.list(),+ workspaceApi.myInvitations(),+ ])+ workspaces.value = wsRes.data.data ?? []+ invitations.value = invRes.data.data ?? []+ } catch {+ notify.error('Failed to load workspaces')+ } finally {+ loading.value = false+ }+}++function autoSlug() {+ newSlug.value = newName.value+ .toLowerCase()+ .replace(/[^a-z0-9]+/g, '-')+ .replace(/^-|-$/g, '')+}++async function createWorkspace() {+ if (!newName.value.trim() || !newSlug.value.trim()) return+ creating.value = true+ try {+ await workspaceApi.create({ name: newName.value.trim(), slug: newSlug.value.trim(), description: newDescription.value.trim() })+ notify.success('Workspace created')+ showCreateModal.value = false+ newName.value = ''+ newSlug.value = ''+ newDescription.value = ''+ await fetchData()+ await wsStore.fetchWorkspaces()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to create workspace')+ } finally {+ creating.value = false+ }+}++async function acceptInvitation(inv: WorkspaceInvitation) {+ try {+ await workspaceApi.acceptInvitationById(inv.id)+ notify.success(`Joined workspace "${inv.workspace}"`)+ await fetchData()+ await wsStore.fetchWorkspaces()+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to accept invitation')+ }+}++async function declineInvitation(inv: WorkspaceInvitation) {+ try {+ await workspaceApi.declineInvitationById(inv.id)+ notify.success('Invitation declined')+ invitations.value = invitations.value.filter(i => i.id !== inv.id)+ } catch (err: any) {+ notify.error(err.response?.data?.error?.message || 'Failed to decline invitation')+ }+}++function switchToWorkspace(ws: Workspace) {+ wsStore.setWorkspace(ws.id)+ router.push('/')+}++function viewWorkspace(ws: Workspace) {+ router.push(`/workspaces/${ws.id}`)+}++function roleBadgeClass(role: string): string {+ if (role === 'owner') return 'badge-primary'+ if (role === 'admin') return 'badge-warning'+ return 'badge-neutral'+}++function formatDate(dateStr: string): string {+ return new Date(dateStr).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric' })+}++onMounted(fetchData)+</script>++<template>+ <div>+ <div class="page-header">+ <h1>Workspaces</h1>+ <button class="btn btn-primary" @click="showCreateModal = true">Create Workspace</button>+ </div>++ <div v-if="loading" class="loading-page">+ <div class="spinner"></div>+ </div>++ <template v-else>+ <!-- Pending Invitations -->+ <div v-if="invitations.length > 0" class="card" style="margin-bottom: 20px;">+ <div class="card-header" style="display: flex; align-items: center; justify-content: space-between; padding: 14px 20px; border-bottom: 1px solid var(--border-primary); font-weight: 600; font-size: 14px;">+ <span>Pending Invitations ({{ invitations.length }})</span>+ </div>+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Workspace</th>+ <th>Role</th>+ <th>Expires</th>+ <th>Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="inv in invitations" :key="inv.id">+ <td style="font-weight: 500;">{{ inv.workspace }}</td>+ <td><span class="badge" :class="roleBadgeClass(inv.role)">{{ inv.role }}</span></td>+ <td>{{ formatDate(inv.expires_at) }}</td>+ <td>+ <div style="display: flex; gap: 6px;">+ <button class="btn btn-primary btn-sm" @click="acceptInvitation(inv)">Accept</button>+ <button class="btn btn-secondary btn-sm" @click="declineInvitation(inv)">Decline</button>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </div>++ <!-- Workspaces List -->+ <div class="card">+ <div v-if="workspaces.length === 0 && invitations.length === 0" class="empty-state">+ <h3>No workspaces</h3>+ <p>Create a workspace to share resources with your team.</p>+ </div>++ <template v-else-if="workspaces.length > 0">+ <div class="table-wrapper">+ <table>+ <thead>+ <tr>+ <th>Name</th>+ <th>Slug</th>+ <th>Your Role</th>+ <th>Created</th>+ <th>Actions</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="ws in workspaces" :key="ws.id">+ <td style="font-weight: 500;">{{ ws.name }}</td>+ <td><code>{{ ws.slug }}</code></td>+ <td>+ <span class="badge" :class="roleBadgeClass(ws.role)">{{ ws.role }}</span>+ </td>+ <td>{{ formatDate(ws.created_at) }}</td>+ <td>+ <div style="display: flex; gap: 6px;">+ <button+ class="btn btn-primary btn-sm"+ :class="{ 'btn-success': wsStore.currentWorkspaceId === ws.id }"+ @click="switchToWorkspace(ws)"+ >+ {{ wsStore.currentWorkspaceId === ws.id ? 'Active' : 'Switch' }}+ </button>+ <button class="btn btn-secondary btn-sm" @click="viewWorkspace(ws)">Manage</button>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template>++ <div v-else class="empty-state">+ <h3>No workspaces yet</h3>+ <p>You have pending invitations above. Accept one to get started, or create your own workspace.</p>+ </div>+ </div>+ </template>++ <!-- Create Workspace Modal -->+ <div v-if="showCreateModal" class="modal-overlay" @click.self="showCreateModal = false">+ <div class="modal">+ <div class="modal-header">+ <h3>Create Workspace</h3>+ </div>+ <form @submit.prevent="createWorkspace">+ <div class="modal-body">+ <div class="form-group">+ <label class="form-label">Name</label>+ <input+ v-model="newName"+ class="form-input"+ placeholder="My Team"+ required+ @input="autoSlug"+ />+ </div>+ <div class="form-group">+ <label class="form-label">Slug</label>+ <input+ v-model="newSlug"+ class="form-input"+ placeholder="my-team"+ pattern="[a-z0-9]+(-[a-z0-9]+)*"+ required+ />+ <small style="font-size: 12px; color: var(--text-muted); margin-top: 4px; display: block;">+ URL-friendly identifier. Lowercase letters, numbers, and hyphens only.+ </small>+ </div>+ <div class="form-group">+ <label class="form-label">Description (optional)</label>+ <input+ v-model="newDescription"+ class="form-input"+ placeholder="What is this workspace for?"+ />+ </div>+ </div>+ <div class="modal-footer">+ <button type="button" class="btn btn-secondary" @click="showCreateModal = false">Cancel</button>+ <button type="submit" class="btn btn-primary" :disabled="creating || !newName.trim() || !newSlug.trim()">+ {{ creating ? 'Creating...' : 'Create' }}+ </button>+ </div>+ </form>+ </div>+ </div>+ </div>+</template>diff --git a/web/vite.config.ts b/web/vite.config.tsindex 4336fe0..2b58ec4 100644--- a/web/vite.config.ts+++ b/web/vite.config.ts@@ -9,6 +9,7 @@ export default defineConfig({output: {manualChunks: {codemirror: ['codemirror', '@codemirror/lang-html', '@codemirror/lang-json', '@codemirror/theme-one-dark', '@codemirror/view', '@codemirror/state'],+ grapesjs: ['grapesjs', 'grapesjs-preset-newsletter'],},},},