@infuro/cms-core 1.0.39 → 1.0.40

package/dist/{chunk-ERJK5QXN.cjs → chunk-T7GCOO5Y.cjs}

@@ -6189,6 +6189,225 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
   };
 }
 chunkUSNT2KNT_cjs.__name(createCrudByIdHandler, "createCrudByIdHandler");
+var VENDOR_INVITE_METADATA_TOKEN = "inviteToken";
+var VENDOR_INVITE_METADATA_EXPIRES = "inviteExpiresAt";
+var VENDOR_INVITE_METADATA_SENT = "inviteSentAt";
+async function loadOwnerVendorForUser(dataSource, vendorEntity, userId) {
+  const repo = dataSource.getRepository(vendorEntity);
+  const row = await repo.findOne({
+    where: {
+      userId,
+      deleted: false
+    }
+  });
+  if (!row) return null;
+  const v = row;
+  return {
+    id: v.id,
+    inviteStatus: v.inviteStatus,
+    metadata: v.metadata && typeof v.metadata === "object" && !Array.isArray(v.metadata) ? v.metadata : null
+  };
+}
+chunkUSNT2KNT_cjs.__name(loadOwnerVendorForUser, "loadOwnerVendorForUser");
+function invalidatedInviteMessage() {
+  return "This invitation is no longer valid. Ask an admin to resend the invite.";
+}
+chunkUSNT2KNT_cjs.__name(invalidatedInviteMessage, "invalidatedInviteMessage");
+async function validateInviteTokenForActivation(dataSource, entityMap, token) {
+  const trimmedToken = String(token ?? "").trim();
+  if (!trimmedToken) {
+    return {
+      ok: false,
+      error: "Invalid invite link. Token is missing."
+    };
+  }
+  const userRepo = entityMap.users ? dataSource.getRepository(entityMap.users) : null;
+  if (entityMap.vendors && userRepo) {
+    const vendorMatch = await findVendorByInviteToken(dataSource, entityMap.vendors, trimmedToken);
+    if (vendorMatch) {
+      const vendorRepo = dataSource.getRepository(entityMap.vendors);
+      const freshVendor = await vendorRepo.findOne({
+        where: {
+          id: vendorMatch.id,
+          deleted: false
+        }
+      });
+      const v = freshVendor;
+      if (!v?.userId) {
+        return {
+          ok: false,
+          error: invalidatedInviteMessage()
+        };
+      }
+      if (v.inviteStatus === "accepted") {
+        return {
+          ok: false,
+          error: "This invitation has already been accepted"
+        };
+      }
+      if (v.inviteStatus === "expired") {
+        await vendorRepo.update(v.id, {
+          inviteStatus: "pending"
+        });
+        v.inviteStatus = "pending";
+      }
+      const user2 = await userRepo.findOne({
+        where: {
+          id: v.userId
+        },
+        select: [
+          "id",
+          "email",
+          "blocked",
+          "password"
+        ]
+      });
+      if (!user2) return {
+        ok: false,
+        error: "User not found"
+      };
+      const hasPassword2 = !!user2.password;
+      if (!user2.blocked && hasPassword2) {
+        return {
+          ok: false,
+          error: "User is already active"
+        };
+      }
+      return {
+        ok: true,
+        target: {
+          userId: user2.id,
+          email: String(user2.email),
+          vendorId: v.id
+        }
+      };
+    }
+  }
+  let email;
+  try {
+    email = Buffer.from(trimmedToken, "base64").toString("utf8").trim();
+  } catch {
+    return {
+      ok: false,
+      error: invalidatedInviteMessage()
+    };
+  }
+  if (!email.includes("@")) {
+    return {
+      ok: false,
+      error: invalidatedInviteMessage()
+    };
+  }
+  if (!userRepo) {
+    return {
+      ok: false,
+      error: "User not found"
+    };
+  }
+  const user = await userRepo.findOne({
+    where: {
+      email
+    },
+    select: [
+      "id",
+      "email",
+      "blocked",
+      "password"
+    ]
+  });
+  if (!user) return {
+    ok: false,
+    error: "User not found"
+  };
+  const hasPassword = !!user.password;
+  if (!user.blocked && hasPassword) {
+    return {
+      ok: false,
+      error: "User is already active"
+    };
+  }
+  if (entityMap.vendors) {
+    const ownerVendor = await loadOwnerVendorForUser(dataSource, entityMap.vendors, user.id);
+    if (ownerVendor && readVendorInviteToken(ownerVendor.metadata)) {
+      return {
+        ok: false,
+        error: invalidatedInviteMessage()
+      };
+    }
+  }
+  return {
+    ok: true,
+    target: {
+      userId: user.id,
+      email: String(user.email)
+    }
+  };
+}
+chunkUSNT2KNT_cjs.__name(validateInviteTokenForActivation, "validateInviteTokenForActivation");
+function buildVendorInviteLink(baseUrl, token) {
+  const base = baseUrl.replace(/\/+$/, "");
+  return `${base}/admin/invite?token=${encodeURIComponent(token)}`;
+}
+chunkUSNT2KNT_cjs.__name(buildVendorInviteLink, "buildVendorInviteLink");
+function applyRotatingVendorInvite(existing) {
+  const next = {
+    ...existing ?? {}
+  };
+  next[VENDOR_INVITE_METADATA_TOKEN] = crypto2.randomBytes(32).toString("hex");
+  next[VENDOR_INVITE_METADATA_SENT] = (/* @__PURE__ */ new Date()).toISOString();
+  delete next[VENDOR_INVITE_METADATA_EXPIRES];
+  return next;
+}
+chunkUSNT2KNT_cjs.__name(applyRotatingVendorInvite, "applyRotatingVendorInvite");
+function clearVendorInviteMetadata(existing) {
+  const next = {
+    ...existing ?? {}
+  };
+  delete next[VENDOR_INVITE_METADATA_TOKEN];
+  delete next[VENDOR_INVITE_METADATA_EXPIRES];
+  delete next[VENDOR_INVITE_METADATA_SENT];
+  return Object.keys(next).length > 0 ? next : null;
+}
+chunkUSNT2KNT_cjs.__name(clearVendorInviteMetadata, "clearVendorInviteMetadata");
+function readVendorInviteToken(metadata) {
+  const raw = metadata?.[VENDOR_INVITE_METADATA_TOKEN];
+  return typeof raw === "string" && raw.trim() ? raw.trim() : null;
+}
+chunkUSNT2KNT_cjs.__name(readVendorInviteToken, "readVendorInviteToken");
+async function findVendorByInviteToken(dataSource, vendorEntity, token) {
+  const trimmed = token.trim();
+  if (!trimmed) return null;
+  const repo = dataSource.getRepository(vendorEntity);
+  const row = await repo.createQueryBuilder("v").where("v.deleted = false").andWhere(`v.metadata->>'${VENDOR_INVITE_METADATA_TOKEN}' = :token`, {
+    token: trimmed
+  }).getOne();
+  if (!row) return null;
+  const v = row;
+  return {
+    id: v.id,
+    userId: v.userId ?? null,
+    inviteStatus: v.inviteStatus,
+    metadata: v.metadata && typeof v.metadata === "object" && !Array.isArray(v.metadata) ? v.metadata : null
+  };
+}
+chunkUSNT2KNT_cjs.__name(findVendorByInviteToken, "findVendorByInviteToken");
+async function completeVendorInviteAccept(dataSource, vendorEntity, vendorId) {
+  const repo = dataSource.getRepository(vendorEntity);
+  const row = await repo.findOne({
+    where: {
+      id: vendorId,
+      deleted: false
+    }
+  });
+  if (!row) return;
+  const metadata = row.metadata;
+  const cleared = clearVendorInviteMetadata(metadata);
+  await repo.update(vendorId, {
+    metadata: cleared,
+    inviteStatus: "accepted"
+  });
+}
+chunkUSNT2KNT_cjs.__name(completeVendorInviteAccept, "completeVendorInviteAccept");
 
 // src/api/auth-handlers.ts
 function createForgotPasswordHandler(config) {
@@ -6324,49 +6543,27 @@ function createInviteAcceptHandler(config) {
       }, {
         status: 400
       });
