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:
- The 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.
This commit is contained in:
Till JS 2026-04-08 16:25:55 +02:00
parent 4eb5dfe4a0
commit bfa8a0a773
254 changed files with 88 additions and 29437 deletions

View file

@ -1,7 +1,6 @@
import type {
SendEmailOptions,
SendPushOptions,
SendMatrixOptions,
SendWebhookOptions,
ScheduleOptions,
NotificationResponse,
@ -82,24 +81,6 @@ export class NotifyClient {
});
}
/**
* Send a Matrix message
*/
async sendMatrix(options: SendMatrixOptions): Promise<NotificationResponse> {
return this.send({
channel: 'matrix',
appId: this.appId,
recipient: options.roomId,
body: options.body,
matrixOptions: {
formattedBody: options.formattedBody,
msgtype: options.msgtype,
},
priority: options.priority,
externalId: options.externalId,
});
}
/**
* Send a webhook notification
*/
@ -184,7 +165,6 @@ export class NotifyClient {
notifications: Array<
| ({ type: 'email' } & SendEmailOptions)
| ({ type: 'push' } & SendPushOptions)
| ({ type: 'matrix' } & SendMatrixOptions)
| ({ type: 'webhook' } & SendWebhookOptions)
>
): Promise<BatchNotificationResponse> {
@ -214,15 +194,6 @@ export class NotifyClient {
priority: n.priority,
externalId: n.externalId,
};
} else if (n.type === 'matrix') {
return {
channel: 'matrix' as const,
appId: this.appId,
recipient: n.roomId,
body: n.body,
priority: n.priority,
externalId: n.externalId,
};
} else {
return {
channel: 'webhook' as const,

View file

@ -1,4 +1,4 @@
export type NotificationChannel = 'email' | 'push' | 'matrix' | 'webhook';
export type NotificationChannel = 'email' | 'push' | 'webhook';
export type NotificationPriority = 'low' | 'normal' | 'high' | 'critical';
export type NotificationStatus = 'pending' | 'processing' | 'delivered' | 'failed' | 'cancelled';
@ -28,15 +28,6 @@ export interface SendPushOptions {
externalId?: string;
}
export interface SendMatrixOptions {
roomId: string;
body: string;
formattedBody?: string;
msgtype?: 'text' | 'notice';
priority?: NotificationPriority;
externalId?: string;
}
export interface SendWebhookOptions {
url: string;
method?: 'POST' | 'PUT';