@develit-io/backend-sdk 5.39.0 → 5.39.2

package/dist/index.d.mts

@@ -66,6 +66,8 @@ declare const idempotency: <T extends {
 
 declare const jwt: <TAuthService, TJwtPayload>() => MiddlewareHandler;
 
+declare const ip: <TOrganizationService, TJwtPayload>() => MiddlewareHandler;
+
 declare const logger: () => MiddlewareHandler;
 
 declare const ENVIRONMENT: string[];
@@ -523,5 +525,5 @@ interface WithRetryCounterOptions {
 type AsyncMethod<TArgs extends unknown[] = unknown[], TResult = unknown> = (...args: TArgs) => Promise<TResult>;
 declare function cloudflareQueue<TArgs extends unknown[] = unknown[], TResult = unknown>(options: WithRetryCounterOptions): (target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<AsyncMethod<TArgs, TResult>>) => void;
 
-export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, bankAccount, bankAccountMetadataSchema, base, bicSchema, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInternalError, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, handleActionResponse, ibanSchema, idempotency, isInternalError, jwt, logger, paginationQuerySchema, paginationSchema, service, useFetch, useResult, useResultSync, uuidv4 };
+export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, bankAccount, bankAccountMetadataSchema, base, bicSchema, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInternalError, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, handleActionResponse, ibanSchema, idempotency, ip, isInternalError, jwt, logger, paginationQuerySchema, paginationSchema, service, useFetch, useResult, useResultSync, uuidv4 };
 export type { ActionExecution, ActionHandlerOptions, AuditLogWriter, AuthUser, BankAccountMetadata, BaseEvent, Command, CommandLogPayload, DevelitWorkerMethods, Environment, GatewayResponse, IRPCResponse, IdempotencyVariables, IncludeRelation, InferResultType, InternalError, InternalErrorResponseStatus, Project, UserRole, UserVariables, ValidatedInput };

package/dist/index.d.ts

@@ -66,6 +66,8 @@ declare const idempotency: <T extends {
 
 declare const jwt: <TAuthService, TJwtPayload>() => MiddlewareHandler;
 
+declare const ip: <TOrganizationService, TJwtPayload>() => MiddlewareHandler;
+
 declare const logger: () => MiddlewareHandler;
 
 declare const ENVIRONMENT: string[];
@@ -523,5 +525,5 @@ interface WithRetryCounterOptions {
 type AsyncMethod<TArgs extends unknown[] = unknown[], TResult = unknown> = (...args: TArgs) => Promise<TResult>;
 declare function cloudflareQueue<TArgs extends unknown[] = unknown[], TResult = unknown>(options: WithRetryCounterOptions): (target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<AsyncMethod<TArgs, TResult>>) => void;
 
-export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, bankAccount, bankAccountMetadataSchema, base, bicSchema, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInternalError, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, handleActionResponse, ibanSchema, idempotency, isInternalError, jwt, logger, paginationQuerySchema, paginationSchema, service, useFetch, useResult, useResultSync, uuidv4 };
+export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, bankAccount, bankAccountMetadataSchema, base, bicSchema, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInternalError, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, handleActionResponse, ibanSchema, idempotency, ip, isInternalError, jwt, logger, paginationQuerySchema, paginationSchema, service, useFetch, useResult, useResultSync, uuidv4 };
 export type { ActionExecution, ActionHandlerOptions, AuditLogWriter, AuthUser, BankAccountMetadata, BaseEvent, Command, CommandLogPayload, DevelitWorkerMethods, Environment, GatewayResponse, IRPCResponse, IdempotencyVariables, IncludeRelation, InferResultType, InternalError, InternalErrorResponseStatus, Project, UserRole, UserVariables, ValidatedInput };

package/dist/index.mjs

@@ -2,6 +2,7 @@ import { sql } from 'drizzle-orm';
 import { integer, text } from 'drizzle-orm/sqlite-core';
 import { COUNTRY_CODES_2, CURRENCY_CODES, BANK_CODES } from '@develit-io/general-codes';
 import { createMiddleware } from 'hono/factory';
+import { HTTPException } from 'hono/http-exception';
 import { createError } from 'h3';
 import { z as z$1 } from 'zod';
 import 'cloudflare';
