strapi-plugin-magic-sessionmanager 3.7.0 → 4.0.1

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

@@ -5,6 +5,7 @@
 
 const crypto = require('crypto');
 const os = require('os');
+const pluginPkg = require('../../../package.json');
 
 // FIXED LICENSE SERVER URL
 const LICENSE_SERVER_URL = 'https://magicapi.fitlex.me';
@@ -68,7 +69,9 @@ module.exports = ({ strapi }) => ({
   },
 
   getUserAgent() {
-    return `Strapi/${strapi.config.get('info.strapi') || '5.0.0'} Node/${process.version} ${os.platform()}/${os.release()}`;
+    const pluginVersion = pluginPkg.version || '1.0.0';
+    const strapiVersion = strapi.config.get('info.strapi') || '5.0.0';
+    return `MagicSessionManager/${pluginVersion} Strapi/${strapiVersion} Node/${process.version} ${os.platform()}/${os.release()}`;
   },
 
   async createLicense({ email, firstName, lastName }) {
@@ -98,14 +101,14 @@ module.exports = ({ strapi }) => ({
       const data = await response.json();
 
       if (data.success) {
-        strapi.log.info('[magic-sessionmanager] ✅ License created:', data.data.licenseKey);
+        strapi.log.info('[magic-sessionmanager] [SUCCESS] License created:', data.data.licenseKey);
         return data.data;
       } else {
-        strapi.log.error('[magic-sessionmanager] ❌ License creation failed:', data);
+        strapi.log.error('[magic-sessionmanager] [ERROR] License creation failed:', data);
         return null;
       }
     } catch (error) {
-      strapi.log.error('[magic-sessionmanager] ❌ Error creating license:', error);
+      strapi.log.error('[magic-sessionmanager] [ERROR] Error creating license:', error);
       return null;
     }
   },
@@ -204,11 +207,11 @@ module.exports = ({ strapi }) => ({
       name: 'magic-sessionmanager' 
     });
     await pluginStore.set({ key: 'licenseKey', value: licenseKey });
-    strapi.log.info(`[magic-sessionmanager] ✅ License key stored: ${licenseKey.substring(0, 8)}...`);
+    strapi.log.info(`[magic-sessionmanager] [SUCCESS] License key stored: ${licenseKey.substring(0, 8)}...`);
   },
 
   startPinging(licenseKey, intervalMinutes = 15) {
-    strapi.log.info(`[magic-sessionmanager] ⏰ Starting license pings every ${intervalMinutes} minutes`);
+    strapi.log.info(`[magic-sessionmanager] [TIME] Starting license pings every ${intervalMinutes} minutes`);
     
     // Immediate ping
     this.pingLicense(licenseKey);
@@ -230,7 +233,7 @@ module.exports = ({ strapi }) => ({
    */
   async initialize() {
     try {
-      strapi.log.info('[magic-sessionmanager] 🔐 Initializing License Guard...');
+      strapi.log.info('[magic-sessionmanager] [SECURE] Initializing License Guard...');
 
       // Check if license key exists in plugin store
       const pluginStore = strapi.store({ 
@@ -240,7 +243,7 @@ module.exports = ({ strapi }) => ({
       const licenseKey = await pluginStore.get({ key: 'licenseKey' });
 
       if (!licenseKey) {
-        strapi.log.info('[magic-sessionmanager] ℹ️ No license found - Running in demo mode');
+        strapi.log.info('[magic-sessionmanager] [INFO] No license found - Running in demo mode');
         return {
           valid: false,
           demo: true,
@@ -287,7 +290,7 @@ module.exports = ({ strapi }) => ({
           gracePeriod: verification.gracePeriod || false,
         };
       } else {
-        strapi.log.error('[magic-sessionmanager] ❌ License validation failed');
+        strapi.log.error('[magic-sessionmanager] [ERROR] License validation failed');
         return {
           valid: false,
           demo: true,
@@ -296,7 +299,7 @@ module.exports = ({ strapi }) => ({
         };
       }
     } catch (error) {
-      strapi.log.error('[magic-sessionmanager] ❌ Error initializing License Guard:', error);
+      strapi.log.error('[magic-sessionmanager] [ERROR] Error initializing License Guard:', error);
       return {
         valid: false,
         demo: true,

package/server/src/services/notifications.js

@@ -37,12 +37,12 @@ module.exports = ({ strapi }) => ({
     strapi.log.debug('[magic-sessionmanager/notifications] Using default fallback templates');
     return {
       suspiciousLogin: {
-        subject: '🚨 Suspicious Login Alert - Session Manager',
+        subject: '[ALERT] Suspicious Login Alert - Session Manager',
         html: `
 <html>
 <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333;">
   <div style="max-width: 600px; margin: 0 auto; padding: 20px; background-color: #f9fafb; border-radius: 10px;">
-    <h2 style="color: #dc2626;">🚨 Suspicious Login Detected</h2>
+    <h2 style="color: #dc2626;">[ALERT] Suspicious Login Detected</h2>
     <p>A potentially suspicious login was detected for your account.</p>
     
     <div style="background: white; padding: 15px; border-radius: 8px; margin: 20px 0;">
@@ -77,17 +77,17 @@ module.exports = ({ strapi }) => ({
   </div>
 </body>
 </html>`,
-        text: `🚨 Suspicious Login Detected\n\nA potentially suspicious login was detected for your account.\n\nAccount: {{user.email}}\nUsername: {{user.username}}\n\nLogin Details:\n- Time: {{session.loginTime}}\n- IP: {{session.ipAddress}}\n- Location: {{geo.city}}, {{geo.country}}\n\nSecurity: VPN={{reason.isVpn}}, Proxy={{reason.isProxy}}, Threat={{reason.isThreat}}, Score={{reason.securityScore}}/100`,
+        text: `[ALERT] Suspicious Login Detected\n\nA potentially suspicious login was detected for your account.\n\nAccount: {{user.email}}\nUsername: {{user.username}}\n\nLogin Details:\n- Time: {{session.loginTime}}\n- IP: {{session.ipAddress}}\n- Location: {{geo.city}}, {{geo.country}}\n\nSecurity: VPN={{reason.isVpn}}, Proxy={{reason.isProxy}}, Threat={{reason.isThreat}}, Score={{reason.securityScore}}/100`,
       },
       newLocation: {
-        subject: '📍 New Location Login Detected',
-        html: `<h2>📍 New Location Login</h2><p>Account: {{user.email}}</p><p>Time: {{session.loginTime}}</p><p>Location: {{geo.city}}, {{geo.country}}</p><p>IP: {{session.ipAddress}}</p>`,
-        text: `📍 New Location Login\n\nAccount: {{user.email}}\nTime: {{session.loginTime}}\nLocation: {{geo.city}}, {{geo.country}}\nIP: {{session.ipAddress}}`,
+        subject: '[LOCATION] New Location Login Detected',
+        html: `<h2>[LOCATION] New Location Login</h2><p>Account: {{user.email}}</p><p>Time: {{session.loginTime}}</p><p>Location: {{geo.city}}, {{geo.country}}</p><p>IP: {{session.ipAddress}}</p>`,
+        text: `[LOCATION] New Location Login\n\nAccount: {{user.email}}\nTime: {{session.loginTime}}\nLocation: {{geo.city}}, {{geo.country}}\nIP: {{session.ipAddress}}`,
       },
       vpnProxy: {
-        subject: '⚠️ VPN/Proxy Login Detected',
-        html: `<h2>⚠️ VPN/Proxy Detected</h2><p>Account: {{user.email}}</p><p>Time: {{session.loginTime}}</p><p>IP: {{session.ipAddress}}</p><p>VPN: {{reason.isVpn}}, Proxy: {{reason.isProxy}}</p>`,
-        text: `⚠️ VPN/Proxy Detected\n\nAccount: {{user.email}}\nTime: {{session.loginTime}}\nIP: {{session.ipAddress}}\nVPN: {{reason.isVpn}}, Proxy: {{reason.isProxy}}`,
+        subject: '[WARNING] VPN/Proxy Login Detected',
+        html: `<h2>[WARNING] VPN/Proxy Detected</h2><p>Account: {{user.email}}</p><p>Time: {{session.loginTime}}</p><p>IP: {{session.ipAddress}}</p><p>VPN: {{reason.isVpn}}, Proxy: {{reason.isProxy}}</p>`,
+        text: `[WARNING] VPN/Proxy Detected\n\nAccount: {{user.email}}\nTime: {{session.loginTime}}\nIP: {{session.ipAddress}}\nVPN: {{reason.isVpn}}, Proxy: {{reason.isProxy}}`,
       },
     };
   },
@@ -262,9 +262,9 @@ module.exports = ({ strapi }) => ({
       title: this.getEventTitle(event),
       color: this.getEventColor(event),
       fields: [
-        { name: '👤 User', value: `${user.email}\n${user.username || 'N/A'}`, inline: true },
-        { name: '🌐 IP', value: session.ipAddress, inline: true },
-        { name: '📅 Time', value: new Date(session.loginTime).toLocaleString(), inline: false },
+        { name: 'User', value: `${user.email}\n${user.username || 'N/A'}`, inline: true },
+        { name: 'IP', value: session.ipAddress, inline: true },
+        { name: 'Time', value: new Date(session.loginTime).toLocaleString(), inline: false },
       ],
       timestamp: new Date().toISOString(),
       footer: { text: 'Magic Session Manager' },
@@ -272,7 +272,7 @@ module.exports = ({ strapi }) => ({
 
     if (geoData) {
       embed.fields.push({
-        name: '📍 Location',
+        name: '[LOCATION] Location',
         value: `${geoData.country_flag} ${geoData.city}, ${geoData.country}`,
         inline: true,
       });
@@ -284,7 +284,7 @@ module.exports = ({ strapi }) => ({
         if (geoData.isThreat) warnings.push('Threat');
         
         embed.fields.push({
-          name: '⚠️ Security',
+          name: '[WARNING] Security',
           value: `${warnings.join(', ')} detected\nScore: ${geoData.securityScore}/100`,
           inline: true,
         });
@@ -296,13 +296,13 @@ module.exports = ({ strapi }) => ({
 
   getEventTitle(event) {
     const titles = {
-      'login.suspicious': '🚨 Suspicious Login',
-      'login.new_location': '📍 New Location Login',
-      'login.vpn': '🔴 VPN Login Detected',
-      'login.threat': '⛔ Threat IP Login',
-      'session.terminated': '🔴 Session Terminated',
+      'login.suspicious': '[ALERT] Suspicious Login',
+      'login.new_location': '[LOCATION] New Location Login',
+      'login.vpn': '[WARNING] VPN Login Detected',
+      'login.threat': '[THREAT] Threat IP Login',
+      'session.terminated': '[INFO] Session Terminated',
     };
-    return titles[event] || '📊 Session Event';
+    return titles[event] || '[STATS] Session Event';
   },
 
   getEventColor(event) {

package/server/src/services/service.js

@@ -1,6 +1,6 @@
 const service = ({ strapi }) => ({
   getWelcomeMessage() {
-    return 'Welcome to Strapi 🚀';
+    return 'Welcome to Strapi [START]';
   },
 });
 

package/server/src/services/session.js

@@ -9,11 +9,17 @@ const { encryptToken, decryptToken, generateSessionId } = require('../utils/encr
  *
  * SECURITY: JWT tokens are encrypted before storing in database using AES-256-GCM
  * 
+ * [SUCCESS] Migrated to strapi.documents() API (Strapi v5 Best Practice)
+ * 
  * TODO: For production multi-instance deployments, use Redis for:
  *   - Session store instead of DB
  *   - Rate limiting locks
  *   - Distributed session state
  */
+
+const SESSION_UID = 'plugin::magic-sessionmanager.session';
+const USER_UID = 'plugin::users-permissions.user';
+
 module.exports = ({ strapi }) => ({
   /**
    * Create a new session record
@@ -31,21 +37,22 @@ module.exports = ({ strapi }) => ({
       const encryptedToken = token ? encryptToken(token) : null;
       const encryptedRefreshToken = refreshToken ? encryptToken(refreshToken) : null;
       
-      const session = await strapi.entityService.create('plugin::magic-sessionmanager.session', {
+      // Using Document Service API (Strapi v5)
+      const session = await strapi.documents(SESSION_UID).create({
         data: {
-          user: userId,
+          user: userId, // userId should be documentId (string)
           ipAddress: ip.substring(0, 45),
           userAgent: userAgent.substring(0, 500),
           loginTime: now,
           lastActive: now,
           isActive: true,
-          token: encryptedToken,              // ✅ Encrypted Access Token
-          refreshToken: encryptedRefreshToken, // ✅ Encrypted Refresh Token
-          sessionId: sessionId,                // ✅ Unique identifier
+          token: encryptedToken,              // [SUCCESS] Encrypted Access Token
+          refreshToken: encryptedRefreshToken, // [SUCCESS] Encrypted Refresh Token
+          sessionId: sessionId,                // [SUCCESS] Unique identifier
         },
       });
 
-      strapi.log.info(`[magic-sessionmanager] ✅ Session ${session.id} (${sessionId}) created for user ${userId}`);
+      strapi.log.info(`[magic-sessionmanager] [SUCCESS] Session ${session.documentId} (${sessionId}) created for user ${userId}`);
 
       return session;
     } catch (err) {
@@ -56,6 +63,7 @@ module.exports = ({ strapi }) => ({
 
   /**
    * Terminate a session or all sessions for a user
+   * Supports both numeric id (legacy) and documentId (Strapi v5)
    * @param {Object} params - { sessionId | userId }
    * @returns {Promise<void>}
    */
@@ -64,7 +72,9 @@ module.exports = ({ strapi }) => ({
       const now = new Date();
 
       if (sessionId) {
-        await strapi.entityService.update('plugin::magic-sessionmanager.session', sessionId, {
+        // Using Document Service API (Strapi v5)
+        await strapi.documents(SESSION_UID).update({
+          documentId: sessionId,
           data: {
             isActive: false,
             logoutTime: now,
@@ -73,17 +83,27 @@ module.exports = ({ strapi }) => ({
 
         strapi.log.info(`[magic-sessionmanager] Session ${sessionId} terminated`);
       } else if (userId) {
-        // Find all active sessions for user
-        const activeSessions = await strapi.entityService.findMany('plugin::magic-sessionmanager.session', {
+        // Strapi v5: If numeric id provided, look up documentId first
+        let userDocumentId = userId;
+        if (!isNaN(userId)) {
+          const user = await strapi.entityService.findOne(USER_UID, parseInt(userId, 10));
+          if (user) {
+            userDocumentId = user.documentId;
+          }
+        }
+        
+        // Find all active sessions for user - use Deep Filtering (Strapi v5)
+        const activeSessions = await strapi.documents(SESSION_UID).findMany({
           filters: {
-            user: { id: userId },
+            user: { documentId: userDocumentId }, // Deep filtering syntax
             isActive: true,
           },
         });
 
         // Terminate all active sessions
         for (const session of activeSessions) {
-          await strapi.entityService.update('plugin::magic-sessionmanager.session', session.id, {
+          await strapi.documents(SESSION_UID).update({
+            documentId: session.documentId,
             data: {
               isActive: false,
               logoutTime: now,
@@ -91,7 +111,7 @@ module.exports = ({ strapi }) => ({
           });
         }
 
-        strapi.log.info(`[magic-sessionmanager] All sessions terminated for user ${userId}`);
+        strapi.log.info(`[magic-sessionmanager] All sessions terminated for user ${userDocumentId}`);
       }
     } catch (err) {
       strapi.log.error('[magic-sessionmanager] Error terminating session:', err);
@@ -105,7 +125,7 @@ module.exports = ({ strapi }) => ({
    */
   async getAllSessions() {
     try {
-      const sessions = await strapi.entityService.findMany('plugin::magic-sessionmanager.session', {
+      const sessions = await strapi.documents(SESSION_UID).findMany( {
         populate: { user: { fields: ['id', 'email', 'username'] } },
         sort: { loginTime: 'desc' },
         limit: 1000, // Reasonable limit
@@ -147,7 +167,7 @@ module.exports = ({ strapi }) => ({
    */
   async getActiveSessions() {
     try {
-      const sessions = await strapi.entityService.findMany('plugin::magic-sessionmanager.session', {
+      const sessions = await strapi.documents(SESSION_UID).findMany( {
         filters: { isActive: true },
         populate: { user: { fields: ['id', 'email', 'username'] } },
         sort: { loginTime: 'desc' },
@@ -186,13 +206,23 @@ module.exports = ({ strapi }) => ({
 
   /**
    * Get all sessions for a specific user
-   * @param {number} userId
+   * Supports both numeric id (legacy) and documentId (Strapi v5)
+   * @param {string|number} userId - User documentId or numeric id
    * @returns {Promise<Array>} User's sessions with accurate online status
    */
   async getUserSessions(userId) {
     try {
-      const sessions = await strapi.entityService.findMany('plugin::magic-sessionmanager.session', {
-        filters: { user: { id: userId } },
+      // Strapi v5: If numeric id provided, look up documentId first
+      let userDocumentId = userId;
+      if (!isNaN(userId)) {
+        const user = await strapi.entityService.findOne(USER_UID, parseInt(userId, 10));
+        if (user) {
+          userDocumentId = user.documentId;
+        }
+      }
+      
+      const sessions = await strapi.documents(SESSION_UID).findMany( {
+        filters: { user: { documentId: userDocumentId } },
         sort: { loginTime: 'desc' },
       });
 
@@ -241,20 +271,20 @@ module.exports = ({ strapi }) => ({
 
       // Update session lastActive only
       if (sessionId) {
-        const session = await strapi.entityService.findOne('plugin::magic-sessionmanager.session', sessionId);
+        const session = await strapi.documents(SESSION_UID).findOne({ documentId: sessionId });
 
         if (session && session.lastActive) {
           const lastActiveTime = new Date(session.lastActive).getTime();
           const currentTime = now.getTime();
 
           if (currentTime - lastActiveTime > rateLimit) {
-            await strapi.entityService.update('plugin::magic-sessionmanager.session', sessionId, {
+            await strapi.documents(SESSION_UID).update({ documentId: sessionId,
               data: { lastActive: now },
             });
           }
         } else if (session) {
           // First time or null
-          await strapi.entityService.update('plugin::magic-sessionmanager.session', sessionId, {
+          await strapi.documents(SESSION_UID).update({ documentId: sessionId,
             data: { lastActive: now },
           });
         }
@@ -279,12 +309,12 @@ module.exports = ({ strapi }) => ({
       const now = new Date();
       const cutoffTime = new Date(now.getTime() - inactivityTimeout);
       
-      strapi.log.info(`[magic-sessionmanager] 🧹 Cleaning up sessions inactive since before ${cutoffTime.toISOString()}`);
+      strapi.log.info(`[magic-sessionmanager] [CLEANUP] Cleaning up sessions inactive since before ${cutoffTime.toISOString()}`);
       
       // Find all active sessions
-      const activeSessions = await strapi.entityService.findMany('plugin::magic-sessionmanager.session', {
+      const activeSessions = await strapi.documents(SESSION_UID).findMany({
         filters: { isActive: true },
-        fields: ['id', 'lastActive', 'loginTime'],
+        fields: ['lastActive', 'loginTime'],
       });
       
       // Deactivate old sessions
@@ -293,14 +323,15 @@ module.exports = ({ strapi }) => ({
         const lastActiveTime = session.lastActive ? new Date(session.lastActive) : new Date(session.loginTime);
         
         if (lastActiveTime < cutoffTime) {
-          await strapi.entityService.update('plugin::magic-sessionmanager.session', session.id, {
+          await strapi.documents(SESSION_UID).update({
+            documentId: session.documentId,
             data: { isActive: false },
           });
           deactivatedCount++;
         }
       }
       
-      strapi.log.info(`[magic-sessionmanager] ✅ Cleanup complete: ${deactivatedCount} sessions deactivated`);
+      strapi.log.info(`[magic-sessionmanager] [SUCCESS] Cleanup complete: ${deactivatedCount} sessions deactivated`);
       return deactivatedCount;
     } catch (err) {
       strapi.log.error('[magic-sessionmanager] Error cleaning up inactive sessions:', err);
@@ -316,8 +347,8 @@ module.exports = ({ strapi }) => ({
    */
   async deleteSession(sessionId) {
     try {
-      await strapi.entityService.delete('plugin::magic-sessionmanager.session', sessionId);
-      strapi.log.info(`[magic-sessionmanager] 🗑️ Session ${sessionId} permanently deleted`);
+      await strapi.documents(SESSION_UID).delete({ documentId: sessionId });
+      strapi.log.info(`[magic-sessionmanager] [DELETE] Session ${sessionId} permanently deleted`);
       return true;
     } catch (err) {
       strapi.log.error('[magic-sessionmanager] Error deleting session:', err);
@@ -332,23 +363,22 @@ module.exports = ({ strapi }) => ({
    */
   async deleteInactiveSessions() {
     try {
-      strapi.log.info('[magic-sessionmanager] 🗑️ Deleting all inactive sessions...');
+      strapi.log.info('[magic-sessionmanager] [DELETE] Deleting all inactive sessions...');
       
-      // Find all inactive sessions
-      const inactiveSessions = await strapi.entityService.findMany('plugin::magic-sessionmanager.session', {
+      // Find all inactive sessions (documentId is always included automatically)
+      const inactiveSessions = await strapi.documents(SESSION_UID).findMany({
         filters: { isActive: false },
-        fields: ['id'],
       });
       
       let deletedCount = 0;
       
       // Delete each inactive session
       for (const session of inactiveSessions) {
-        await strapi.entityService.delete('plugin::magic-sessionmanager.session', session.id);
+        await strapi.documents(SESSION_UID).delete({ documentId: session.documentId });
         deletedCount++;
       }
       
-      strapi.log.info(`[magic-sessionmanager] ✅ Deleted ${deletedCount} inactive sessions`);
+      strapi.log.info(`[magic-sessionmanager] [SUCCESS] Deleted ${deletedCount} inactive sessions`);
       return deletedCount;
     } catch (err) {
       strapi.log.error('[magic-sessionmanager] Error deleting inactive sessions:', err);

package/server/src/utils/encryption.js

@@ -31,7 +31,7 @@ function getEncryptionKey() {
   const strapiKeys = process.env.APP_KEYS || process.env.API_TOKEN_SALT || 'default-insecure-key';
   const key = crypto.createHash('sha256').update(strapiKeys).digest();
   
-  console.warn('[magic-sessionmanager/encryption] ⚠️  No SESSION_ENCRYPTION_KEY found. Using fallback (not recommended for production).');
+  console.warn('[magic-sessionmanager/encryption] [WARNING]  No SESSION_ENCRYPTION_KEY found. Using fallback (not recommended for production).');
   console.warn('[magic-sessionmanager/encryption] Set SESSION_ENCRYPTION_KEY in .env for better security.');
   
   return key;