-      let email;
-      try {
-        email = Buffer.from(token, "base64").toString("utf8");
-      } catch {
+      const validation = await validateInviteTokenForActivation(dataSource, entityMap, token);
+      if (!validation.ok) {
         return json({
-          error: "Invalid or expired invite token"
-        }, {
-          status: 400
-        });
-      }
-      const userRepo = dataSource.getRepository(entityMap.users);
-      const user = await userRepo.findOne({
-        where: {
-          email
-        },
-        select: [
-          "id",
-          "blocked",
-          "password"
-        ]
-      });
-      if (!user) return json({
-        error: "User not found"
-      }, {
-        status: 400
-      });
-      const hasPassword = !!user.password;
-      if (!user.blocked && hasPassword) {
-        return json({
-          error: "User is already active"
+          error: validation.error
         }, {
           status: 400
         });
       }
+      const { userId, email, vendorId } = validation.target;
       if (entityMap.contacts) {
-        await linkUnclaimedContactToUser(dataSource, entityMap.contacts, user.id, email);
+        await linkUnclaimedContactToUser(dataSource, entityMap.contacts, userId, email);
       }
-      if (beforeActivate) await beforeActivate(email, user.id);
+      if (beforeActivate) await beforeActivate(email, userId);
       const hashedPassword = await hashPassword(password);
-      await userRepo.update(user.id, {
+      await dataSource.getRepository(entityMap.users).update(userId, {
         password: hashedPassword,
         blocked: false
       });
+      if (vendorId != null && entityMap.vendors) {
+        await completeVendorInviteAccept(dataSource, entityMap.vendors, vendorId);
+      }
       return json({
         message: "User account activated successfully"
       }, {
@@ -6382,6 +6579,35 @@ function createInviteAcceptHandler(config) {
   }, "POST");
 }
 chunkUSNT2KNT_cjs.__name(createInviteAcceptHandler, "createInviteAcceptHandler");
+function createInviteValidateHandler(config) {
+  const { dataSource, entityMap, json } = config;
+  return /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async function GET(request) {
+    try {
+      const token = new URL(request.url).searchParams.get("token");
+      const validation = await validateInviteTokenForActivation(dataSource, entityMap, token ?? "");
+      if (!validation.ok) {
+        return json({
+          valid: false,
+          error: validation.error
+        }, {
+          status: 400
+        });
+      }
+      return json({
+        valid: true
+      });
+    } catch (err) {
+      console.error("[users/invite GET] validate failed", err);
+      return json({
+        valid: false,
+        error: "Server Error"
+      }, {
+        status: 500
+      });
+    }
+  }, "GET");
+}
+chunkUSNT2KNT_cjs.__name(createInviteValidateHandler, "createInviteValidateHandler");
 function createChangePasswordHandler(config) {
   const { dataSource, entityMap, json, comparePassword, hashPassword, getSession, minPasswordLength = 6, beforeUpdate } = config;
   return /* @__PURE__ */ chunkUSNT2KNT_cjs.__name(async function POST(request) {
@@ -6460,12 +6686,22 @@ function createUserAuthApiRouter(config) {
   const forgot = createForgotPasswordHandler(config);
   const setPass = createSetPasswordHandler(config);
   const invite = createInviteAcceptHandler(config);
+  const inviteValidate = createInviteValidateHandler(config);
   const changePass = config.getSession ? createChangePasswordHandler({
     ...config,
     getSession: config.getSession,
     beforeUpdate: config.beforeChangePasswordUpdate
   }) : null;
   return {
+    async GET(req, pathname) {
+      const path2 = pathname.replace(/\/$/, "");
+      if (path2 === "invite") return inviteValidate(req);
+      return config.json({
+        error: "Not found"
+      }, {
+        status: 404
+      });
+    },
     async POST(req, pathname) {
       const path2 = pathname.replace(/\/$/, "");
       if (!USER_AUTH_PATHS.includes(path2)) {
@@ -8871,13 +9107,31 @@ function createUsersApiHandlers(config) {
         }, {
           status: 404
         });
-        const emailToken = Buffer.from(user.email).toString("base64");
-        const inviteLink = `${baseUrl}/admin/invite?token=${emailToken}`;
-        await trySendInviteEmail(user.email, inviteLink, user.name ?? "");
+        let inviteLink = `${baseUrl}/admin/invite?token=${Buffer.from(user.email).toString("base64")}`;
         if (entityMap.vendors) {
+          const vendorRepo = dataSource.getRepository(entityMap.vendors);
+          const vendor = await vendorRepo.findOne({
+            where: {
+              userId: user.id,
+              deleted: false
+            }
+          });
+          const v = vendor;
+          if (v && (v.inviteStatus === "pending" || v.inviteStatus === "expired")) {
+            const rotatedMetadata = applyRotatingVendorInvite(v.metadata);
+            await vendorRepo.update(v.id, {
+              metadata: rotatedMetadata,
+              inviteStatus: "pending"
+            });
+            const token = readVendorInviteToken(rotatedMetadata);
+            if (token) {
+              inviteLink = buildVendorInviteLink(baseUrl, token);
+            }
+          }
           const { markVendorInvitePendingForUser } = await import('./vendor-invite-status-77O7ZQ3U.cjs');
           await markVendorInvitePendingForUser(dataSource, entityMap.vendors, user.id);
         }
+        await trySendInviteEmail(user.email, inviteLink, user.name ?? "");
         return json({
           message: "New invite link generated successfully",
           inviteLink
@@ -12126,6 +12380,11 @@ function createVendorOnboardHandlers(config) {
             groupId: ownerGroup.id,
             adminAccess: true
           }));
+          const baseMetadata = buildVendorMetadata(null, {
+            ownerDesignation,
+            termsAccepted: true
+          });
+          const metadata = activation === "invite" ? applyRotatingVendorInvite(baseMetadata) : baseMetadata;
           const vendor = await vendorRepo.save(vendorRepo.create({
             name: vendorName,
             slug,
@@ -12145,10 +12404,7 @@ function createVendorOnboardHandlers(config) {
             gstin: profile.gstin,
             pan: profile.pan,
             registrationStatus: profile.registrationStatus,
-            metadata: buildVendorMetadata(null, {
-              ownerDesignation,
-              termsAccepted: true
-            }),
+            metadata,
             active: body.vendor?.active !== false,
             deleted: false,
             userId: newUser.id,
@@ -12198,8 +12454,10 @@ function createVendorOnboardHandlers(config) {
         let inviteLink;
         let emailSent = false;
         if (activation === "invite") {
-          const emailToken = Buffer.from(result.user.email).toString("base64");
-          inviteLink = `${baseUrl}/admin/invite?token=${emailToken}`;
+          const token = readVendorInviteToken(result.vendor.metadata);
+          if (token) {
+            inviteLink = buildVendorInviteLink(baseUrl, token);
+          }
         }
         if (sendOwnerEmail) {
           emailSent = await trySendVendorOnboardEmails({
@@ -12241,6 +12499,130 @@ function createVendorOnboardHandlers(config) {
         return vendorOnboardErrorResponse(json, e);
       }
     },
+    /** POST /api/admin/vendors/:id/resend-invite — rotate owner invite token and resend email */
+    async resendInvite(req, vendorIdStr) {
+      const err = await gateAdmin();
+      if (err) return err;
+      if (!entityMap.vendors || !entityMap.users) {
+        return json({
+          error: "Vendor entities not configured"
+        }, {
+          status: 500
+        });
+      }
+      const vendorId = Number(vendorIdStr);
+      if (!Number.isFinite(vendorId) || vendorId <= 0) {
+        return json({
+          error: "Invalid vendor id"
+        }, {
+          status: 400
+        });
+      }
+      let sendEmail = true;
+      try {
+        const body = await req.json().catch(() => ({}));
+        if (body.sendEmail === false) sendEmail = false;
+      } catch {
+      }
+      try {
+        const vendorRepo = dataSource.getRepository(entityMap.vendors);
+        const vendor = await vendorRepo.findOne({
+          where: {
+            id: vendorId,
+            deleted: false
+          }
+        });
+        if (!vendor) return json({
+          error: "Vendor not found"
+        }, {
+          status: 404
+        });
+        const v = vendor;
+        if (v.inviteStatus === "accepted") {
+          return json({
+            error: "Owner has already accepted the invite"
+          }, {
+            status: 400
+          });
+        }
+        if (v.inviteStatus === "none") {
+          return json({
+            error: "This vendor was not created with an invite link"
+          }, {
+            status: 400
+          });
+        }
+        if (v.inviteStatus !== "pending" && v.inviteStatus !== "expired") {
+          return json({
+            error: "Invite cannot be resent for this vendor"
+          }, {
+            status: 400
+          });
+        }
+        if (!v.userId) {
+          return json({
+            error: "Vendor has no owner user linked"
+          }, {
+            status: 400
+          });
+        }
+        const userRepo = dataSource.getRepository(entityMap.users);
+        const owner = await userRepo.findOne({
+          where: {
+            id: v.userId,
+            deleted: false
+          }
+        });
+        if (!owner) return json({
+          error: "Owner user not found"
+        }, {
+          status: 404
+        });
+        const ownerRow = owner;
+        const hasPassword = !!(ownerRow.password && String(ownerRow.password).trim());
+        if (!ownerRow.blocked && hasPassword) {
+          return json({
+            error: "Owner account is already active"
+          }, {
+            status: 400
+          });
+        }
+        const rotatedMetadata = applyRotatingVendorInvite(v.metadata);
+        await vendorRepo.update(vendorId, {
+          metadata: rotatedMetadata,
+          inviteStatus: "pending"
+        });
+        const token = readVendorInviteToken(rotatedMetadata);
+        if (!token) {
+          return json({
+            error: "Failed to generate invite token"
+          }, {
+            status: 500
+          });
+        }
+        const inviteLink = buildVendorInviteLink(baseUrl, token);
+        let emailSent = false;
+        if (sendEmail) {
+          emailSent = await trySendVendorOnboardEmails({
+            vendorName: v.name,
+            vendorSlug: v.slug,
+            ownerName: ownerRow.name,
+            ownerEmail: ownerRow.email,
+            activation: "invite",
+            inviteLink,
+            sendToOwner: true
+          });
+        }
+        return json({
+          message: emailSent ? "Invite resent. Previous invite link is no longer valid." : sendEmail ? "New invite link created (email may not have been sent \u2014 check email plugin). Previous link is invalid." : "New invite link created. Previous invite link is no longer valid.",
+          emailSent,
+          inviteLink,
+          inviteStatus: "pending"
+        });
+      } catch (e) {
+        return vendorOnboardErrorResponse(json, e);
+      }
+    },
     /** POST /api/admin/vendor/switch — set active vendor in session (JWT update via client) */
     async switchVendor(req) {
       const u = await getSessionUser();
@@ -25602,6 +25984,14 @@ function createCmsApiHandler(config) {
         });
         return vendorHandlers.onboard(req);
       }
+      if (path2[0] === "admin" && path2[1] === "vendors" && path2.length === 4 && path2[3] === "resend-invite" && m === "POST") {
+        if (!vendorHandlers) return config.json({
+          error: "Not found"
+        }, {
+          status: 404
+        });
+        return vendorHandlers.resendInvite(req, path2[2]);
+      }
       if (path2[0] === "admin" && path2[1] === "vendor" && path2[2] === "switch" && path2.length === 3 && m === "POST") {
         if (!vendorHandlers) return config.json({
           error: "Not found"
@@ -26193,6 +26583,15 @@ function createCmsApiHandler(config) {
           if (m === "PUT" || m === "PATCH") return formSaveHandlers.PUT(req, path2[1]);
         }
       }
+      if (path2[0] === "users" && path2.length === 2 && userAuthRouter) {
+        const authSegment = path2[1];
+        if (m === "GET" && authSegment === "invite" && userAuthRouter.GET) {
+          return userAuthRouter.GET(req, authSegment);
+        }
+        if (m === "POST" && (authSegment === "invite" || authSegment === "forgot-password" || authSegment === "set-password" || authSegment === "reset-password")) {
+          return userAuthRouter.POST(req, authSegment);
+        }
+      }
       if (path2[0] === "users" && usersHandlers) {
         if (path2.length === 1) {
           if (m === "GET") return usersHandlers.list(req);
@@ -26213,9 +26612,6 @@ function createCmsApiHandler(config) {
           return usersHandlers.regenerateInvite(req, path2[1]);
         }
       }
-      if (path2[0] === "users" && path2.length === 2 && userAuthRouter && m === "POST") {
-        return userAuthRouter.POST(req, path2[1]);
-      }
       if (path2[0] === "social-media" && path2[1] === "linkedin" && socialMediaHandlers && path2.length === 3) {
         const tail = path2[2];
         if (tail === "status" && m === "GET") {
@@ -30610,12 +31006,14 @@ exports.BLOG_METADATA_ENRICHER_LLM_AGENT_SLUG = BLOG_METADATA_ENRICHER_LLM_AGENT
 exports.BlogGeneratorService = BlogGeneratorService;
 exports.CMS_ENTITY_MAP = CMS_ENTITY_MAP;
 exports.ZIP_MIME_TYPES = ZIP_MIME_TYPES;
+exports.applyRotatingVendorInvite = applyRotatingVendorInvite;
 exports.applyVendorCustomersContactFilter = applyVendorCustomersContactFilter;
 exports.assertCaptchaOk = assertCaptchaOk;
 exports.assertContactAllowedForVendorOrder = assertContactAllowedForVendorOrder;
 exports.buildBlogMetadataUserPrompt = buildBlogMetadataUserPrompt;
 exports.buildCronFromSchedule = buildCronFromSchedule;
 exports.buildRssUserPromptFromFeeds = buildRssUserPromptFromFeeds;
+exports.buildVendorInviteLink = buildVendorInviteLink;
 exports.calculateOrderRefundPreview = calculateOrderRefundPreview;
 exports.calculateRefundFromPolicy = calculateRefundFromPolicy;
 exports.checkEventsEnabled = checkEventsEnabled;
@@ -30660,6 +31058,7 @@ exports.ensureMessagingPluginsOnCms = ensureMessagingPluginsOnCms;
 exports.ensureScheduleQueueWorker = ensureScheduleQueueWorker;
 exports.ensureVendorCustomerForOrderContact = ensureVendorCustomerForOrderContact;
 exports.findActiveRefundPolicyForVendor = findActiveRefundPolicyForVendor;
+exports.findVendorByInviteToken = findVendorByInviteToken;
 exports.formatTierRange = formatTierRange;
 exports.generateNumericOtp = generateNumericOtp;
 exports.getPublicSettingsGroup = getPublicSettingsGroup;

package/dist/cli.cjs

@@ -321,7 +321,7 @@ const cmsMiddleware = createCmsMiddleware({
     '/api/auth': ['GET', 'POST'],
     '/api/users/forgot-password': ['POST'],
     '/api/users/set-password': ['POST'],
-    '/api/users/invite': ['POST'],
+    '/api/users/invite': ['GET', 'POST'],
   },
 });
 

package/dist/cli.js

@@ -314,7 +314,7 @@ const cmsMiddleware = createCmsMiddleware({
     '/api/auth': ['GET', 'POST'],
     '/api/users/forgot-password': ['POST'],
     '/api/users/set-password': ['POST'],
-    '/api/users/invite': ['POST'],
+    '/api/users/invite': ['GET', 'POST'],
   },
 });