strapi-plugin-magic-mail 2.0.1 → 2.0.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.0.3",
   "keywords": [
     "strapi",
     "strapi-plugin",

package/server/src/bootstrap.js

@@ -7,7 +7,7 @@
  */
 
 module.exports = async ({ strapi }) => {
-  strapi.log.info('🚀 [magic-mail] Bootstrap starting...');
+  strapi.log.info('[BOOTSTRAP] [magic-mail] Starting...');
 
   try {
     // Initialize License Guard
@@ -19,7 +19,7 @@ module.exports = async ({ strapi }) => {
       
       if (!licenseStatus.valid && licenseStatus.demo) {
         strapi.log.error('╔════════════════════════════════════════════════════════════════╗');
-        strapi.log.error('║  ❌ MAGICMAIL - NO VALID LICENSE                              ║');
+        strapi.log.error('║  [ERROR] MAGICMAIL - NO VALID LICENSE                         ║');
         strapi.log.error('║                                                                ║');
         strapi.log.error('║  This plugin requires a valid license to operate.             ║');
         strapi.log.error('║  Please activate your license via Admin UI:                   ║');
@@ -28,7 +28,7 @@ module.exports = async ({ strapi }) => {
         strapi.log.error('║  Click "Generate Free License" to get started!                ║');
         strapi.log.error('╚════════════════════════════════════════════════════════════════╝');
       } else if (licenseStatus.gracePeriod) {
-        strapi.log.warn('⚠️  Running on grace period (license server unreachable)');
+        strapi.log.warn('[WARNING] Running on grace period (license server unreachable)');
       }
       // No additional log here, as initialize() already outputs the license box
     }, 2000);
@@ -49,7 +49,7 @@ module.exports = async ({ strapi }) => {
       
       // Override the send method
       originalEmailService.send = async (emailData) => {
-        strapi.log.info('[magic-mail] 📧 Email intercepted from native Strapi service');
+        strapi.log.info('[magic-mail] [EMAIL] Intercepted from native Strapi service');
         strapi.log.debug('[magic-mail] Email data:', {
           to: emailData.to,
           subject: emailData.subject,
@@ -67,10 +67,10 @@ module.exports = async ({ strapi }) => {
           // Route through MagicMail
           const result = await emailRouter.send(emailData);
           
-          strapi.log.info('[magic-mail] ✅ Email routed successfully through MagicMail');
+          strapi.log.info('[magic-mail] [SUCCESS] Email routed successfully through MagicMail');
           return result;
         } catch (magicMailError) {
-          strapi.log.warn('[magic-mail] ⚠️  MagicMail routing failed, falling back to original service');
+          strapi.log.warn('[magic-mail] [WARNING] MagicMail routing failed, falling back to original service');
           strapi.log.error('[magic-mail] Error:', magicMailError.message);
           
           // Fallback to original Strapi email service
@@ -78,11 +78,11 @@ module.exports = async ({ strapi }) => {
         }
       };
       
-      strapi.log.info('[magic-mail] ✅ Native email service overridden!');
-      strapi.log.info('[magic-mail] 💡 All strapi.plugins.email.services.email.send() calls will route through MagicMail');
+      strapi.log.info('[magic-mail] [SUCCESS] Native email service overridden!');
+      strapi.log.info('[magic-mail] [INFO] All strapi.plugins.email.services.email.send() calls will route through MagicMail');
     } else {
-      strapi.log.warn('[magic-mail] ⚠️  Native email service not found - MagicMail will work standalone');
-      strapi.log.warn('[magic-mail] 💡 Make sure @strapi/plugin-email is installed');
+      strapi.log.warn('[magic-mail] [WARNING] Native email service not found - MagicMail will work standalone');
+      strapi.log.warn('[magic-mail] [INFO] Make sure @strapi/plugin-email is installed');
     }
 
     // ============================================================
@@ -98,7 +98,7 @@ module.exports = async ({ strapi }) => {
         }
         const accountMgr = strapi.plugin('magic-mail').service('account-manager');
         await accountMgr.resetCounters('hourly');
-        strapi.log.info('[magic-mail] ✅ Hourly counters reset');
+        strapi.log.info('[magic-mail] [RESET] Hourly counters reset');
       } catch (err) {
         console.error('[magic-mail] Hourly reset error:', err.message);
       }
@@ -121,7 +121,7 @@ module.exports = async ({ strapi }) => {
         }
         const accountMgr = strapi.plugin('magic-mail').service('account-manager');
         await accountMgr.resetCounters('daily');
-        strapi.log.info('[magic-mail] ✅ Daily counters reset');
+        strapi.log.info('[magic-mail] [RESET] Daily counters reset');
 
         // Then set daily interval
         const dailyResetInterval = setInterval(async () => {
@@ -132,7 +132,7 @@ module.exports = async ({ strapi }) => {
             }
             const accountMgr = strapi.plugin('magic-mail').service('account-manager');
             await accountMgr.resetCounters('daily');
-            strapi.log.info('[magic-mail] ✅ Daily counters reset');
+            strapi.log.info('[magic-mail] [RESET] Daily counters reset');
           } catch (err) {
             console.error('[magic-mail] Daily reset error:', err.message);
           }
@@ -145,9 +145,9 @@ module.exports = async ({ strapi }) => {
       }
     }, msUntilMidnight);
 
-    strapi.log.info('[magic-mail] ✅ Counter reset schedules initialized');
-    strapi.log.info('[magic-mail] ✅ Bootstrap complete');
+    strapi.log.info('[magic-mail] [SUCCESS] Counter reset schedules initialized');
+    strapi.log.info('[magic-mail] [SUCCESS] Bootstrap complete');
   } catch (err) {
-    strapi.log.error('[magic-mail] ❌ Bootstrap error:', err);
+    strapi.log.error('[magic-mail] [ERROR] Bootstrap error:', err);
   }
 };

package/server/src/config/features.js

@@ -118,7 +118,7 @@ module.exports = {
    * Check if a feature is available for given license tier
    */
   hasFeature(licenseData, featureName) {
-   /** console.log(`[features.js] 🔍 hasFeature called with:`, { 
+   /** console.log(`[features.js] [CHECK] hasFeature called with:`, { 
       featureName, 
       hasLicenseData: !!licenseData,
       licenseDataKeys: licenseData ? Object.keys(licenseData) : [],
@@ -131,7 +131,7 @@ module.exports = {
     });
  */
     if (!licenseData) {
-      console.log(`[features.js] ⚠️  No license data → using FREE tier`);
+      console.log(`[features.js] [WARNING]  No license data → using FREE tier`);
       // Demo mode - only free features
       return this.free.features.includes(featureName);
     }
@@ -167,7 +167,7 @@ module.exports = {
       isPremium = true;
     }
 
-/*    console.log(`[features.js] 🔍 Tier detection:`, {
+/*    console.log(`[features.js] [CHECK] Tier detection:`, {
       isEnterprise,
       isAdvanced,
       isPremium,
@@ -182,20 +182,20 @@ module.exports = {
  */
     // Check tiers in order: enterprise > advanced > premium > free
     if (isEnterprise && this.enterprise.features.includes(featureName)) {
-      console.log(`[features.js] ✅ ENTERPRISE tier has feature "${featureName}"`);
+      console.log(`[features.js] [SUCCESS] ENTERPRISE tier has feature "${featureName}"`);
       return true;
     }
     if (isAdvanced && this.advanced.features.includes(featureName)) {
-      console.log(`[features.js] ✅ ADVANCED tier has feature "${featureName}"`);
+      console.log(`[features.js] [SUCCESS] ADVANCED tier has feature "${featureName}"`);
       return true;
     }
     if (isPremium && this.premium.features.includes(featureName)) {
-      console.log(`[features.js] ✅ PREMIUM tier has feature "${featureName}"`);
+      console.log(`[features.js] [SUCCESS] PREMIUM tier has feature "${featureName}"`);
       return true;
     }
     
     const inFree = this.free.features.includes(featureName);
-    console.log(`[features.js] ${inFree ? '✅' : '❌'} FREE tier check for "${featureName}": ${inFree}`);
+    console.log(`[features.js] ${inFree ? '[SUCCESS]' : '[ERROR]'} FREE tier check for "${featureName}": ${inFree}`);
     return inFree;
   },
 

package/server/src/controllers/accounts.js

@@ -39,8 +39,8 @@ module.exports = {
         return;
       }
 
-      // Check account limit
-      const currentAccounts = await strapi.entityService.count('plugin::magic-mail.email-account');
+      // Check account limit using Document Service count()
+      const currentAccounts = await strapi.documents('plugin::magic-mail.email-account').count();
       const maxAccounts = await licenseGuard.getMaxAccounts();
       
       if (maxAccounts !== -1 && currentAccounts >= maxAccounts) {
@@ -135,9 +135,9 @@ module.exports = {
       }
 
       strapi.log.info('[magic-mail] 🧪 Testing Strapi Email Service integration...');
-      strapi.log.info('[magic-mail] 📧 Calling strapi.plugin("email").service("email").send()');
+      strapi.log.info('[magic-mail] [EMAIL] Calling strapi.plugin("email").service("email").send()');
       if (accountName) {
-        strapi.log.info(`[magic-mail] 🎯 Forcing specific account: ${accountName}`);
+        strapi.log.info(`[magic-mail] [FORCE] Forcing specific account: ${accountName}`);
       }
 
       // Call native Strapi email service - should be intercepted by MagicMail!
@@ -166,6 +166,15 @@ module.exports = {
                 <li>Statistics tracking</li>
               </ul>
             </div>
+            <div style="background: #DCFCE7; border: 1px solid #22C55E; border-radius: 8px; padding: 15px; margin: 20px 0;">
+              <h3 style="margin-top: 0; color: #15803D;">Security Features Active</h3>
+              <ul style="margin: 10px 0; padding-left: 20px;">
+                <li>TLS/SSL Encryption enforced</li>
+                <li>Email content validated</li>
+                <li>Proper headers included</li>
+                <li>Message-ID generated</li>
+              </ul>
+            </div>
             <p style="color: #6B7280; font-size: 14px; margin-top: 30px;">
               Sent at: ${new Date().toLocaleString()}<br>
               Via: MagicMail Email Router
@@ -176,7 +185,7 @@ module.exports = {
         accountName: accountName || null, // Force specific account if provided
       });
 
-      strapi.log.info('[magic-mail] ✅ Strapi Email Service test completed');
+      strapi.log.info('[magic-mail] [SUCCESS] Strapi Email Service test completed');
 
       ctx.body = {
         success: true,
@@ -189,7 +198,7 @@ module.exports = {
         },
       };
     } catch (err) {
-      strapi.log.error('[magic-mail] ❌ Strapi Email Service test failed:', err);
+      strapi.log.error('[magic-mail] [ERROR] Strapi Email Service test failed:', err);
       ctx.body = {
         success: false,
         message: 'Failed to send test email',

package/server/src/controllers/analytics.js

@@ -1,10 +1,15 @@
 /**
  * Analytics Controller
  * Handles tracking endpoints and analytics API
+ * [SUCCESS] Migrated to strapi.documents() API (Strapi v5 Best Practice)
  */
 
 'use strict';
 
+const EMAIL_LOG_UID = 'plugin::magic-mail.email-log';
+const EMAIL_EVENT_UID = 'plugin::magic-mail.email-event';
+const EMAIL_ACCOUNT_UID = 'plugin::magic-mail.email-account';
+
 module.exports = ({ strapi }) => ({
   /**
    * Tracking pixel endpoint
@@ -61,7 +66,8 @@ module.exports = ({ strapi }) => ({
   async getStats(ctx) {
     try {
       const filters = {
-        userId: ctx.query.userId ? parseInt(ctx.query.userId) : null,
+        // userId is documentId (string) in Strapi v5, NOT parseInt!
+        userId: ctx.query.userId || null,
         templateId: ctx.query.templateId ? parseInt(ctx.query.templateId) : null,
         accountId: ctx.query.accountId ? parseInt(ctx.query.accountId) : null,
         dateFrom: ctx.query.dateFrom || null,
@@ -89,7 +95,8 @@ module.exports = ({ strapi }) => ({
   async getEmailLogs(ctx) {
     try {
       const filters = {
-        userId: ctx.query.userId ? parseInt(ctx.query.userId) : null,
+        // userId is documentId (string) in Strapi v5, NOT parseInt!
+        userId: ctx.query.userId || null,
         templateId: ctx.query.templateId ? parseInt(ctx.query.templateId) : null,
         search: ctx.query.search || null,
       };
@@ -145,15 +152,17 @@ module.exports = ({ strapi }) => ({
   /**
    * Get user email activity
    * GET /magic-mail/analytics/users/:userId
+   * Note: userId is documentId (string) in Strapi v5
    */
   async getUserActivity(ctx) {
     try {
       const { userId } = ctx.params;
 
+      // userId is documentId (string) in Strapi v5, NOT parseInt!
       const activity = await strapi
         .plugin('magic-mail')
         .service('analytics')
-        .getUserActivity(parseInt(userId));
+        .getUserActivity(userId);
 
       return ctx.send({
         success: true,
@@ -170,18 +179,18 @@ module.exports = ({ strapi }) => ({
    */
   async debug(ctx) {
     try {
-      strapi.log.info('[magic-mail] 🔍 Running Analytics Debug...');
+      strapi.log.info('[magic-mail] [CHECK] Running Analytics Debug...');
 
-      // Get email logs
-      const emailLogs = await strapi.db.query('plugin::magic-mail.email-log').findMany({
+      // Get email logs using Document Service
+      const emailLogs = await strapi.documents(EMAIL_LOG_UID).findMany({
         limit: 10,
-        orderBy: { sentAt: 'DESC' },
+        sort: [{ sentAt: 'desc' }],
       });
 
-      // Get email events
-      const emailEvents = await strapi.db.query('plugin::magic-mail.email-event').findMany({
+      // Get email events using Document Service
+      const emailEvents = await strapi.documents(EMAIL_EVENT_UID).findMany({
         limit: 20,
-        orderBy: { timestamp: 'DESC' },
+        sort: [{ timestamp: 'desc' }],
         populate: ['emailLog'],
       });
 
@@ -189,8 +198,8 @@ module.exports = ({ strapi }) => ({
       const analyticsService = strapi.plugin('magic-mail').service('analytics');
       const stats = await analyticsService.getStats();
 
-      // Get active accounts
-      const accounts = await strapi.entityService.findMany('plugin::magic-mail.email-account', {
+      // Get active accounts using Document Service
+      const accounts = await strapi.documents(EMAIL_ACCOUNT_UID).findMany({
         filters: { isActive: true },
         fields: ['id', 'name', 'provider', 'fromEmail', 'emailsSentToday', 'totalEmailsSent'],
       });
@@ -260,26 +269,28 @@ module.exports = ({ strapi }) => ({
     try {
       const { emailId } = ctx.params;
 
-      // Find email log
-      const emailLog = await strapi.db.query('plugin::magic-mail.email-log').findOne({
-        where: { emailId },
+      // Find email log using Document Service
+      const emailLog = await strapi.documents(EMAIL_LOG_UID).findFirst({
+        filters: { emailId },
       });
 
       if (!emailLog) {
         return ctx.notFound('Email log not found');
       }
 
-      // Delete associated events first
-      await strapi.db.query('plugin::magic-mail.email-event').deleteMany({
-        where: { emailLog: emailLog.id },
+      // Delete associated events - filter relation with documentId object (Strapi v5)
+      const events = await strapi.documents(EMAIL_EVENT_UID).findMany({
+        filters: { emailLog: { documentId: emailLog.documentId } },
       });
 
+      for (const event of events) {
+        await strapi.documents(EMAIL_EVENT_UID).delete({ documentId: event.documentId });
+      }
+
       // Delete email log
-      await strapi.db.query('plugin::magic-mail.email-log').delete({
-        where: { id: emailLog.id },
-      });
+      await strapi.documents(EMAIL_LOG_UID).delete({ documentId: emailLog.documentId });
 
-      strapi.log.info(`[magic-mail] 🗑️  Deleted email log: ${emailId}`);
+      strapi.log.info(`[magic-mail] [DELETE]  Deleted email log: ${emailId}`);
 
       return ctx.send({
         success: true,
@@ -300,20 +311,19 @@ module.exports = ({ strapi }) => ({
       // Optional: Add query params for filtered deletion
       const { olderThan } = ctx.query; // e.g., ?olderThan=2024-01-01
 
-      const where = {};
+      const filters = {};
       if (olderThan) {
-        where.sentAt = { $lt: new Date(olderThan) };
+        filters.sentAt = { $lt: new Date(olderThan) };
       }
 
-      // Get all email logs to delete
-      const emailLogs = await strapi.db.query('plugin::magic-mail.email-log').findMany({
-        where,
-        select: ['id'],
+      // Get all email logs to delete using Document Service
+      const emailLogs = await strapi.documents(EMAIL_LOG_UID).findMany({
+        filters,
+        fields: ['id', 'documentId'],
+        limit: 100000,
       });
 
-      const emailLogIds = emailLogs.map(log => log.id);
-
-      if (emailLogIds.length === 0) {
+      if (emailLogs.length === 0) {
         return ctx.send({
           success: true,
           message: 'No email logs to delete',
@@ -321,22 +331,27 @@ module.exports = ({ strapi }) => ({
         });
       }
 
-      // Delete all associated events
-      await strapi.db.query('plugin::magic-mail.email-event').deleteMany({
-        where: { emailLog: { $in: emailLogIds } },
+      // Delete all associated events and logs
+      for (const log of emailLogs) {
+        // Delete events for this log - filter relation with documentId object (Strapi v5)
+        const events = await strapi.documents(EMAIL_EVENT_UID).findMany({
+          filters: { emailLog: { documentId: log.documentId } },
       });
 
-      // Delete all email logs
-      await strapi.db.query('plugin::magic-mail.email-log').deleteMany({
-        where: { id: { $in: emailLogIds } },
-      });
+        for (const event of events) {
+          await strapi.documents(EMAIL_EVENT_UID).delete({ documentId: event.documentId });
+        }
+
+        // Delete the log itself
+        await strapi.documents(EMAIL_LOG_UID).delete({ documentId: log.documentId });
+      }
 
-      strapi.log.info(`[magic-mail] 🗑️  Cleared ${emailLogIds.length} email logs`);
+      strapi.log.info(`[magic-mail] [DELETE]  Cleared ${emailLogs.length} email logs`);
 
       return ctx.send({
         success: true,
-        message: `Successfully deleted ${emailLogIds.length} email log(s)`,
-        deletedCount: emailLogIds.length,
+        message: `Successfully deleted ${emailLogs.length} email log(s)`,
+        deletedCount: emailLogs.length,
       });
     } catch (error) {
       strapi.log.error('[magic-mail] Error clearing email logs:', error);
@@ -344,4 +359,3 @@ module.exports = ({ strapi }) => ({
     }
   },
 });
-

package/server/src/controllers/license.js

@@ -132,7 +132,7 @@ module.exports = ({ strapi }) => ({
       const verification = await licenseGuard.verifyLicense(trimmedKey);
 
       if (!verification.valid) {
-        strapi.log.warn(`[magic-mail] ⚠️  Invalid license key attempted: ${trimmedKey.substring(0, 8)}...`);
+        strapi.log.warn(`[magic-mail] [WARNING]  Invalid license key attempted: ${trimmedKey.substring(0, 8)}...`);
         return ctx.badRequest('Invalid or expired license key');
       }
 
@@ -145,7 +145,7 @@ module.exports = ({ strapi }) => ({
 
       // Verify email matches
       if (license.email.toLowerCase() !== trimmedEmail) {
-        strapi.log.warn(`[magic-mail] ⚠️  Email mismatch for license key`);
+        strapi.log.warn(`[magic-mail] [WARNING]  Email mismatch for license key`);
         return ctx.badRequest('Email address does not match this license key');
       }
 
@@ -162,7 +162,7 @@ module.exports = ({ strapi }) => ({
         data: verification.data,
       };
 
-      strapi.log.info(`[magic-mail] ✅ License validated and stored`);
+      strapi.log.info(`[magic-mail] [SUCCESS] License validated and stored`);
 
       return ctx.send({
         success: true,
@@ -214,10 +214,12 @@ module.exports = ({ strapi }) => ({
       const maxRules = await licenseGuard.getMaxRoutingRules();
       const maxTemplates = await licenseGuard.getMaxEmailTemplates();
       
-      // Get current counts
-      const currentAccounts = await strapi.entityService.count('plugin::magic-mail.email-account');
-      const currentRules = await strapi.entityService.count('plugin::magic-mail.routing-rule');
-      const currentTemplates = await strapi.entityService.count('plugin::magic-mail.email-template');
+      // Get current counts using Document Service count()
+      const [currentAccounts, currentRules, currentTemplates] = await Promise.all([
+        strapi.documents('plugin::magic-mail.email-account').count(),
+        strapi.documents('plugin::magic-mail.routing-rule').count(),
+        strapi.documents('plugin::magic-mail.email-template').count(),
+      ]);
 
       // Get tier info - check both formats
       let tier = 'free';

package/server/src/controllers/oauth.js

@@ -56,7 +56,7 @@ module.exports = {
             </style>
           </head>
           <body>
-            <div class="error">❌ OAuth Authorization Failed</div>
+            <div class="error">[ERROR] OAuth Authorization Failed</div>
             <p>Error: ${error}</p>
             <p>You can close this window and try again.</p>
             <script>
@@ -93,7 +93,7 @@ module.exports = {
           </style>
         </head>
         <body>
-          <div class="success">✅</div>
+          <div class="success">[SUCCESS]</div>
           <div class="message">Gmail OAuth Authorized!</div>
           <div class="note">Closing window...</div>
           <script>
@@ -177,7 +177,7 @@ module.exports = {
             </style>
           </head>
           <body>
-            <div class="error">❌ OAuth Authorization Failed</div>
+            <div class="error">[ERROR] OAuth Authorization Failed</div>
             <p>Error: ${error}</p>
             <p>You can close this window and try again.</p>
             <script>
@@ -214,7 +214,7 @@ module.exports = {
           </style>
         </head>
         <body>
-          <div class="success">✅</div>
+          <div class="success">[SUCCESS]</div>
           <div class="message">Microsoft OAuth Authorized!</div>
           <div class="note">Closing window...</div>
           <script>
@@ -293,7 +293,7 @@ module.exports = {
             </style>
           </head>
           <body>
-            <div class="error">❌ OAuth Authorization Failed</div>
+            <div class="error">[ERROR] OAuth Authorization Failed</div>
             <p>Error: ${error}</p>
             <p>You can close this window and try again.</p>
             <script>
@@ -330,7 +330,7 @@ module.exports = {
           </style>
         </head>
         <body>
-          <div class="success">✅</div>
+          <div class="success">[SUCCESS]</div>
           <div class="message">Yahoo Mail OAuth Authorized!</div>
           <div class="note">Closing window...</div>
           <script>
@@ -388,8 +388,8 @@ module.exports = {
         return;
       }
 
-      // Check account limit
-      const currentAccounts = await strapi.entityService.count('plugin::magic-mail.email-account');
+      // Check account limit using Document Service count()
+      const currentAccounts = await strapi.documents('plugin::magic-mail.email-account').count();
       const maxAccounts = await licenseGuard.getMaxAccounts();
       
       if (maxAccounts !== -1 && currentAccounts >= maxAccounts) {
@@ -457,7 +457,7 @@ module.exports = {
         accountDetails.config // contains clientId and clientSecret
       );
 
-      strapi.log.info('[magic-mail] ✅ OAuth account created successfully');
+      strapi.log.info('[magic-mail] [SUCCESS] OAuth account created successfully');
 
       ctx.body = {
         success: true,

package/server/src/controllers/routing-rules.js

@@ -3,16 +3,19 @@
 /**
  * Routing Rules Controller
  * Manages email routing rules CRUD operations
+ * [SUCCESS] Migrated to strapi.documents() API (Strapi v5 Best Practice)
  */
 
+const ROUTING_RULE_UID = 'plugin::magic-mail.routing-rule';
+
 module.exports = {
   /**
    * Get all routing rules
    */
   async getAll(ctx) {
     try {
-      const rules = await strapi.entityService.findMany('plugin::magic-mail.routing-rule', {
-        sort: { priority: 'desc' },
+      const rules = await strapi.documents(ROUTING_RULE_UID).findMany({
+        sort: [{ priority: 'desc' }],
       });
 
       ctx.body = {
@@ -31,7 +34,9 @@ module.exports = {
   async getOne(ctx) {
     try {
       const { ruleId } = ctx.params;
-      const rule = await strapi.entityService.findOne('plugin::magic-mail.routing-rule', ruleId);
+      const rule = await strapi.documents(ROUTING_RULE_UID).findOne({
+        documentId: ruleId,
+      });
 
       if (!rule) {
         ctx.throw(404, 'Routing rule not found');
@@ -53,8 +58,8 @@ module.exports = {
     try {
       const licenseGuard = strapi.plugin('magic-mail').service('license-guard');
 
-      // Check routing rule limit
-      const currentRules = await strapi.entityService.count('plugin::magic-mail.routing-rule');
+      // Check routing rule limit using Document Service count()
+      const currentRules = await strapi.documents(ROUTING_RULE_UID).count();
       const maxRules = await licenseGuard.getMaxRoutingRules();
       
       if (maxRules !== -1 && currentRules >= maxRules) {
@@ -62,7 +67,7 @@ module.exports = {
         return;
       }
 
-      const rule = await strapi.entityService.create('plugin::magic-mail.routing-rule', {
+      const rule = await strapi.documents(ROUTING_RULE_UID).create({
         data: ctx.request.body,
       });
 
@@ -71,7 +76,7 @@ module.exports = {
         message: 'Routing rule created successfully',
       };
 
-      strapi.log.info(`[magic-mail] ✅ Routing rule created: ${rule.name}`);
+      strapi.log.info(`[magic-mail] [SUCCESS] Routing rule created: ${rule.name}`);
     } catch (err) {
       strapi.log.error('[magic-mail] Error creating routing rule:', err);
       ctx.throw(err.status || 500, err.message || 'Error creating routing rule');
@@ -84,7 +89,8 @@ module.exports = {
   async update(ctx) {
     try {
       const { ruleId } = ctx.params;
-      const rule = await strapi.entityService.update('plugin::magic-mail.routing-rule', ruleId, {
+      const rule = await strapi.documents(ROUTING_RULE_UID).update({
+        documentId: ruleId,
         data: ctx.request.body,
       });
 
@@ -93,7 +99,7 @@ module.exports = {
         message: 'Routing rule updated successfully',
       };
 
-      strapi.log.info(`[magic-mail] ✅ Routing rule updated: ${rule.name}`);
+      strapi.log.info(`[magic-mail] [SUCCESS] Routing rule updated: ${rule.name}`);
     } catch (err) {
       strapi.log.error('[magic-mail] Error updating routing rule:', err);
       ctx.throw(500, err.message || 'Error updating routing rule');
@@ -106,7 +112,9 @@ module.exports = {
   async delete(ctx) {
     try {
       const { ruleId } = ctx.params;
-      await strapi.entityService.delete('plugin::magic-mail.routing-rule', ruleId);
+      await strapi.documents(ROUTING_RULE_UID).delete({
+        documentId: ruleId,
+      });
 
       ctx.body = {
         message: 'Routing rule deleted successfully',
@@ -119,4 +127,3 @@ module.exports = {
     }
   },
 };
-