aaspai-authx 0.1.7 → 0.1.9

package/LICENSE

@@ -1,3 +1,3 @@
-MIT License
-
+MIT License
+
 (See standard MIT text)

package/dist/express/index.cjs

@@ -43,6 +43,7 @@ var import_bcryptjs = __toESM(require("bcryptjs"), 1);
 var import_crypto = require("crypto");
 var import_express = __toESM(require("express"), 1);
 var import_jsonwebtoken4 = __toESM(require("jsonwebtoken"), 1);
+var import_mongoose5 = __toESM(require("mongoose"), 1);
 
 // src/config/loadConfig.ts
 function loadConfig() {
@@ -243,7 +244,7 @@ var MetadataSchema = new import_mongoose2.default.Schema(
 );
 var OrgUserSchema = new import_mongoose2.default.Schema(
   {
-    id: { type: String, default: (0, import_uuid.v4)(), index: true, unique: true },
+    id: { type: String, default: import_uuid.v4, index: true, unique: true },
     email: { type: String, required: true, unique: true },
     firstName: { type: String, required: true },
     lastName: { type: String, required: true },
@@ -251,6 +252,12 @@ var OrgUserSchema = new import_mongoose2.default.Schema(
     projectId: { type: String, required: true },
     roles: { type: [String], default: [] },
     emailVerified: { type: Boolean, default: false },
+    status: {
+      type: String,
+      enum: ["active", "inactive", "suspended", "banned", "pending"],
+      default: "active",
+      index: true
+    },
     lastEmailSent: { type: [Date], default: [] },
     lastPasswordReset: { type: Date },
     metadata: { type: [MetadataSchema], default: [] },
@@ -258,6 +265,12 @@ var OrgUserSchema = new import_mongoose2.default.Schema(
   },
   { timestamps: true, collection: "users" }
 );
+OrgUserSchema.index({ projectId: 1, createdAt: -1 });
+OrgUserSchema.index({ projectId: 1, updatedAt: -1 });
+OrgUserSchema.index({ projectId: 1, email: 1 });
+OrgUserSchema.index({ projectId: 1, emailVerified: 1, createdAt: -1 });
+OrgUserSchema.index({ projectId: 1, status: 1, createdAt: -1 });
+OrgUserSchema.index({ projectId: 1, firstName: 1, lastName: 1 });
 var OrgUser = import_mongoose2.default.model("OrgUser", OrgUserSchema);
 
 // src/utils/extract.ts
@@ -1666,6 +1679,238 @@ function createAuthRouter(options = {}) {
     const user = await OrgUser.find({ projectId: req.query.projectId }).lean();
     res.json(user || null);
   });
+  r.get("/get-users-by-pagination", async (req, res) => {
+    try {
+      const projectId = String(req.query.projectId || "");
+      if (!projectId) {
+        return res.status(400).json({
+          ok: false,
+          error: "projectId is required"
+        });
+      }
+      const page = Math.max(
+        1,
+        parseInt(String(req.query.page || "1"), 10) || 1
+      );
+      const limit = Math.min(
+        200,
+        Math.max(1, parseInt(String(req.query.limit || "20"), 10) || 20)
+      );
+      const skip = (page - 1) * limit;
+      const allowedSortFields = [
+        "createdAt",
+        "updatedAt",
+        "email",
+        "firstName",
+        "lastName",
+        "status"
+      ];
+      const sortBy = allowedSortFields.includes(String(req.query.sortBy || "")) ? String(req.query.sortBy) : "createdAt";
+      const sortOrder = String(req.query.sortOrder || "desc").toLowerCase() === "asc" ? 1 : -1;
+      const sortObj = { [sortBy]: sortOrder };
+      const allowedDateFields = ["createdAt", "updatedAt"];
+      const dateField = allowedDateFields.includes(
+        String(req.query.dateField || "")
+      ) ? String(req.query.dateField) : "createdAt";
+      const baseQuery = { projectId };
+      if (req.query.emailVerified !== void 0) {
+        const emailVerified = String(req.query.emailVerified).toLowerCase();
+        if (emailVerified === "true" || emailVerified === "false") {
+          baseQuery.emailVerified = emailVerified === "true";
+        }
+      }
+      if (req.query.from || req.query.to) {
+        const dateFilter = {};
+        if (req.query.from) {
+          const fromDate = new Date(String(req.query.from));
+          if (!isNaN(fromDate.getTime())) {
+            dateFilter.$gte = fromDate;
+          }
+        }
+        if (req.query.to) {
+          const toDate = new Date(String(req.query.to));
+          if (!isNaN(toDate.getTime())) {
+            dateFilter.$lte = toDate;
+          }
+        }
+        if (Object.keys(dateFilter).length > 0) {
+          baseQuery[dateField] = dateFilter;
+        }
+      }
+      if (req.query.email) {
+        const emailSearch = escapeRegex(String(req.query.email));
+        baseQuery.email = { $regex: emailSearch, $options: "i" };
+      }
+      if (req.query.userId) {
+        const userId = String(req.query.userId).trim();
+        if (userId) {
+          baseQuery.id = userId;
+        }
+      }
+      if (req.query.status !== void 0) {
+        const statusValue = String(req.query.status).toLowerCase().trim();
+        if (statusValue === "true" || statusValue === "pending") {
+          baseQuery.metadata = {
+            $elemMatch: {
+              key: "inWaitlist",
+              value: true
+            }
+          };
+        } else if (statusValue === "false" || statusValue === "active") {
+          baseQuery.metadata = {
+            $elemMatch: {
+              key: "inWaitlist",
+              value: false
+            }
+          };
+        }
+      }
+      const projection = {
+        id: 1,
+        email: 1,
+        firstName: 1,
+        lastName: 1,
+        orgId: 1,
+        projectId: 1,
+        roles: 1,
+        emailVerified: 1,
+        status: 1,
+        lastEmailSent: 1,
+        lastPasswordReset: 1,
+        metadata: 1,
+        createdAt: 1,
+        updatedAt: 1
+      };
+      if (req.query.name) {
+        const nameSearch = escapeRegex(String(req.query.name));
+        const nameRegex = { $regex: nameSearch, $options: "i" };
+        const pipeline = [
+          { $match: baseQuery },
+          {
+            $addFields: {
+              fullName: {
+                $concat: [
+                  { $ifNull: ["$firstName", ""] },
+                  " ",
+                  { $ifNull: ["$lastName", ""] }
+                ]
+              }
+            }
+          },
+          {
+            $match: {
+              $or: [
+                { firstName: nameRegex },
+                { lastName: nameRegex },
+                { fullName: nameRegex }
+              ]
+            }
+          },
+          {
+            $facet: {
+              data: [
+                { $sort: sortObj },
+                { $skip: skip },
+                { $limit: limit },
+                { $project: projection }
+              ],
+              total: [{ $count: "count" }]
+            }
+          }
+        ];
+        const result = await OrgUser.aggregate(pipeline);
+        const data2 = result[0]?.data || [];
+        const total2 = result[0]?.total[0]?.count || 0;
+        const totalPages2 = Math.ceil(total2 / limit);
+        return res.json({
+          ok: true,
+          page,
+          limit,
+          total: total2,
+          totalPages: totalPages2,
+          data: data2
+        });
+      }
+      const [data, total] = await Promise.all([
+        OrgUser.find(baseQuery).select(projection).sort(sortObj).skip(skip).limit(limit).lean(),
+        OrgUser.countDocuments(baseQuery)
+      ]);
+      const totalPages = Math.ceil(total / limit);
+      return res.json({
+        ok: true,
+        page,
+        limit,
+        total,
+        totalPages,
+        data
+      });
+    } catch (err) {
+      console.error("Get users by pagination error:", err);
+      return res.status(500).json({
+        ok: false,
+        error: "Internal server error"
+      });
+    }
+  });
+  r.get("/users/:userId", async (req, res) => {
+    try {
+      const userId = String(req.params.userId || "").trim();
+      if (!userId) {
+        return res.status(400).json({
+          ok: false,
+          error: "userId is required"
+        });
+      }
+      const projectId = String(req.query.projectId || "").trim() || process.env.PROJECTID || "";
+      if (!projectId) {
+        return res.status(400).json({
+          ok: false,
+          error: "projectId is required"
+        });
+      }
+      const projection = {
+        id: 1,
+        email: 1,
+        firstName: 1,
+        lastName: 1,
+        orgId: 1,
+        projectId: 1,
+        roles: 1,
+        emailVerified: 1,
+        lastEmailSent: 1,
+        lastPasswordReset: 1,
+        metadata: 1,
+        createdAt: 1,
+        updatedAt: 1
+      };
+      let query = { projectId };
+      if (import_mongoose5.default.Types.ObjectId.isValid(userId)) {
+        query = {
+          projectId,
+          $or: [{ _id: new import_mongoose5.default.Types.ObjectId(userId) }, { id: userId }]
+        };
+      } else {
+        query = { projectId, id: userId };
+      }
+      const user = await OrgUser.findOne(query).select(projection).lean();
+      if (!user) {
+        return res.status(404).json({
+          ok: false,
+          error: "User not found"
+        });
+      }
+      return res.json({
+        ok: true,
+        data: user
+      });
+    } catch (err) {
+      console.error("Get user by id error:", err);
+      return res.status(500).json({
+        ok: false,
+        error: "Internal server error"
+      });
+    }
+  });
   return r;
 }
 function setAuthCookies(res, tokens, cookie) {
@@ -1725,6 +1970,9 @@ async function sendRateLimitedEmail({
   await user.save();
   return { rateLimited: false };
 }
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 function generateTokens(user) {
   const accessPayload = {
     sub: user.id.toString(),
@@ -1744,7 +1992,7 @@ function generateTokens(user) {
     expiresIn: "1d"
   });
   const refreshToken = import_jsonwebtoken4.default.sign(
-    { sub: user._id.toString() },
+    { sub: user.id.toString() },
     process.env.JWT_SECRET,
     { expiresIn: "30d" }
   );
@@ -1842,12 +2090,12 @@ var import_express4 = require("express");
 var import_crypto2 = require("crypto");
 
 // src/models/moduleConnection.model.ts
-var import_mongoose5 = __toESM(require("mongoose"), 1);
-var ModuleItemSchema = new import_mongoose5.default.Schema(
+var import_mongoose6 = __toESM(require("mongoose"), 1);
+var ModuleItemSchema = new import_mongoose6.default.Schema(
   { id: { type: String, required: true } },
   { _id: false }
 );
-var ModuleConnectionSchema = new import_mongoose5.default.Schema(
+var ModuleConnectionSchema = new import_mongoose6.default.Schema(
   {
     projectId: { type: String, required: true, index: true },
     modules: {
@@ -1858,14 +2106,14 @@ var ModuleConnectionSchema = new import_mongoose5.default.Schema(
   },
   { timestamps: true, collection: "module_connection" }
 );
-var ModuleConnection = import_mongoose5.default.model(
+var ModuleConnection = import_mongoose6.default.model(
   "ModuleConnection",
   ModuleConnectionSchema
 );
 
 // src/models/project.model.ts
-var import_mongoose6 = __toESM(require("mongoose"), 1);
-var ProjectSchema = new import_mongoose6.default.Schema(
+var import_mongoose7 = __toESM(require("mongoose"), 1);
+var ProjectSchema = new import_mongoose7.default.Schema(
   {
     _id: { type: String, required: true },
     org_id: { type: String, required: true, index: true },
@@ -1875,7 +2123,7 @@ var ProjectSchema = new import_mongoose6.default.Schema(
   },
   { timestamps: true, collection: "projects" }
 );
-var Project = import_mongoose6.default.model("Project", ProjectSchema);
+var Project = import_mongoose7.default.model("Project", ProjectSchema);
 
 // src/services/projects.service.ts
 var ProjectsService = class {
@@ -1962,8 +2210,8 @@ function requireRole(...roles) {
 }
 
 // src/models/permissions.model.ts
-var import_mongoose7 = __toESM(require("mongoose"), 1);
-var PermissionsSchema = new import_mongoose7.Schema(
+var import_mongoose8 = __toESM(require("mongoose"), 1);
+var PermissionsSchema = new import_mongoose8.Schema(
   {
     id: { type: String, required: true, index: true },
     orgId: { type: String, default: null, index: true },
@@ -1978,7 +2226,7 @@ var PermissionsSchema = new import_mongoose7.Schema(
   }
 );
 PermissionsSchema.index({ orgId: 1, key: 1 }, { unique: true });
-var PermissionsModel = import_mongoose7.default.model(
+var PermissionsModel = import_mongoose8.default.model(
   "Permissions",
   PermissionsSchema,
   "permissions"