mirror of
https://github.com/Memo-2023/mana-monorepo.git
synced 2026-05-14 20:21:09 +02:00
8e8b6ac65f
This commit bundles two unrelated changes that were swept together by an
accidental `git add -A` in another working session. Documented here so the
history reflects what's actually inside.
═══════════════════════════════════════════════════════════════════════
1. fix(mana-auth): /api/v1/auth/login mints JWT via auth.handler instead
of api.signInEmail
═══════════════════════════════════════════════════════════════════════
Previous attempt (commit 55cc75e7d) tried to fix the broken JWT mint in
/api/v1/auth/login by switching the cookie name from `mana.session_token`
to `__Secure-mana.session_token` for production. That was necessary but
not sufficient: Better Auth's session cookie value isn't just the raw
session token, it's `<token>.<HMAC>` where the HMAC is derived from the
better-auth secret. Reconstructing the cookie from auth.api.signInEmail's
JSON response only gave us the raw token, so /api/auth/token's
get-session middleware still couldn't validate it and the JWT mint kept
silently failing.
Real fix: do the sign-in via auth.handler (the HTTP path) rather than
auth.api.signInEmail (the SDK path). The handler returns a real fetch
Response with a Set-Cookie header containing the fully signed cookie
envelope. We capture that header verbatim and forward it as the cookie
on the /api/auth/token request, which now passes validation and mints
the JWT correctly.
Verified end-to-end on auth.mana.how:
$ curl -X POST https://auth.mana.how/api/v1/auth/login \
-d '{"email":"...","password":"..."}'
{
"user": {...},
"token": "<session token>",
"accessToken": "eyJhbGciOiJFZERTQSI...", ← real JWT now
"refreshToken": "<session token>"
}
Side benefits:
- Email-not-verified path is now handled by checking
signInResponse.status === 403 directly, no more catching APIError
with the comment-noted async-stream footgun.
- X-Forwarded-For is forwarded explicitly so Better Auth's rate limiter
and our security log see the real client IP.
- The leftover catch block now only handles unexpected exceptions
(network errors etc); the FORBIDDEN-checking logic in it is dead but
harmless and left in for defense in depth.
═══════════════════════════════════════════════════════════════════════
2. chore: remove the entire self-hosted Matrix stack (Synapse, Element,
Manalink, mana-matrix-bot)
═══════════════════════════════════════════════════════════════════════
The Matrix subsystem ran parallel to the main Mana product without any
load-bearing integration: the unified web app never imported matrix-js-sdk,
the chat module uses mana-sync (local-first), and mana-matrix-bot's
plugins duplicated features the unified app already ships natively.
Keeping it alive cost a Synapse + Element + matrix-web + bot container
quartet, three Cloudflare routes, an OIDC provider plugin in mana-auth,
and a steady drip of devlog/dependency churn.
Removed:
- apps/matrix (Manalink web + mobile, ~150 files)
- services/mana-matrix-bot (Go bot with ~20 plugins)
- docker/matrix configs (Synapse + Element)
- synapse/element-web/matrix-web/mana-matrix-bot services in
docker-compose.macmini.yml
- matrix.mana.how/element.mana.how/link.mana.how Cloudflare tunnel routes
- OIDC provider plugin + matrix-synapse trustedClient + matrixUserLinks
table from mana-auth (oauth_* schema definitions also removed)
- MatrixService import path in mana-media (importFromMatrix endpoint)
- Matrix notification channel in mana-notify (worker, metrics, config,
channel_type enum, MatrixOptions handler)
- Matrix entries from shared-branding (mana-apps + app-icons),
notify-client, the i18n bundle, the observatory map, the credits
app-label list, the landing footer/apps page, the prometheus + alerts
+ promtail tier mappings, and the matrix-related deploy paths in
cd-macmini.yml + ci.yml
Devlog/manascore/blueprint entries that mention Matrix are left intact
as historical record. The oauth_* + matrix_user_links Postgres tables
stay on existing prod databases — code can no longer write to them, drop
them in a follow-up migration if you want them gone for real.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
64 lines
2.1 KiB
Go
64 lines
2.1 KiB
Go
package metrics
|
|
|
|
import (
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"github.com/prometheus/client_golang/prometheus/promauto"
|
|
)
|
|
|
|
type Metrics struct {
|
|
NotificationsSent *prometheus.CounterVec
|
|
NotificationsFailed *prometheus.CounterVec
|
|
EmailsSent *prometheus.CounterVec
|
|
PushSent *prometheus.CounterVec
|
|
WebhooksSent *prometheus.CounterVec
|
|
NotificationLatency *prometheus.HistogramVec
|
|
EmailLatency prometheus.Histogram
|
|
PushLatency prometheus.Histogram
|
|
}
|
|
|
|
func New() *Metrics {
|
|
return &Metrics{
|
|
NotificationsSent: promauto.NewCounterVec(prometheus.CounterOpts{
|
|
Name: "mana_notify_notifications_sent_total",
|
|
Help: "Total notifications sent",
|
|
}, []string{"channel", "app_id"}),
|
|
|
|
NotificationsFailed: promauto.NewCounterVec(prometheus.CounterOpts{
|
|
Name: "mana_notify_notifications_failed_total",
|
|
Help: "Total notifications failed",
|
|
}, []string{"channel", "app_id", "error_type"}),
|
|
|
|
EmailsSent: promauto.NewCounterVec(prometheus.CounterOpts{
|
|
Name: "mana_notify_emails_sent_total",
|
|
Help: "Total emails sent",
|
|
}, []string{"template", "status"}),
|
|
|
|
PushSent: promauto.NewCounterVec(prometheus.CounterOpts{
|
|
Name: "mana_notify_push_sent_total",
|
|
Help: "Total push notifications sent",
|
|
}, []string{"platform", "status"}),
|
|
|
|
WebhooksSent: promauto.NewCounterVec(prometheus.CounterOpts{
|
|
Name: "mana_notify_webhooks_sent_total",
|
|
Help: "Total webhooks sent",
|
|
}, []string{"status"}),
|
|
|
|
NotificationLatency: promauto.NewHistogramVec(prometheus.HistogramOpts{
|
|
Name: "mana_notify_notification_latency_seconds",
|
|
Help: "Notification processing latency",
|
|
Buckets: []float64{0.01, 0.05, 0.1, 0.5, 1, 2, 5, 10},
|
|
}, []string{"channel"}),
|
|
|
|
EmailLatency: promauto.NewHistogram(prometheus.HistogramOpts{
|
|
Name: "mana_notify_email_latency_seconds",
|
|
Help: "Email sending latency",
|
|
Buckets: []float64{0.1, 0.5, 1, 2, 5, 10},
|
|
}),
|
|
|
|
PushLatency: promauto.NewHistogram(prometheus.HistogramOpts{
|
|
Name: "mana_notify_push_latency_seconds",
|
|
Help: "Push notification latency",
|
|
Buckets: []float64{0.01, 0.05, 0.1, 0.5, 1},
|
|
}),
|
|
}
|
|
}
|