misc: addressed review comments

backend/src/server/app.ts

@@ -17,6 +17,8 @@ import { Logger } from "pino";
 import { TKeyStoreFactory } from "@app/keystore/keystore";
 import { getConfig } from "@app/lib/config/env";
 import { TQueueServiceFactory } from "@app/queue";
+import { rateLimitDALFactory } from "@app/services/rate-limit/rate-limit-dal";
+import { rateLimitServiceFactory } from "@app/services/rate-limit/rate-limit-service";
 import { TSmtpService } from "@app/services/smtp/smtp-service";
 
 import { globalRateLimiterCfg } from "./config/rateLimiter";
@@ -69,8 +71,11 @@ export const main = async ({ db, smtp, logger, queue, keyStore }: TMain) => {
 
     // Rate limiters and security headers
     if (appCfg.isProductionMode) {
-      await server.register<FastifyRateLimitOptions>(ratelimiter, await globalRateLimiterCfg(db));
+      const rateLimitDAL = rateLimitDALFactory(db);
+      const rateLimits = await rateLimitServiceFactory({ rateLimitDAL }).getRateLimits();
+      await server.register<FastifyRateLimitOptions>(ratelimiter, globalRateLimiterCfg(rateLimits));
     }
+
     await server.register(helmet, { contentSecurityPolicy: false });
 
     await server.register(maintenanceMode);

backend/src/server/config/rateLimiter.ts

@@ -1,10 +1,8 @@
 import type { RateLimitOptions, RateLimitPluginOptions } from "@fastify/rate-limit";
 import { Redis } from "ioredis";
-import { Knex } from "knex";
 
+import { TRateLimit } from "@app/db/schemas";
 import { getConfig } from "@app/lib/config/env";
-import { rateLimitDALFactory } from "@app/services/rate-limit/rate-limit-dal";
-import { rateLimitServiceFactory } from "@app/services/rate-limit/rate-limit-service";
 
 // GET endpoints
 export const readLimit: RateLimitOptions = {
@@ -63,31 +61,20 @@ export const publicEndpointLimit: RateLimitOptions = {
   keyGenerator: (req) => req.realIp
 };
 
-async function fetchRateLimitsFromDb(db: Knex) {
-  try {
-    const rateLimitDAL = rateLimitDALFactory(db);
-    const rateLimits = await rateLimitServiceFactory({ rateLimitDAL }).getRateLimits();
-
-    readLimit.max = rateLimits.readRateLimit;
-    publicEndpointLimit.max = rateLimits.publicEndpointLimit;
-    writeLimit.max = rateLimits.writeRateLimit;
-    secretsLimit.max = rateLimits.secretsRateLimit;
-    authRateLimit.max = rateLimits.authRateLimit;
-    inviteUserRateLimit.max = rateLimits.inviteUserRateLimit;
-    mfaRateLimit.max = rateLimits.mfaRateLimit;
-    creationLimit.max = rateLimits.creationLimit;
-  } catch (error) {
-    console.error("Error fetching rate limits:", error);
-  }
-}
-
-export const globalRateLimiterCfg = async (db: Knex): Promise<RateLimitPluginOptions> => {
+export const globalRateLimiterCfg = async (rateLimits: TRateLimit): Promise<RateLimitPluginOptions> => {
   const appCfg = getConfig();
   const redis = appCfg.isRedisConfigured
     ? new Redis(appCfg.REDIS_URL, { connectTimeout: 500, maxRetriesPerRequest: 1 })
     : null;
 
-  await fetchRateLimitsFromDb(db);
+  readLimit.max = rateLimits.readRateLimit;
+  publicEndpointLimit.max = rateLimits.publicEndpointLimit;
+  writeLimit.max = rateLimits.writeRateLimit;
+  secretsLimit.max = rateLimits.secretsRateLimit;
+  authRateLimit.max = rateLimits.authRateLimit;
+  inviteUserRateLimit.max = rateLimits.inviteUserRateLimit;
+  mfaRateLimit.max = rateLimits.mfaRateLimit;
+  creationLimit.max = rateLimits.creationLimit;
 
   return {
     timeWindow: 60 * 1000,

backend/src/server/routes/v1/rate-limit-router.ts

@@ -39,10 +39,15 @@ export const registerRateLimitRouter = async (server: FastifyZodProvider) => {
     },
 
     schema: {
-      body: RateLimitSchema.omit({
-        id: true,
-        createdAt: true,
-        updatedAt: true
+      body: z.object({
+        readRateLimit: z.number().optional(),
+        writeRateLimit: z.number().optional(),
+        secretsRateLimit: z.number().optional(),
+        authRateLimit: z.number().optional(),
+        inviteUserRateLimit: z.number().optional(),
+        mfaRateLimit: z.number().optional(),
+        creationLimit: z.number().optional(),
+        publicEndpointLimit: z.number().optional()
       }),
       response: {
         200: z.object({