strapi-plugin-magic-mail 2.0.2 → 2.0.4

package/server/src/services/email-router.js

@@ -30,12 +30,18 @@ module.exports = ({ strapi }) => ({
       templateId = null,      // Template Reference ID
       templateData,           // Data for template rendering
       data,                   // Alias for templateData (for native Strapi compatibility)
+      skipLinkTracking = false, // Skip link rewriting for sensitive URLs (e.g., Magic Links)
     } = emailData;
 
     // Support both 'data' and 'templateData' for backward compatibility
     if (!templateData && data) {
       templateData = data;
     }
+    
+    // Debug log for skipLinkTracking
+    if (skipLinkTracking) {
+      strapi.log.info(`[magic-mail] [SKIP-TRACK] skipLinkTracking=true received for email to: ${to}`);
+    }
 
     // NEW: If templateId/templateReferenceId provided, render template
     let renderedTemplate = null;
@@ -53,14 +59,14 @@ module.exports = ({ strapi }) => ({
           const numericTemplateId = Number(templateId);
 
           if (!Number.isNaN(numericTemplateId) && Number.isInteger(numericTemplateId)) {
-            strapi.log.info(`[magic-mail] 🔍 Looking up template by ID: ${numericTemplateId}`);
+            strapi.log.info(`[magic-mail] [CHECK] Looking up template by ID: ${numericTemplateId}`);
             templateRecord = await strapi
               .plugin('magic-mail')
               .service('email-designer')
               .findOne(numericTemplateId);
 
             if (!templateRecord) {
-              strapi.log.error(`[magic-mail] ❌ Template with ID ${numericTemplateId} not found in database`);
+              strapi.log.error(`[magic-mail] [ERROR] Template with ID ${numericTemplateId} not found in database`);
               throw new Error(`Template with ID ${numericTemplateId} not found`);
             }
 
@@ -70,7 +76,7 @@ module.exports = ({ strapi }) => ({
 
             resolvedTemplateReferenceId = String(templateRecord.templateReferenceId).trim();
             strapi.log.info(
-              `[magic-mail] ✅ Found template: ID=${templateRecord.id}, referenceId="${resolvedTemplateReferenceId}", name="${templateRecord.name}"`
+              `[magic-mail] [SUCCESS] Found template: ID=${templateRecord.id}, referenceId="${resolvedTemplateReferenceId}", name="${templateRecord.name}"`
             );
           } else {
             // templateId was provided but not numeric; treat it directly as reference ID
@@ -96,7 +102,7 @@ module.exports = ({ strapi }) => ({
         type = type || renderedTemplate.category; // Use template category if not specified
 
         strapi.log.info(
-          `[magic-mail] 📧 Rendered template reference "${resolvedTemplateReferenceId}" (requested ID: ${templateId ?? 'n/a'}): ${renderedTemplate.templateName}`
+          `[magic-mail] [EMAIL] Rendered template reference "${resolvedTemplateReferenceId}" (requested ID: ${templateId ?? 'n/a'}): ${renderedTemplate.templateName}`
         );
 
         // Ensure templateId/templateName are populated for logging/analytics
@@ -105,7 +111,7 @@ module.exports = ({ strapi }) => ({
           emailData.templateName = templateRecord?.name || renderedTemplate.templateName;
         }
       } catch (error) {
-        strapi.log.error(`[magic-mail] ❌ Template rendering failed: ${error.message}`);
+        strapi.log.error(`[magic-mail] [ERROR] Template rendering failed: ${error.message}`);
         throw new Error(`Template rendering failed: ${error.message}`);
       }
     }
@@ -139,15 +145,20 @@ module.exports = ({ strapi }) => ({
 
         recipientHash = analyticsService.generateRecipientHash(emailLog.emailId, to);
 
-        // Inject tracking pixel
+        // Inject tracking pixel (open tracking)
         html = analyticsService.injectTrackingPixel(html, emailLog.emailId, recipientHash);
 
-        // Rewrite links for click tracking (now async)
-        html = await analyticsService.rewriteLinksForTracking(html, emailLog.emailId, recipientHash);
-
-        strapi.log.info(`[magic-mail] 📊 Tracking enabled for email: ${emailLog.emailId}`);
+        // Rewrite links for click tracking (unless explicitly disabled)
+        // skipLinkTracking is useful for sensitive URLs like Magic Links, password resets, etc.
+        // where the original URL must remain intact for security/UX reasons
+        if (!skipLinkTracking) {
+          html = await analyticsService.rewriteLinksForTracking(html, emailLog.emailId, recipientHash);
+          strapi.log.info(`[magic-mail] [STATS] Full tracking enabled for email: ${emailLog.emailId}`);
+        } else {
+          strapi.log.info(`[magic-mail] [STATS] Open tracking enabled, link tracking DISABLED for email: ${emailLog.emailId}`);
+        }
       } catch (error) {
-        strapi.log.error(`[magic-mail] ⚠️  Tracking setup failed (continuing without tracking):`, error.message);
+        strapi.log.error(`[magic-mail] [WARNING]  Tracking setup failed (continuing without tracking):`, error.message);
         // Continue sending email even if tracking fails
       }
     }
@@ -165,7 +176,7 @@ module.exports = ({ strapi }) => ({
       if (priority === 'high') {
         const hasFeature = await licenseGuard.hasFeature('priority-headers');
         if (!hasFeature) {
-          strapi.log.warn('[magic-mail] ⚠️  High priority emails require Advanced license - using normal priority');
+          strapi.log.warn('[magic-mail] [WARNING]  High priority emails require Advanced license - using normal priority');
           emailData.priority = 'normal';
         }
       }
@@ -203,8 +214,8 @@ module.exports = ({ strapi }) => ({
       // Update email log with account info (if tracking enabled)
       if (emailLog) {
         try {
-          await strapi.db.query('plugin::magic-mail.email-log').update({
-            where: { id: emailLog.id },
+          await strapi.documents('plugin::magic-mail.email-log').update({
+            documentId: emailLog.documentId,
             data: {
               accountId: account.id,
               accountName: account.name,
@@ -217,9 +228,9 @@ module.exports = ({ strapi }) => ({
       }
 
       // Update stats
-      await this.updateAccountStats(account.id);
+      await this.updateAccountStats(account.documentId);
 
-      strapi.log.info(`[magic-mail] ✅ Email sent to ${to} via ${account.name}`);
+      strapi.log.info(`[magic-mail] [SUCCESS] Email sent to ${to} via ${account.name}`);
 
       return {
         success: true,
@@ -227,7 +238,7 @@ module.exports = ({ strapi }) => ({
         messageId: result.messageId,
       };
     } catch (error) {
-      strapi.log.error('[magic-mail] ❌ Email send failed:', error);
+      strapi.log.error('[magic-mail] [ERROR] Email send failed:', error);
 
       throw error;
     }
@@ -237,25 +248,25 @@ module.exports = ({ strapi }) => ({
    * Select best account based on rules
    */
   async selectAccount(type, priority, excludeIds = [], emailData = {}) {
-    // Get all active accounts
-    const accounts = await strapi.entityService.findMany('plugin::magic-mail.email-account', {
+    // Get all active accounts using Document Service
+    const accounts = await strapi.documents('plugin::magic-mail.email-account').findMany({
       filters: {
         isActive: true,
         id: { $notIn: excludeIds },
       },
-      sort: { priority: 'desc' },
+      sort: [{ priority: 'desc' }],
     });
 
     if (!accounts || accounts.length === 0) {
       return null;
     }
 
-    // Get all active routing rules
-    const allRules = await strapi.entityService.findMany('plugin::magic-mail.routing-rule', {
+    // Get all active routing rules using Document Service
+    const allRules = await strapi.documents('plugin::magic-mail.routing-rule').findMany({
       filters: {
         isActive: true,
       },
-      sort: { priority: 'desc' },
+      sort: [{ priority: 'desc' }],
     });
 
     // Check routing rules with different match types
@@ -292,14 +303,14 @@ module.exports = ({ strapi }) => ({
       if (matches) {
         const account = accounts.find(a => a.name === rule.accountName);
         if (account) {
-          strapi.log.info(`[magic-mail] 🎯 Routing rule matched: ${rule.name} → ${account.name}`);
+          strapi.log.info(`[magic-mail] [ROUTE] Routing rule matched: ${rule.name} -> ${account.name}`);
           return account;
         }
         // If primary account not found, try fallback
         if (rule.fallbackAccountName) {
           const fallbackAccount = accounts.find(a => a.name === rule.fallbackAccountName);
           if (fallbackAccount) {
-            strapi.log.info(`[magic-mail] 🔄 Using fallback account: ${fallbackAccount.name}`);
+            strapi.log.info(`[magic-mail] [FALLBACK] Using fallback account: ${fallbackAccount.name}`);
             return fallbackAccount;
           }
         }
@@ -426,7 +437,7 @@ module.exports = ({ strapi }) => ({
         mailOptions.headers['List-Unsubscribe-Post'] = 'List-Unsubscribe=One-Click';
         mailOptions.headers['Precedence'] = 'bulk'; // Mark as bulk mail
       } else {
-        strapi.log.warn('[magic-mail] ⚠️ Marketing email without unsubscribe URL - may violate GDPR/CAN-SPAM');
+        strapi.log.warn('[magic-mail] [WARNING] Marketing email without unsubscribe URL - may violate GDPR/CAN-SPAM');
       }
     }
 
@@ -490,7 +501,7 @@ module.exports = ({ strapi }) => ({
         );
         
         currentAccessToken = newTokens.accessToken;
-        strapi.log.info('[magic-mail] ✅ Token refreshed successfully');
+        strapi.log.info('[magic-mail] [SUCCESS] Token refreshed successfully');
         
         // Update stored tokens
         const { encryptCredentials } = require('../utils/encryption');
@@ -500,7 +511,8 @@ module.exports = ({ strapi }) => ({
           expiresAt: newTokens.expiresAt,
         });
         
-        await strapi.entityService.update('plugin::magic-mail.email-account', account.id, {
+        await strapi.documents('plugin::magic-mail.email-account').update({
+          documentId: account.documentId,
           data: { oauth: updatedOAuth },
         });
       } catch (refreshErr) {
@@ -661,14 +673,20 @@ module.exports = ({ strapi }) => ({
       }
       
       const result = await response.json();
-      strapi.log.info('[magic-mail] ✅ Email sent via Gmail API');
+      strapi.log.info('[magic-mail] [SUCCESS] Email sent via Gmail API');
       
       return {
         messageId: result.id,
         response: 'OK',
       };
     } catch (err) {
-      strapi.log.error('[magic-mail] Gmail API send failed:', err);
+      strapi.log.error('[magic-mail] Gmail API send failed:', err.message || err);
+      strapi.log.error('[magic-mail] Error details:', {
+        name: err.name,
+        code: err.code,
+        cause: err.cause?.message || err.cause,
+        stack: err.stack?.split('\n').slice(0, 3).join('\n'),
+      });
       throw err;
     }
   },
@@ -726,7 +744,7 @@ module.exports = ({ strapi }) => ({
         );
         
         currentAccessToken = newTokens.accessToken;
-        strapi.log.info('[magic-mail] ✅ Microsoft token refreshed successfully');
+        strapi.log.info('[magic-mail] [SUCCESS] Microsoft token refreshed successfully');
         
         // Update stored tokens
         const { encryptCredentials } = require('../utils/encryption');
@@ -736,7 +754,8 @@ module.exports = ({ strapi }) => ({
           expiresAt: newTokens.expiresAt,
         });
         
-        await strapi.entityService.update('plugin::magic-mail.email-account', account.id, {
+        await strapi.documents('plugin::magic-mail.email-account').update({
+          documentId: account.documentId,
           data: { oauth: updatedOAuth },
         });
       } catch (refreshErr) {
@@ -886,7 +905,7 @@ module.exports = ({ strapi }) => ({
         throw new Error(`Microsoft Graph API error: ${response.status} - ${response.statusText}`);
       }
       
-      strapi.log.info('[magic-mail] ✅ Email sent via Microsoft Graph API with MIME + custom headers');
+      strapi.log.info('[magic-mail] [SUCCESS] Email sent via Microsoft Graph API with MIME + custom headers');
       strapi.log.info('[magic-mail] Microsoft adds From/DKIM automatically for DMARC compliance');
       
       return {
@@ -942,7 +961,7 @@ module.exports = ({ strapi }) => ({
         );
         
         currentAccessToken = newTokens.accessToken;
-        strapi.log.info('[magic-mail] ✅ Token refreshed successfully');
+        strapi.log.info('[magic-mail] [SUCCESS] Token refreshed successfully');
         
         // Update stored tokens
         const { encryptCredentials } = require('../utils/encryption');
@@ -952,7 +971,8 @@ module.exports = ({ strapi }) => ({
           expiresAt: newTokens.expiresAt,
         });
         
-        await strapi.entityService.update('plugin::magic-mail.email-account', account.id, {
+        await strapi.documents('plugin::magic-mail.email-account').update({
+          documentId: account.documentId,
           data: { oauth: updatedOAuth },
         });
       } catch (refreshErr) {
@@ -1010,7 +1030,7 @@ module.exports = ({ strapi }) => ({
       }
 
       const result = await transporter.sendMail(mailOptions);
-      strapi.log.info('[magic-mail] ✅ Email sent via Yahoo OAuth');
+      strapi.log.info('[magic-mail] [SUCCESS] Email sent via Yahoo OAuth');
       
       return {
         messageId: result.messageId,
@@ -1136,7 +1156,7 @@ module.exports = ({ strapi }) => ({
         throw new Error(`SendGrid API error: ${response.statusText}`);
       }
 
-      strapi.log.info('[magic-mail] ✅ Email sent via SendGrid API');
+      strapi.log.info('[magic-mail] [SUCCESS] Email sent via SendGrid API');
 
       // SendGrid returns 202 Accepted with no body on success
       return {
@@ -1253,7 +1273,7 @@ module.exports = ({ strapi }) => ({
       }
 
       const result = await response.json();
-      strapi.log.info('[magic-mail] ✅ Email sent via Mailgun API');
+      strapi.log.info('[magic-mail] [SUCCESS] Email sent via Mailgun API');
 
       return {
         messageId: result.id || `mailgun-${Date.now()}`,
@@ -1280,11 +1300,17 @@ module.exports = ({ strapi }) => ({
 
   /**
    * Update account statistics
+   * Note: This function now expects documentId
    */
-  async updateAccountStats(accountId) {
-    const account = await strapi.entityService.findOne('plugin::magic-mail.email-account', accountId);
+  async updateAccountStats(documentId) {
+    const account = await strapi.documents('plugin::magic-mail.email-account').findOne({
+      documentId,
+    });
+
+    if (!account) return;
 
-    await strapi.entityService.update('plugin::magic-mail.email-account', accountId, {
+    await strapi.documents('plugin::magic-mail.email-account').update({
+      documentId,
       data: {
         emailsSentToday: (account.emailsSentToday || 0) + 1,
         emailsSentThisHour: (account.emailsSentThisHour || 0) + 1,
@@ -1310,7 +1336,7 @@ module.exports = ({ strapi }) => ({
    * Get account by name
    */
   async getAccountByName(name) {
-    const accounts = await strapi.entityService.findMany('plugin::magic-mail.email-account', {
+    const accounts = await strapi.documents('plugin::magic-mail.email-account').findMany({
       filters: { name, isActive: true },
       limit: 1,
     });
@@ -1379,7 +1405,7 @@ module.exports = ({ strapi }) => ({
       strapi.log.warn('[magic-mail] Email has HTML but no text alternative - may reduce deliverability');
     }
 
-    strapi.log.info('[magic-mail] ✅ Email security validation passed');
+    strapi.log.info('[magic-mail] [SUCCESS] Email security validation passed');
   },
 
   /**

package/server/src/services/license-guard.js

@@ -101,14 +101,14 @@ module.exports = ({ strapi }) => ({
       const data = await response.json();
 
       if (data.success) {
-        strapi.log.info('[magic-mail] ✅ License created:', data.data.licenseKey);
+        strapi.log.info('[magic-mail] [SUCCESS] License created:', data.data.licenseKey);
         return data.data;
       } else {
-        strapi.log.error('[magic-mail] ❌ License creation failed:', data);
+        strapi.log.error('[magic-mail] [ERROR] License creation failed:', data);
         return null;
       }
     } catch (error) {
-      strapi.log.error('[magic-mail] ❌ Error creating license:', error);
+      strapi.log.error('[magic-mail] [ERROR] Error creating license:', error);
       return null;
     }
   },
@@ -140,10 +140,10 @@ module.exports = ({ strapi }) => ({
       }
     } catch (error) {
       if (allowGracePeriod) {
-        strapi.log.warn('[magic-mail] ⚠️ License verification timeout - grace period active');
+        strapi.log.warn('[magic-mail] [WARNING] License verification timeout - grace period active');
         return { valid: true, data: null, gracePeriod: true };
       }
-      strapi.log.error('[magic-mail] ❌ License verification error:', error.message);
+      strapi.log.error('[magic-mail] [ERROR] License verification error:', error.message);
       return { valid: false, data: null };
     }
   },
@@ -206,7 +206,7 @@ module.exports = ({ strapi }) => ({
       name: 'magic-mail' 
     });
     await pluginStore.set({ key: 'licenseKey', value: licenseKey });
-    strapi.log.info(`[magic-mail] ✅ License key stored: ${licenseKey.substring(0, 8)}...`);
+    strapi.log.info(`[magic-mail] [SUCCESS] License key stored: ${licenseKey.substring(0, 8)}...`);
   },
 
   startPinging(licenseKey, intervalMinutes = 15) {
@@ -242,7 +242,7 @@ module.exports = ({ strapi }) => ({
       const license = await this.getLicenseByKey(licenseKey);
       return license;
     } catch (error) {
-      strapi.log.error(`[magic-mail] ❌ Error loading license:`, error);
+      strapi.log.error(`[magic-mail] [ERROR] Error loading license:`, error);
       return null;
     }
   },
@@ -298,7 +298,7 @@ module.exports = ({ strapi }) => ({
    */
   async initialize() {
     try {
-      strapi.log.info('🔐 Initializing License Guard...');
+      strapi.log.info('[INIT] Initializing License Guard...');
 
       // Check if license key exists in plugin store
       const pluginStore = strapi.store({ 
@@ -322,23 +322,23 @@ module.exports = ({ strapi }) => ({
       strapi.log.info('──────────────────────────────────────────────────────────');
       strapi.log.info(`📦 Plugin Store Check:`);
       if (licenseKey) {
-        strapi.log.info(`   ✅ License Key found: ${licenseKey}`);
-        strapi.log.info(`   🔑 Key (short): ${licenseKey.substring(0, 10)}...`);
+        strapi.log.info(`   [SUCCESS] License Key found: ${licenseKey}`);
+        strapi.log.info(`   [LICENSE] Key (short): ${licenseKey.substring(0, 10)}...`);
         if (lastValidated) {
           const lastValidatedDate = new Date(lastValidated);
           const hoursAgo = Math.floor((now.getTime() - lastValidatedDate.getTime()) / (1000 * 60 * 60));
-          strapi.log.info(`   🕐 Last validated: ${hoursAgo}h ago (Grace: ${withinGracePeriod ? 'ACTIVE' : 'EXPIRED'})`);
+          strapi.log.info(`   [TIME] Last validated: ${hoursAgo}h ago (Grace: ${withinGracePeriod ? 'ACTIVE' : 'EXPIRED'})`);
         } else {
-          strapi.log.info(`   🕐 Last validated: Never (Grace: ACTIVE for first ${gracePeriodHours}h)`);
+          strapi.log.info(`   [TIME] Last validated: Never (Grace: ACTIVE for first ${gracePeriodHours}h)`);
         }
       } else {
-        strapi.log.info(`   ❌ No license key stored`);
+        strapi.log.info(`   [ERROR] No license key stored`);
       }
       strapi.log.info('──────────────────────────────────────────────────────────');
       
       if (!licenseKey) {
-        strapi.log.info('📄 No license found - Running in demo mode');
-        strapi.log.info('💡 Create a license in the admin panel to activate full features');
+        strapi.log.info('[DEMO] No license found - Running in demo mode');
+        strapi.log.info('[INFO] Create a license in the admin panel to activate full features');
         return {
           valid: false,
           demo: true,
@@ -346,7 +346,7 @@ module.exports = ({ strapi }) => ({
         };
       }
 
-      strapi.log.info('📄 Verifying stored license key...');
+      strapi.log.info('[VERIFY] Verifying stored license key...');
       
       // Verify license (allow grace period if we have a last validation)
       const verification = await this.verifyLicense(licenseKey, withinGracePeriod);
@@ -355,7 +355,7 @@ module.exports = ({ strapi }) => ({
         // Get license details for display
         const license = await this.getLicenseByKey(licenseKey);
         
-        strapi.log.info(`✅ License verified online: ACTIVE (Key: ${licenseKey.substring(0, 10)}...)`);
+        strapi.log.info(`[SUCCESS] License verified online: ACTIVE (Key: ${licenseKey.substring(0, 10)}...)`);
         
         // Update last validated timestamp
         await pluginStore.set({ 
@@ -363,11 +363,11 @@ module.exports = ({ strapi }) => ({
           value: now.toISOString() 
         });
 
-        strapi.log.info('✅ License is valid and active');
+        strapi.log.info('[SUCCESS] License is valid and active');
         
         // Start automatic pinging
         const pingInterval = this.startPinging(licenseKey, 15);
-        strapi.log.info('📡 Started pinging license every 15 minutes');
+        strapi.log.info('[PING] Started pinging license every 15 minutes');
         
         // Store interval globally so we can clean it up
         strapi.licenseGuardMagicMail = {
@@ -378,13 +378,13 @@ module.exports = ({ strapi }) => ({
 
         // Display license info box
         strapi.log.info('╔════════════════════════════════════════════════════════════════╗');
-        strapi.log.info('║  ✅ MAGIC MAIL PLUGIN LICENSE ACTIVE                           ║');
+        strapi.log.info('║  [SUCCESS] MAGIC MAIL PLUGIN LICENSE ACTIVE                           ║');
         strapi.log.info('║                                                                ║');
         strapi.log.info(`║  License: ${licenseKey.padEnd(38, ' ')}║`);
         strapi.log.info(`║  User: ${(license?.firstName + ' ' + license?.lastName).padEnd(41, ' ')}║`);
         strapi.log.info(`║  Email: ${(license?.email || 'N/A').padEnd(40, ' ')}║`);
         strapi.log.info('║                                                                ║');
-        strapi.log.info('║  🔄 Auto-pinging every 15 minutes                              ║');
+        strapi.log.info('║  [AUTO] Pinging every 15 minutes                               ║');
         strapi.log.info('╚════════════════════════════════════════════════════════════════╝');
 
         return {
@@ -394,9 +394,9 @@ module.exports = ({ strapi }) => ({
           gracePeriod: verification.gracePeriod || false,
         };
       } else {
-        strapi.log.error(`❌ License validation failed (Key: ${licenseKey.substring(0, 10)}...)`);
+        strapi.log.error(`[ERROR] License validation failed (Key: ${licenseKey.substring(0, 10)}...)`);
         strapi.log.info('──────────────────────────────────────────────────────────');
-        strapi.log.info('⚠️  Running in demo mode with limited features');
+        strapi.log.info('[WARNING]  Running in demo mode with limited features');
         return {
           valid: false,
           demo: true,
@@ -405,7 +405,7 @@ module.exports = ({ strapi }) => ({
         };
       }
     } catch (error) {
-      strapi.log.error('❌ Error initializing License Guard:', error);
+      strapi.log.error('[ERROR] Error initializing License Guard:', error);
       return {
         valid: false,
         demo: true,

package/server/src/services/oauth.js

@@ -70,7 +70,7 @@ module.exports = ({ strapi }) => ({
     }
 
     const tokens = await response.json();
-    strapi.log.info('[magic-mail] ✅ Tokens received from Google');
+    strapi.log.info('[magic-mail] [SUCCESS] Tokens received from Google');
 
     if (!tokens.access_token) {
       throw new Error('No access token received from Google');
@@ -89,7 +89,7 @@ module.exports = ({ strapi }) => ({
     }
 
     const userInfo = await userInfoResponse.json();
-    strapi.log.info(`[magic-mail] ✅ Got user email from Google: ${userInfo.email}`);
+    strapi.log.info(`[magic-mail] [SUCCESS] Got user email from Google: ${userInfo.email}`);
 
     if (!userInfo.email) {
       strapi.log.error('[magic-mail] userInfo:', userInfo);
@@ -220,7 +220,7 @@ module.exports = ({ strapi }) => ({
     }
 
     const tokens = await response.json();
-    strapi.log.info('[magic-mail] ✅ Tokens received from Microsoft');
+    strapi.log.info('[magic-mail] [SUCCESS] Tokens received from Microsoft');
     strapi.log.info('[magic-mail] Has access_token:', !!tokens.access_token);
     strapi.log.info('[magic-mail] Has refresh_token:', !!tokens.refresh_token);
     strapi.log.info('[magic-mail] Has id_token:', !!tokens.id_token);
@@ -237,7 +237,7 @@ module.exports = ({ strapi }) => ({
         const payloadBase64 = tokens.id_token.split('.')[1];
         const payload = JSON.parse(Buffer.from(payloadBase64, 'base64').toString());
         email = payload.email || payload.preferred_username || payload.upn;
-        strapi.log.info(`[magic-mail] ✅ Got email from Microsoft ID token: ${email}`);
+        strapi.log.info(`[magic-mail] [SUCCESS] Got email from Microsoft ID token: ${email}`);
       } catch (jwtErr) {
         strapi.log.warn('[magic-mail] Could not decode ID token:', jwtErr.message);
       }
@@ -264,7 +264,7 @@ module.exports = ({ strapi }) => ({
       strapi.log.info('[magic-mail] User info from Graph:', JSON.stringify(userInfo, null, 2));
       
       email = userInfo.mail || userInfo.userPrincipalName;
-      strapi.log.info(`[magic-mail] ✅ Got email from Microsoft Graph: ${email}`);
+      strapi.log.info(`[magic-mail] [SUCCESS] Got email from Microsoft Graph: ${email}`);
     }
 
     if (!email) {
@@ -317,7 +317,7 @@ module.exports = ({ strapi }) => ({
     }
 
     const tokens = await response.json();
-    strapi.log.info('[magic-mail] ✅ Microsoft tokens refreshed successfully');
+    strapi.log.info('[magic-mail] [SUCCESS] Microsoft tokens refreshed successfully');
 
     return {
       accessToken: tokens.access_token,
@@ -388,7 +388,7 @@ module.exports = ({ strapi }) => ({
     }
 
     const tokens = await response.json();
-    strapi.log.info('[magic-mail] ✅ Tokens received from Yahoo');
+    strapi.log.info('[magic-mail] [SUCCESS] Tokens received from Yahoo');
 
     if (!tokens.access_token) {
       throw new Error('No access token received from Yahoo');
@@ -408,7 +408,7 @@ module.exports = ({ strapi }) => ({
 
     const userInfo = await userInfoResponse.json();
     const email = userInfo.email;
-    strapi.log.info(`[magic-mail] ✅ Got email from Yahoo: ${email}`);
+    strapi.log.info(`[magic-mail] [SUCCESS] Got email from Yahoo: ${email}`);
 
     if (!email) {
       throw new Error('Yahoo did not provide email address');
@@ -486,14 +486,14 @@ module.exports = ({ strapi }) => ({
       expiresAt: tokenData.expiresAt,
     });
 
-    const account = await strapi.entityService.create('plugin::magic-mail.email-account', {
+    const account = await strapi.documents('plugin::magic-mail.email-account').create({
       data: {
         name: accountDetails.name,
         description: accountDetails.description || '',
         provider: `${provider}-oauth`,
         config: encryptedConfig,      // OAuth app credentials
         oauth: encryptedOAuth,         // OAuth tokens
-        fromEmail: tokenData.email,    // ✅ Use email from Google, not from accountDetails
+        fromEmail: tokenData.email,    // [SUCCESS] Use email from Google, not from accountDetails
         fromName: accountDetails.fromName || tokenData.email.split('@')[0],
         replyTo: accountDetails.replyTo || tokenData.email,
         isActive: true,
@@ -507,7 +507,7 @@ module.exports = ({ strapi }) => ({
       },
     });
 
-    strapi.log.info(`[magic-mail] ✅ OAuth account created: ${accountDetails.name} (${tokenData.email})`);
+    strapi.log.info(`[magic-mail] [SUCCESS] OAuth account created: ${accountDetails.name} (${tokenData.email})`);
 
     return account;
   },

package/server/src/services/service.js

@@ -2,6 +2,6 @@
 
 module.exports = ({ strapi }) => ({
   getWelcomeMessage() {
-    return 'Welcome to Strapi 🚀';
+    return 'Welcome to Strapi [START]';
   },
 });

package/server/src/utils/encryption.js

@@ -15,7 +15,7 @@ function getEncryptionKey() {
     return crypto.createHash('sha256').update(envKey).digest();
   }
   
-  console.warn('[magic-mail] ⚠️  No MAGIC_MAIL_ENCRYPTION_KEY found. Using fallback.');
+  console.warn('[magic-mail] [WARNING]  No MAGIC_MAIL_ENCRYPTION_KEY found. Using fallback.');
   return crypto.createHash('sha256').update('magic-mail-default-key').digest();
 }