strapi-plugin-magic-sessionmanager 4.3.1 → 4.3.2

package/dist/server/index.js

@@ -516,9 +516,20 @@ var bootstrap$1 = async ({ strapi: strapi2 }) => {
           }
           let userDocId = user.documentId;
           if (!userDocId && user.id) {
-            const fullUser = await strapi2.entityService.findOne(USER_UID$2, user.id);
-            userDocId = fullUser?.documentId || user.id;
+            const fullUser = await strapi2.entityService.findOne(USER_UID$2, user.id, {
+              fields: ["documentId"]
+            });
+            userDocId = fullUser?.documentId;
+            if (!userDocId) {
+              log.error(`[ERROR] Could not get documentId for user ${user.id} - session NOT created!`);
+              return;
+            }
           }
+          if (!userDocId) {
+            log.error("[ERROR] No user documentId available - cannot create session");
+            return;
+          }
+          log.debug(`[SESSION] Creating session for user documentId: ${userDocId}`);
           const newSession = await sessionService.createSession({
             userId: userDocId,
             ip,
@@ -530,7 +541,11 @@ var bootstrap$1 = async ({ strapi: strapi2 }) => {
             geoData
             // Store geolocation data if available
           });
-          log.info(`[SUCCESS] Session created for user ${userDocId} (IP: ${ip})`);
+          if (newSession?.documentId) {
+            log.info(`[SUCCESS] Session ${newSession.documentId} created for user ${userDocId} (IP: ${ip})`);
+          } else {
+            log.error(`[ERROR] Session creation returned no documentId for user ${userDocId}`);
+          }
           if (geoData && (config2.enableEmailAlerts || config2.enableWebhooks)) {
             try {
               const notificationService = strapi2.plugin("magic-sessionmanager").service("notifications");
@@ -771,16 +786,23 @@ async function registerSessionAwareAuthStrategy(strapi2, log) {
         if (!userDocId) {
           return decoded;
         }
+        strapi2.log.debug(`[magic-sessionmanager] [JWT] Checking sessions for user: ${userDocId}`);
         const activeSessions = await strapi2.documents(SESSION_UID$3).findMany({
           filters: {
             user: { documentId: userDocId },
             isActive: true
           },
-          limit: 1
+          limit: 1,
+          populate: { user: { fields: ["documentId"] } }
         });
+        strapi2.log.debug(`[magic-sessionmanager] [JWT] Found ${activeSessions?.length || 0} active sessions`);
         if (!activeSessions || activeSessions.length === 0) {
+          const allSessions = await strapi2.documents(SESSION_UID$3).findMany({
+            filters: { user: { documentId: userDocId } },
+            limit: 5
+          });
           strapi2.log.info(
-            `[magic-sessionmanager] [JWT-BLOCKED] Valid JWT but no active session (user: ${userDocId.substring(0, 8)}...)`
+            `[magic-sessionmanager] [JWT-BLOCKED] Valid JWT but no active session (user: ${userDocId.substring(0, 8)}..., total sessions: ${allSessions?.length || 0})`
           );
           return null;
         }
@@ -2585,7 +2607,7 @@ var session$1 = ({ strapi: strapi2 }) => {
     }
   };
 };
-const version$1 = "4.3.0";
+const version$1 = "4.3.1";
 const require$$2 = {
   version: version$1
 };
@@ -17213,6 +17235,16 @@ const providerFactory = (options2 = {}) => {
     }
   };
 };
+const parallelWithOrderedErrors = async (promises) => {
+  const results = await Promise.allSettled(promises);
+  for (let i2 = 0; i2 < results.length; i2 += 1) {
+    const result = results[i2];
+    if (result.status === "rejected") {
+      throw result.reason;
+    }
+  }
+  return results.map((r) => r.value);
+};
 const traverseEntity = async (visitor2, options2, entity) => {
   const { path: path2 = {
     raw: null,
@@ -17313,15 +17345,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
       const method = isMorphRelation ? traverseMorphRelationTarget : traverseRelationTarget(getModel(attribute.target));
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i3 = 0; i3 < value.length; i3 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
           };
-          res[i3] = await method(visitor2, arrayPath, value[i3]);
-        }
-        copy[key] = res;
+          return method(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await method(visitor2, newPath, value);
       }
@@ -17335,15 +17365,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
         path: newPath
       };
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i3 = 0; i3 < value.length; i3 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
           };
