From 7b06ea93c579a6c160e6f12332730f2f6536efc6 Mon Sep 17 00:00:00 2001 From: DeathKaioken Date: Sun, 18 Jan 2026 22:45:52 +0100 Subject: [PATCH] fix: api key brevo --- .../ReferralRegistrationController.js | 28 ++++++-- services/email/MailService.js | 68 ++++++++++++++++--- 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/controller/referral/ReferralRegistrationController.js b/controller/referral/ReferralRegistrationController.js index a2c3ba6..d3de7dd 100644 --- a/controller/referral/ReferralRegistrationController.js +++ b/controller/referral/ReferralRegistrationController.js @@ -40,7 +40,12 @@ class ReferralRegistrationController { static async registerPersonalReferral(req, res) { const { refToken, lang, ...registrationData } = req.body; - logger.info('ReferralRegistrationController:registerPersonalReferral:start', { refToken, lang, registrationData }); + logger.info('ReferralRegistrationController:registerPersonalReferral:start', { + refToken, + lang, + email: registrationData.email + }); + const unitOfWork = new UnitOfWork(); await unitOfWork.start(); try { @@ -52,14 +57,24 @@ class ReferralRegistrationController { res.json({ success: true, userId: user.id, email: user.email }); } catch (error) { await unitOfWork.rollback(error); - logger.error('ReferralRegistrationController:registerPersonalReferral:error', { refToken, error }); + logger.error('ReferralRegistrationController:registerPersonalReferral:error', { + refToken, + message: error?.message, + name: error?.name + }); res.status(400).json({ success: false, message: error.message }); } } static async registerCompanyReferral(req, res) { const { refToken, lang, ...registrationData } = req.body; - logger.info('ReferralRegistrationController:registerCompanyReferral:start', { refToken, lang, registrationData }); + logger.info('ReferralRegistrationController:registerCompanyReferral:start', { + refToken, + lang, + companyEmail: registrationData.companyEmail, + companyName: registrationData.companyName + }); + const { companyEmail, password, @@ -68,6 +83,7 @@ class ReferralRegistrationController { contactPersonName, contactPersonPhone } = registrationData; + const unitOfWork = new UnitOfWork(); await unitOfWork.start(); try { @@ -85,7 +101,11 @@ class ReferralRegistrationController { res.json({ success: true, userId: user.id, email: user.email }); } catch (error) { await unitOfWork.rollback(error); - logger.error('ReferralRegistrationController:registerCompanyReferral:error', { refToken, error }); + logger.error('ReferralRegistrationController:registerCompanyReferral:error', { + refToken, + message: error?.message, + name: error?.name + }); res.status(400).json({ success: false, message: error.message }); } } diff --git a/services/email/MailService.js b/services/email/MailService.js index 5dfeb65..4a9c681 100644 --- a/services/email/MailService.js +++ b/services/email/MailService.js @@ -6,18 +6,27 @@ const { logger } = require('../../middleware/logger'); class MailService { constructor() { this.brevo = new brevo.TransactionalEmailsApi(); + + const rawApiKey = process.env.BREVO_API_KEY; + const apiKey = (rawApiKey || '').trim(); // helps catch whitespace/newline issues + this.brevo.setApiKey( brevo.TransactionalEmailsApiApiKeys.apiKey, - process.env.BREVO_API_KEY + apiKey ); + logger.info('MailService:brevo_api_key_loaded', { + present: Boolean(apiKey), + length: apiKey.length, + last4: apiKey.length >= 4 ? apiKey.slice(-4) : null + }); + this.sender = { email: process.env.BREVO_SENDER_EMAIL, name: process.env.BREVO_SENDER_NAME, }; this.loginUrl = process.env.LOGIN_URL; - // Use the single correct templates directory this.templatesDir = path.join(__dirname, '..', '..', 'mailTemplates'); } @@ -49,6 +58,18 @@ class MailService { return template; } + _extractBrevoErrorDetails(error) { + const status = error?.response?.status; + const data = error?.response?.data; + let dataSafe; + try { + dataSafe = typeof data === 'string' ? data.slice(0, 2000) : JSON.parse(JSON.stringify(data)); + } catch (_) { + dataSafe = '[unserializable_response_data]'; + } + return { status, data: dataSafe }; + } + async sendRegistrationEmail({ email, firstName, lastName, userType, companyName, lang }) { logger.info('MailService.sendRegistrationEmail:start', { email, userType, lang }); let subject, text; @@ -90,13 +111,21 @@ class MailService { logger.info('MailService.sendRegistrationEmail:email_sent', { email, userType, lang: chosenLang }); return data; } catch (error) { - logger.error('MailService.sendRegistrationEmail:error', { email, error: error.message }); + const brevo = this._extractBrevoErrorDetails(error); + logger.error('MailService.sendRegistrationEmail:error', { + email, + userType, + lang: chosenLang, + message: error?.message, + brevoStatus: brevo.status, + brevoData: brevo.data + }); throw error; } } async sendVerificationCodeEmail({ email, code, expiresAt, lang }) { - logger.info('MailService.sendVerificationCodeEmail:start', { email, code, expiresAt, lang }); + logger.info('MailService.sendVerificationCodeEmail:start', { email, expiresAt, lang }); // don't log code const chosenLang = lang || 'en'; const subject = chosenLang === 'de' ? 'Ihr ProfitPlanet E-Mail-Verifizierungscode' @@ -114,10 +143,17 @@ class MailService { payload.textContent = text; const data = await this.brevo.sendTransacEmail(payload); - logger.info('MailService.sendVerificationCodeEmail:email_sent', { email, code, lang: chosenLang }); + logger.info('MailService.sendVerificationCodeEmail:email_sent', { email, lang: chosenLang }); // don't log code return data; } catch (error) { - logger.error('MailService.sendVerificationCodeEmail:error', { email, error: error.message }); + const brevo = this._extractBrevoErrorDetails(error); + logger.error('MailService.sendVerificationCodeEmail:error', { + email, + lang: chosenLang, + message: error?.message, + brevoStatus: brevo.status, + brevoData: brevo.data + }); throw error; } } @@ -146,7 +182,15 @@ class MailService { logger.info('MailService.sendLoginNotificationEmail:email_sent', { email, ip, lang: chosenLang }); return data; } catch (error) { - logger.error('MailService.sendLoginNotificationEmail:error', { email, error: error.message }); + const brevo = this._extractBrevoErrorDetails(error); + logger.error('MailService.sendLoginNotificationEmail:error', { + email, + ip, + lang: chosenLang, + message: error?.message, + brevoStatus: brevo.status, + brevoData: brevo.data + }); throw error; } } @@ -175,7 +219,15 @@ class MailService { logger.info('MailService.sendPasswordResetEmail:email_sent', { email, token, lang: chosenLang }); return data; } catch (error) { - logger.error('MailService.sendPasswordResetEmail:error', { email, error: error.message }); + const brevo = this._extractBrevoErrorDetails(error); + logger.error('MailService.sendPasswordResetEmail:error', { + email, + token, + lang: chosenLang, + message: error?.message, + brevoStatus: brevo.status, + brevoData: brevo.data + }); throw error; } }