Hello!
', + }); + } +} +``` + ## Debugging ### Token not validating? diff --git a/services/mana-core-auth/package.json b/services/mana-core-auth/package.json index 1eb6fb0fc..c8e4843a0 100644 --- a/services/mana-core-auth/package.json +++ b/services/mana-core-auth/package.json @@ -21,6 +21,7 @@ "db:studio": "drizzle-kit studio" }, "dependencies": { + "@getbrevo/brevo": "^3.0.1", "@google/generative-ai": "^0.24.1", "@nestjs/common": "^10.4.15", "@nestjs/config": "^3.3.0", diff --git a/services/mana-core-auth/src/app.module.ts b/services/mana-core-auth/src/app.module.ts index 0cb0ce214..b6423ab33 100644 --- a/services/mana-core-auth/src/app.module.ts +++ b/services/mana-core-auth/src/app.module.ts @@ -5,6 +5,7 @@ import { APP_FILTER } from '@nestjs/core'; import configuration from './config/configuration'; import { AuthModule } from './auth/auth.module'; import { CreditsModule } from './credits/credits.module'; +import { EmailModule } from './email/email.module'; import { FeedbackModule } from './feedback/feedback.module'; import { ReferralsModule } from './referrals/referrals.module'; import { SettingsModule } from './settings/settings.module'; @@ -28,6 +29,7 @@ import { HttpExceptionFilter } from './common/filters/http-exception.filter'; AiModule, AuthModule, CreditsModule, + EmailModule, FeedbackModule, HealthModule, ReferralsModule, diff --git a/services/mana-core-auth/src/auth/better-auth.config.ts b/services/mana-core-auth/src/auth/better-auth.config.ts index 74efe8cd7..24daa9846 100644 --- a/services/mana-core-auth/src/auth/better-auth.config.ts +++ b/services/mana-core-auth/src/auth/better-auth.config.ts @@ -22,6 +22,7 @@ import { z } from 'zod'; import { getDb } from '../db/connection'; import { organizations, members, invitations } from '../db/schema/organizations.schema'; import { users, sessions, accounts, verificationTokens, jwks } from '../db/schema/auth.schema'; +import { sendPasswordResetEmail, sendOrganizationInviteEmail } from '../email/brevo-client'; /** * User role schema with Zod runtime validation @@ -121,21 +122,18 @@ export function createBetterAuth(databaseUrl: string) { * - auth.api.requestPasswordReset({ body: { email } }) - Sends reset email * - auth.api.resetPassword({ body: { newPassword, token } }) - Resets password * + * Uses Brevo API to send transactional emails. + * Set BREVO_API_KEY environment variable to enable email sending. + * Without the API key, emails are logged to console (dev mode). + * * @see https://www.better-auth.com/docs/authentication/email-password#password-reset */ - sendResetPassword: async ({ user, url, token }) => { - // TODO: Implement email sending service (e.g., Resend, SendGrid) - // For now, log the reset URL for development - console.log('[Password Reset] User:', user.email); - console.log('[Password Reset] Reset URL:', url); - console.log('[Password Reset] Token:', token); - - // In production, send an email like: - // await sendEmail({ - // to: user.email, - // subject: 'Reset your password', - // html: `Reset your password` - // }); + sendResetPassword: async ({ user, url }) => { + await sendPasswordResetEmail({ + email: user.email, + name: user.name || undefined, + resetUrl: url, + }); }, }, @@ -201,15 +199,24 @@ export function createBetterAuth(databaseUrl: string) { // Allow users to create their own organizations allowUserToCreateOrganization: true, - // Email invitation handler + /** + * Email invitation handler + * + * Uses Brevo API to send organization invitation emails. + * Set BREVO_API_KEY environment variable to enable email sending. + * Without the API key, emails are logged to console (dev mode). + */ async sendInvitationEmail(data) { - const { email, organization } = data; + const { email, organization, role, inviter } = data; + const baseUrl = process.env.BASE_URL || 'http://localhost:3001'; + const inviteUrl = `${baseUrl}/accept-invitation?id=${data.id}`; - // TODO: Implement email sending service - console.log('TODO: Send invitation email', { - to: email, - organization: organization.name, - invitationId: data.id, + await sendOrganizationInviteEmail({ + email, + organizationName: organization.name, + inviterName: inviter?.user?.name || undefined, + inviteUrl, + role: role || 'member', }); }, diff --git a/services/mana-core-auth/src/config/configuration.ts b/services/mana-core-auth/src/config/configuration.ts index 398221369..bf3871ce2 100644 --- a/services/mana-core-auth/src/config/configuration.ts +++ b/services/mana-core-auth/src/config/configuration.ts @@ -49,4 +49,10 @@ export default () => ({ ai: { geminiApiKey: process.env.GOOGLE_GENAI_API_KEY || '', }, + + email: { + brevoApiKey: process.env.BREVO_API_KEY || '', + senderAddress: process.env.EMAIL_SENDER_ADDRESS || 'noreply@manacore.app', + senderName: process.env.EMAIL_SENDER_NAME || 'ManaCore', + }, }); diff --git a/services/mana-core-auth/src/email/brevo-client.ts b/services/mana-core-auth/src/email/brevo-client.ts new file mode 100644 index 000000000..2ff53c871 --- /dev/null +++ b/services/mana-core-auth/src/email/brevo-client.ts @@ -0,0 +1,252 @@ +/** + * Standalone Brevo Email Client + * + * This is a standalone email client that can be used outside of NestJS DI, + * specifically for Better Auth email handlers which are initialized before + * the NestJS application context is available. + * + * For regular application code, use the EmailService instead. + */ + +import * as brevo from '@getbrevo/brevo'; + +interface BrevoConfig { + apiKey: string | undefined; + senderEmail: string; + senderName: string; +} + +interface SendEmailParams { + to: string; + subject: string; + htmlContent: string; + textContent?: string; +} + +/** + * Get Brevo configuration from environment variables + */ +function getConfig(): BrevoConfig { + return { + apiKey: process.env.BREVO_API_KEY, + senderEmail: process.env.EMAIL_SENDER_ADDRESS || 'noreply@manacore.app', + senderName: process.env.EMAIL_SENDER_NAME || 'ManaCore', + }; +} + +/** + * Send an email using Brevo API + * + * Falls back to console logging if BREVO_API_KEY is not set + */ +export async function sendEmail(params: SendEmailParams): Promise
+
|
+
+
|
+
+
|
+
+
|
+