diff --git a/mail-service/src/index.js b/mail-service/src/index.js index ca78913..eafe57a 100644 --- a/mail-service/src/index.js +++ b/mail-service/src/index.js @@ -7,13 +7,12 @@ import { processScheduledCampaigns } from './service/queueFillerJob.js'; import { dynamicConsumer } from './service/dynamicConsumer.js'; import { topicManager } from './service/topicManager.js'; import { topicRegistry } from './service/topicRegistry.js'; -import authMiddleware from './middleware/auth.js'; const app = express(); app.use(express.json()); // Middleware -app.use('/api/mail', authMiddleware); +app.use('/api/mail'); // Routes app.use('/api/mail', routes); diff --git a/mail-service/src/routes/index.js b/mail-service/src/routes/index.js index e82580c..9c26a4e 100644 --- a/mail-service/src/routes/index.js +++ b/mail-service/src/routes/index.js @@ -9,18 +9,19 @@ import deliveryLogRoutes from './deliveryLog.js'; import smtpServerRoutes from './smtpServer.js'; import topicRoutes from './topic.js'; import trackingRoutes from './tracking.js'; +import authMiddleware from '../middleware/auth.js'; const router = Router(); -router.use('/subscribers', subscriberRoutes); -router.use('/mailing-groups', mailingGroupRoutes); -router.use('/group-subscribers', groupSubscriberRoutes); -router.use('/email-templates', emailTemplateRoutes); -router.use('/email-template-versions', emailTemplateVersionRoutes); -router.use('/campaigns', campaignRoutes); -router.use('/delivery-logs', deliveryLogRoutes); -router.use('/smtp-servers', smtpServerRoutes); -router.use('/topics', topicRoutes); +router.use('/subscribers', authMiddleware, subscriberRoutes); +router.use('/mailing-groups', authMiddleware, mailingGroupRoutes); +router.use('/group-subscribers', authMiddleware, groupSubscriberRoutes); +router.use('/email-templates', authMiddleware, emailTemplateRoutes); +router.use('/email-template-versions', authMiddleware, emailTemplateVersionRoutes); +router.use('/campaigns', authMiddleware, campaignRoutes); +router.use('/delivery-logs', authMiddleware, deliveryLogRoutes); +router.use('/smtp-servers', authMiddleware, smtpServerRoutes); +router.use('/topics', authMiddleware, topicRoutes); router.use('/track', trackingRoutes); export default router; \ No newline at end of file diff --git a/mail-service/src/service/dynamicConsumer.js b/mail-service/src/service/dynamicConsumer.js index 9f8b746..c63e869 100644 --- a/mail-service/src/service/dynamicConsumer.js +++ b/mail-service/src/service/dynamicConsumer.js @@ -263,13 +263,13 @@ async function processEmailTask(task, topic) { const domain = smtp.from_email.split('@')[1]; // Добавляем трекинг-пиксель для отслеживания открытия письма - const trackingPixel = ``; + const trackingPixel = ``; // Обрабатываем ссылки для отслеживания кликов const htmlWithClickTracking = task.html.replace( / { - const trackingUrl = `http://${domain}/api/mail/track/click/${deliveryLog.id}?url=${encodeURIComponent(url)}`; + const trackingUrl = `https://${domain}/api/mail/track/click/${deliveryLog.id}?url=${encodeURIComponent(url)}`; return `