@@ -70,21 +71,16 @@ const idempotency = () => {
   return createMiddleware(async (context, next) => {
     const idempotencyKeyHeader = context.req.header("X-Idempotency-Key");
     if (!idempotencyKeyHeader) {
-      return context.json(
-        {
-          message: `The 'X-Idempotency-Key' header must exist and must have a value.`
-        },
-        401
-      );
+      throw new HTTPException(401, {
+        message: `The 'X-Idempotency-Key' header must exist and must have a value.`
+      });
     }
     const existingIdempotencyRecord = await context.env.IDEMPOTENCY_KV.get(idempotencyKeyHeader);
-    if (existingIdempotencyRecord)
-      return context.json(
-        {
-          message: "The identical request has already been processed. The idempotency key is not unique."
-        },
-        409
-      );
+    if (existingIdempotencyRecord) {
+      throw new HTTPException(409, {
+        message: "The identical request has already been processed. The idempotency key is not unique."
+      });
+    }
     await context.env.IDEMPOTENCY_KV.put(
       idempotencyKeyHeader,
       idempotencyKeyHeader,
@@ -497,52 +493,37 @@ const jwt = () => {
   return createMiddleware(async (context, next) => {
     const authorizationHeader = context.req.header("Authorization");
     if (!authorizationHeader) {
-      return context.json(
-        {
-          message: `The 'Authorization' header must exist and must have a value.`
-        },
-        401
-      );
+      throw new HTTPException(401, {
+        message: `The 'Authorization' header must exist and must have a value.`
+      });
     }
     if (!validateBearerScheme(authorizationHeader)) {
-      return context.json(
-        {
-          message: `The 'Authorization' header value must use the Bearer scheme.`
-        },
-        401
-      );
+      throw new HTTPException(401, {
+        message: `The 'Authorization' header value must use the Bearer scheme.`
+      });
     }
     const bearerToken = extractBearerToken(authorizationHeader);
     if (!validateBearerToken(bearerToken)) {
-      return context.json(
-        {
-          message: `The Bearer token in the 'Authorization' header value must be a JWT.`
-        },
-        401
-      );
+      throw new HTTPException(401, {
+        message: `The Bearer token in the 'Authorization' header value must be a JWT.`
+      });
     }
     const authService = context.env.AUTH_SERVICE;
     const { data, error } = await authService.verifyAccessToken({
       accessToken: bearerToken
     });
     if (!data || error) {
-      return context.json(
-        {
-          message: "The JWT must contain valid user information."
-        },
-        401
-      );
+      throw new HTTPException(401, {
+        message: "The JWT must contain valid user information."
+      });
     }
     const rawUserMetaDataString = data.payload.user.rawUserMetaData;
     const rawUserMetaData = rawUserMetaDataString ? JSON.parse(rawUserMetaDataString) : null;
     const organizationId = rawUserMetaData?.organizationId ?? null;
     if (!organizationId) {
-      return context.json(
-        {
-          message: "User data integrity check failed."
-        },
-        422
-      );
+      throw new HTTPException(422, {
+        message: "User data integrity check failed."
+      });
     }
     context.set("user", {
       email: data.payload.user.email,
@@ -554,6 +535,41 @@ const jwt = () => {
   });
 };
 
+const ip = () => {
+  return createMiddleware(async (context, 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."
+      });
+    }
+    console.log(context.env.ENVIRONMENT);
+    if (organization.payload.organization.ipAuthorization && context.env.ENVIRONMENT !== "localhost") {
+      if (!organization.payload.organization.authorizedIps.map((ip2) => ip2.ip).includes(requestIp)) {
+        throw new HTTPException(404, {
+          message: "Forbidden"
+        });
+      }
+    }
+    await next();
+  });
+};
+
 const composeRequestLog = async (request) => {
   return {
     method: request.method,
@@ -831,4 +847,4 @@ function develitWorker(Worker) {
   return DevelitWorker;
 }
 
-export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, bankAccount, bankAccountMetadataSchema, base, bicSchema, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInternalError, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, handleActionResponse, ibanSchema, idempotency, isInternalError, jwt, logger, paginationQuerySchema, paginationSchema, service, useFetch, useResult, useResultSync, uuidv4 };
+export { DatabaseTransaction, ENVIRONMENT, RPCResponse, USER_ROLES, action, bankAccount, bankAccountMetadataSchema, base, bicSchema, calculateExponentialBackoff, cloudflareQueue, composeWranglerBase, createAuditLogWriter, createInternalError, defineCommand, derivePortFromId, develitWorker, durableObjectNamespaceIdFromName, first, firstOrError, getD1Credentials, getD1DatabaseIdFromWrangler, getDrizzleD1Config, getSecret, handleAction, handleActionResponse, ibanSchema, idempotency, ip, isInternalError, jwt, logger, paginationQuerySchema, paginationSchema, service, useFetch, useResult, useResultSync, uuidv4 };

package/package.json

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