@develit-io/backend-sdk 5.40.1 → 5.41.0

package/dist/index.mjs

@@ -583,36 +583,35 @@ const jwt = () => {
 
 const ip = () => {
   return createMiddleware(async (context, next) => {
-    if (["localhost", "dev"].includes(context.env.ENVIRONMENT)) {
-      await next();
-    }
-    const requestIp = context.req.header("cf-connecting-ip") || context.req.header("x-forwarded-for");
-    if (!requestIp) {
-      throw new HTTPException(401, {
-        message: "Failed to retrieve request IP address."
-      });
-    }
-    const user = context.get("user");
-    if (!user.organizationId) {
-      throw new HTTPException(401, {
-        message: "Failed to retrieve request organization ID."
-      });
-    }
-    const organizationService = context.env.ORGANIZATION_SERVICE;
-    const { data: organization, error } = await organizationService.getOrganization({
-      organizationId: user.organizationId
-    });
-    if (!organization || error) {
-      throw new HTTPException(404, {
-        message: "Failed to retrieve organization."
+    if (!["localhost", "dev"].includes(context.env.ENVIRONMENT)) {
+      const requestIp = context.req.header("cf-connecting-ip") || context.req.header("x-forwarded-for");
+      if (!requestIp) {
+        throw new HTTPException(401, {
+          message: "Failed to retrieve request IP address."
+        });
+      }
+      const user = context.get("user");
+      if (!user.organizationId) {
+        throw new HTTPException(401, {
+          message: "Failed to retrieve request organization ID."
+        });
+      }
+      const organizationService = context.env.ORGANIZATION_SERVICE;
+      const { data: organization, error } = await organizationService.getOrganization({
+        organizationId: user.organizationId
       });
-    }
-    if (organization.ipAuthorization) {
-      if (!organization.authorizedIps.map((ip2) => ip2.ip).includes(requestIp)) {
+      if (!organization || error) {
         throw new HTTPException(404, {
-          message: "Forbidden"
+          message: "Failed to retrieve organization."
         });
       }
+      if (organization.ipAuthorization) {
+        if (!organization.authorizedIps.map((ip2) => ip2.ip).includes(requestIp)) {
+          throw new HTTPException(404, {
+            message: "Forbidden"
+          });
+        }
+      }
     }
     await next();
   });
@@ -655,54 +654,53 @@ const logger = () => {
 
 const signature = () => {
   return createMiddleware(async (context, next) => {
-    if (["localhost", "dev"].includes(context.env.ENVIRONMENT)) {
-      await next();
-    }
-    const signatureHeader = context.req.header("X-Signature");
-    if (!signatureHeader) {
-      throw new HTTPException(401, {
-        message: `The 'X-Signature' header must exist and must have a value.`
-      });
-    }
-    const signatureKeyHeader = context.req.header("X-Signature-Key");
-    if (!signatureKeyHeader) {
-      throw new HTTPException(401, {
-        message: `The 'X-Signature-Key' header must exist and must have a value.`
-      });
-    }
-    const payload = JSON.stringify(await context.req.json().catch(() => null));
-    const user = context.get("user");
-    if (!user.organizationId) {
-      throw new HTTPException(401, {
-        message: "Failed to retrieve request organization ID."
-      });
-    }
-    const organizationService = context.env.ORGANIZATION_SERVICE;
-    const { data: organization, error } = await organizationService.getOrganization({
-      organizationId: user.organizationId
-    });
-    if (!organization || error) {
-      throw new HTTPException(404, {
-        message: "Failed to retrieve organization."
-      });
-    }
-    const signatureKey = organization.signatureKeys.filter(
-      (signatureKey2) => signatureKey2.name === signatureKeyHeader
-    )[0];
-    if (!signatureKey) {
-      throw new HTTPException(404, {
-        message: "Signature key not found."
+    if (!["localhost", "dev"].includes(context.env.ENVIRONMENT)) {
+      const signatureHeader = context.req.header("X-Signature");
+      if (!signatureHeader) {
+        throw new HTTPException(401, {
+          message: `The 'X-Signature' header must exist and must have a value.`
+        });
+      }
+      const signatureKeyHeader = context.req.header("X-Signature-Key");
+      if (!signatureKeyHeader) {
+        throw new HTTPException(401, {
+          message: `The 'X-Signature-Key' header must exist and must have a value.`
+        });
+      }
+      const payload = JSON.stringify(await context.req.json().catch(() => null));
+      const user = context.get("user");
+      if (!user.organizationId) {
+        throw new HTTPException(401, {
+          message: "Failed to retrieve request organization ID."
+        });
+      }
+      const organizationService = context.env.ORGANIZATION_SERVICE;
+      const { data: organization, error } = await organizationService.getOrganization({
+        organizationId: user.organizationId
       });
-    }
-    const isVerified = await verify({
-      signature: signatureHeader,
-      publicKey: signatureKey.publicKey,
-      data: payload
-    });
-    if (!isVerified) {
-      throw new HTTPException(401, {
-        message: "Invalid signature key or signature."
+      if (!organization || error) {
+        throw new HTTPException(404, {
+          message: "Failed to retrieve organization."
+        });
+      }
+      const signatureKey = organization.signatureKeys.filter(
+        (signatureKey2) => signatureKey2.name === signatureKeyHeader
+      )[0];
+      if (!signatureKey) {
+        throw new HTTPException(404, {
+          message: "Signature key not found."
+        });
+      }
+      const isVerified = await verify({
+        signature: signatureHeader,
+        publicKey: signatureKey.publicKey,
+        data: payload
       });
+      if (!isVerified) {
+        throw new HTTPException(401, {
+          message: "Invalid signature key or signature."
+        });
+      }
     }
     await next();
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-io/backend-sdk",
-  "version": "5.40.1",
+  "version": "5.41.0",
   "description": "Develit Backend SDK",
   "author": "Develit.io",
   "license": "ISC",