-          res[i3] = await traverseMediaTarget(visitor2, arrayPath, value[i3]);
-        }
-        copy[key] = res;
+          return traverseMediaTarget(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await traverseMediaTarget(visitor2, newPath, value);
       }
@@ -17358,15 +17386,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
       };
       const targetSchema = getModel(attribute.component);
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i3 = 0; i3 < value.length; i3 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
           };
-          res[i3] = await traverseComponent(visitor2, arrayPath, targetSchema, value[i3]);
-        }
-        copy[key] = res;
+          return traverseComponent(visitor2, arrayPath, targetSchema, item);
+        }));
       } else {
         copy[key] = await traverseComponent(visitor2, newPath, targetSchema, value);
       }
@@ -17379,15 +17405,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
         attribute,
         path: newPath
       };
-      const res = new Array(value.length);
-      for (let i3 = 0; i3 < value.length; i3 += 1) {
+      copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
         const arrayPath = {
           ...newPath,
           rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
         };
-        res[i3] = await visitDynamicZoneEntry(visitor2, arrayPath, value[i3]);
-      }
-      copy[key] = res;
+        return visitDynamicZoneEntry(visitor2, arrayPath, item);
+      }));
       continue;
     }
   }
@@ -18133,6 +18157,23 @@ const generateInstallId = (projectId, installId) => {
     return require$$1__default.default.randomUUID();
   }
 };
+const createModelCache = (getModelFn) => {
+  const cache = /* @__PURE__ */ new Map();
+  return {
+    getModel(uid) {
+      const cached2 = cache.get(uid);
+      if (cached2) {
+        return cached2;
+      }
+      const model = getModelFn(uid);
+      cache.set(uid, model);
+      return model;
+    },
+    clear() {
+      cache.clear();
+    }
+  };
+};
 var map$2;
 try {
   map$2 = Map;
@@ -38821,6 +38862,7 @@ const dist = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty
   augmentSchema,
   contentTypes: contentTypes$1,
   createContentApiRoutesFactory,
+  createModelCache,
   dates,
   env,
   errors: errors$1,

package/dist/server/index.mjs

@@ -503,9 +503,20 @@ var bootstrap$1 = async ({ strapi: strapi2 }) => {
           }
           let userDocId = user.documentId;
           if (!userDocId && user.id) {
-            const fullUser = await strapi2.entityService.findOne(USER_UID$2, user.id);
-            userDocId = fullUser?.documentId || user.id;
+            const fullUser = await strapi2.entityService.findOne(USER_UID$2, user.id, {
+              fields: ["documentId"]
+            });
+            userDocId = fullUser?.documentId;
+            if (!userDocId) {
+              log.error(`[ERROR] Could not get documentId for user ${user.id} - session NOT created!`);
+              return;
+            }
           }
+          if (!userDocId) {
+            log.error("[ERROR] No user documentId available - cannot create session");
+            return;
+          }
+          log.debug(`[SESSION] Creating session for user documentId: ${userDocId}`);
           const newSession = await sessionService.createSession({
             userId: userDocId,
             ip,
@@ -517,7 +528,11 @@ var bootstrap$1 = async ({ strapi: strapi2 }) => {
             geoData
             // Store geolocation data if available
           });
-          log.info(`[SUCCESS] Session created for user ${userDocId} (IP: ${ip})`);
+          if (newSession?.documentId) {
+            log.info(`[SUCCESS] Session ${newSession.documentId} created for user ${userDocId} (IP: ${ip})`);
+          } else {
+            log.error(`[ERROR] Session creation returned no documentId for user ${userDocId}`);
+          }
           if (geoData && (config2.enableEmailAlerts || config2.enableWebhooks)) {
             try {
               const notificationService = strapi2.plugin("magic-sessionmanager").service("notifications");
@@ -758,16 +773,23 @@ async function registerSessionAwareAuthStrategy(strapi2, log) {
         if (!userDocId) {
           return decoded;
         }
+        strapi2.log.debug(`[magic-sessionmanager] [JWT] Checking sessions for user: ${userDocId}`);
         const activeSessions = await strapi2.documents(SESSION_UID$3).findMany({
           filters: {
             user: { documentId: userDocId },
             isActive: true
           },
-          limit: 1
+          limit: 1,
+          populate: { user: { fields: ["documentId"] } }
         });
+        strapi2.log.debug(`[magic-sessionmanager] [JWT] Found ${activeSessions?.length || 0} active sessions`);
         if (!activeSessions || activeSessions.length === 0) {
+          const allSessions = await strapi2.documents(SESSION_UID$3).findMany({
+            filters: { user: { documentId: userDocId } },
+            limit: 5
+          });
           strapi2.log.info(
-            `[magic-sessionmanager] [JWT-BLOCKED] Valid JWT but no active session (user: ${userDocId.substring(0, 8)}...)`
+            `[magic-sessionmanager] [JWT-BLOCKED] Valid JWT but no active session (user: ${userDocId.substring(0, 8)}..., total sessions: ${allSessions?.length || 0})`
           );
           return null;
         }
@@ -2572,7 +2594,7 @@ var session$1 = ({ strapi: strapi2 }) => {
     }
   };
 };
-const version$1 = "4.3.0";
+const version$1 = "4.3.1";
 const require$$2 = {
   version: version$1
 };
@@ -17200,6 +17222,16 @@ const providerFactory = (options2 = {}) => {
     }
   };
 };
+const parallelWithOrderedErrors = async (promises) => {
+  const results = await Promise.allSettled(promises);
+  for (let i2 = 0; i2 < results.length; i2 += 1) {
+    const result = results[i2];
+    if (result.status === "rejected") {
+      throw result.reason;
+    }
+  }
+  return results.map((r) => r.value);
+};
 const traverseEntity = async (visitor2, options2, entity) => {
   const { path: path2 = {
     raw: null,
@@ -17300,15 +17332,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
       const method = isMorphRelation ? traverseMorphRelationTarget : traverseRelationTarget(getModel(attribute.target));
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i3 = 0; i3 < value.length; i3 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
           };
-          res[i3] = await method(visitor2, arrayPath, value[i3]);
-        }
-        copy[key] = res;
+          return method(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await method(visitor2, newPath, value);
       }
@@ -17322,15 +17352,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
         path: newPath
       };
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i3 = 0; i3 < value.length; i3 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
           };
