aaspai-authx 0.0.1 → 0.0.3

package/dist/index.cjs

@@ -335,7 +335,9 @@ function requireAuth() {
     try {
       const apiKey = req.headers["x-api-key"] || req.headers["x-apikey"];
       const userId = req.headers["x-user-id"] || req.headers["x-userId"];
+      console.log(apiKey, "apikey", userId, "userId");
       if (apiKey) {
+        console.log("inside apikey");
         if (apiKey !== process.env.SERVER_API_KEY) {
           return res.status(401).json({ error: "Invalid API key" });
         }
@@ -346,26 +348,28 @@ function requireAuth() {
         if (!user) {
           return res.status(401).json({ error: "User not found" });
         }
-        const session2 = buildSession({
+        const session = buildSession({
           sub: user.id.toString(),
           email: user.email,
           roles: user.roles || []
         });
-        session2.authType = "api-key";
-        session2.projectId = readProjectId(req) || user.projectId || void 0;
-        req.user = session2;
+        session.authType = "api-key";
+        session.projectId = readProjectId(req) || user.projectId || void 0;
+        req.user = session;
         return next();
+      } else {
+        console.log("inside token");
+        const token = extractToken(req);
+        if (!token) {
+          return res.status(401).json({ error: "Missing token" });
+        }
+        const claims = await verifyJwt(token);
+        const session = buildSession(claims);
+        const pid = readProjectId(req);
+        if (pid) session.projectId = pid;
+        req.user = session;
+        next();
       }
-      const token = extractToken(req);
-      if (!token) {
-        return res.status(401).json({ error: "Missing token" });
-      }
-      const claims = await verifyJwt(token);
-      const session = buildSession(claims);
-      const pid = readProjectId(req);
-      if (pid) session.projectId = pid;
-      req.user = session;
-      next();
     } catch (e) {
       res.status(401).json({ error: e?.message || "Unauthorized" });
     }
@@ -378,7 +382,6 @@ function authorize(roles = []) {
     if (!user) {
       return res.status(401).json({ error: "Unauthorized" });
     }
-    console.log(user, "user");
     const have = new Set((user.roles || []).map(String));
     const ok = roles.some((r) => have.has(r));
     if (!ok) {
@@ -2002,27 +2005,44 @@ var AuthXSessionDecorator = (0, import_common4.createParamDecorator)(
 var import_passport2 = require("passport");
 var AuthXStrategy = class extends import_passport2.Strategy {
   name = "authx";
-  authenticate(req) {
+  async authenticate(req) {
     try {
-      console.log("AuthXStrategy.authenticate - starting");
-      const token = extractToken(req);
-      console.log("AuthXStrategy.authenticate - token extracted:", token ? "yes" : "no");
-      if (!token) {
-        console.log("AuthXStrategy.authenticate - no token, failing");
-        return this.fail({ message: "Missing token" }, 401);
-      }
-      console.log("AuthXStrategy.authenticate - verifying JWT");
-      verifyJwt(token).then((claims) => {
-        console.log("AuthXStrategy.authenticate - JWT verified successfully");
-        const session = buildSession(claims);
+      const apiKey = req.headers["x-api-key"];
+      const userId = req.headers["x-user-id"];
+      if (apiKey) {
+        if (apiKey !== process.env.SERVER_API_KEY) {
+          return this.fail({ message: "Invalid API key" }, 401);
+        }
+        if (!userId) {
+          return this.fail({ message: "User Id is required" }, 401);
+        }
+        const user = await OrgUser.findOne({
+          id: userId,
+          orgId: process.env.ORG_ID || null
+        });
+        if (!user) {
+          return this.fail({ message: "User not found" }, 401);
+        }
+        const session = buildSession(user);
         req.user = session;
         return this.success(session);
-      }).catch((error) => {
-        console.log("AuthXStrategy.authenticate - JWT verification failed:", error?.message || error);
-        return this.fail({ message: error?.message || "Unauthorized" }, 401);
-      });
+      } else {
+        const token = extractToken(req);
+        if (!token) {
+          return this.fail({ message: "Missing token" }, 401);
+        }
+        verifyJwt(token).then((claims) => {
+          const session = buildSession(claims);
+          req.user = session;
+          return this.success(session);
+        }).catch((error) => {
+          return this.fail(
+            { message: error?.message || "Unauthorized" },
+            401
+          );
+        });
+      }
     } catch (error) {
-      console.log("AuthXStrategy.authenticate - exception caught:", error?.message || error);
       return this.fail({ message: error?.message || "Unauthorized" }, 401);
     }
   }