-          res[i3] = await traverseMediaTarget(visitor2, arrayPath, value[i3]);
-        }
-        copy[key] = res;
+          return traverseMediaTarget(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await traverseMediaTarget(visitor2, newPath, value);
       }
@@ -17345,15 +17373,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
       };
       const targetSchema = getModel(attribute.component);
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i3 = 0; i3 < value.length; i3 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
           };
-          res[i3] = await traverseComponent(visitor2, arrayPath, targetSchema, value[i3]);
-        }
-        copy[key] = res;
+          return traverseComponent(visitor2, arrayPath, targetSchema, item);
+        }));
       } else {
         copy[key] = await traverseComponent(visitor2, newPath, targetSchema, value);
       }
@@ -17366,15 +17392,13 @@ const traverseEntity = async (visitor2, options2, entity) => {
         attribute,
         path: newPath
       };
-      const res = new Array(value.length);
-      for (let i3 = 0; i3 < value.length; i3 += 1) {
+      copy[key] = await parallelWithOrderedErrors(value.map((item, i3) => {
         const arrayPath = {
           ...newPath,
           rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i3}` : `${newPath.rawWithIndices}.${i3}`
         };
-        res[i3] = await visitDynamicZoneEntry(visitor2, arrayPath, value[i3]);
-      }
-      copy[key] = res;
+        return visitDynamicZoneEntry(visitor2, arrayPath, item);
+      }));
       continue;
     }
   }
@@ -18120,6 +18144,23 @@ const generateInstallId = (projectId, installId) => {
     return require$$1.randomUUID();
   }
 };
+const createModelCache = (getModelFn) => {
+  const cache = /* @__PURE__ */ new Map();
+  return {
+    getModel(uid) {
+      const cached2 = cache.get(uid);
+      if (cached2) {
+        return cached2;
+      }
+      const model = getModelFn(uid);
+      cache.set(uid, model);
+      return model;
+    },
+    clear() {
+      cache.clear();
+    }
+  };
+};
 var map$2;
 try {
   map$2 = Map;
@@ -38808,6 +38849,7 @@ const dist = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty
   augmentSchema,
   contentTypes: contentTypes$1,
   createContentApiRoutesFactory,
+  createModelCache,
   dates,
   env,
   errors: errors$1,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.3.1",
+  "version": "4.3.2",
   "keywords": [
     "strapi",
     "strapi-plugin",