feat: addressed all review comments

backend/src/@types/fastify.d.ts

@@ -162,7 +162,7 @@ declare module "fastify" {
     };
     // identity injection. depending on which kinda of token the information is filled in auth
     auth: TAuthMode;
-    isPrimaryForwardingMode: boolean;
+    shouldForwardWritesToPrimaryInstance: boolean;
     permission: {
       authMethod: ActorAuthMethod;
       type: ActorType;

backend/src/lib/config/env.ts

@@ -218,7 +218,7 @@ const envSchema = z
     ),
     PARAMS_FOLDER_SECRET_DETECTION_ENTROPY: z.coerce.number().optional().default(3.7),
 
-    INFISICAL_PRIMARY_URL: zpStr(z.string().optional()),
+    INFISICAL_PRIMARY_INSTANCE_URL: zpStr(z.string().optional()),
 
     // HSM
     HSM_LIB_PATH: zpStr(z.string().optional()),

backend/src/server/plugins/auth/inject-identity.ts

@@ -107,13 +107,14 @@ export const extractAuth = async (req: FastifyRequest, jwtSecret: string) => {
 };
 
 // ! Important: You can only 100% count on the `req.permission.orgId` field being present when the auth method is Identity Access Token (Machine Identity).
-export const injectIdentity = fp(async (server: FastifyZodProvider, opt: { isPrimaryForwardingMode?: boolean }) => {
+export const injectIdentity = fp(
+  async (server: FastifyZodProvider, opt: { shouldForwardWritesToPrimaryInstance?: boolean }) => {
     server.decorateRequest("auth", null);
-  server.decorateRequest("isPrimaryForwardingMode", Boolean(opt.isPrimaryForwardingMode));
+    server.decorateRequest("shouldForwardWritesToPrimaryInstance", Boolean(opt.shouldForwardWritesToPrimaryInstance));
     server.addHook("onRequest", async (req) => {
       const appCfg = getConfig();
 
-    if (opt.isPrimaryForwardingMode && req.method !== "GET") {
+      if (opt.shouldForwardWritesToPrimaryInstance && req.method !== "GET") {
         return;
       }
 
@@ -218,4 +219,5 @@ export const injectIdentity = fp(async (server: FastifyZodProvider, opt: { isPri
           throw new BadRequestError({ message: "Invalid token strategy provided" });
       }
     });
-});
+  }
+);

backend/src/server/plugins/auth/verify-auth.ts

@@ -10,7 +10,7 @@ interface TAuthOptions {
 export const verifyAuth =
   <T extends FastifyRequest>(authStrategies: AuthMode[], options: TAuthOptions = { requireOrg: true }) =>
   (req: T, _res: FastifyReply, done: HookHandlerDoneFunction) => {
-    if (req.isPrimaryForwardingMode && req.method !== "GET") {
+    if (req.shouldForwardWritesToPrimaryInstance && req.method !== "GET") {
       return done();
     }
 

backend/src/server/plugins/primary-forwarding-mode.ts

@@ -1,7 +1,7 @@
 import replyFrom from "@fastify/reply-from";
 import fp from "fastify-plugin";
 
-export const primaryForwardingMode = fp(async (server, opt: { primaryUrl: string }) => {
+export const forwardWritesToPrimary = fp(async (server, opt: { primaryUrl: string }) => {
   await server.register(replyFrom, {
     base: opt.primaryUrl
   });

backend/src/server/routes/index.ts

@@ -312,7 +312,7 @@ import { injectAssumePrivilege } from "../plugins/auth/inject-assume-privilege";
 import { injectIdentity } from "../plugins/auth/inject-identity";
 import { injectPermission } from "../plugins/auth/inject-permission";
 import { injectRateLimits } from "../plugins/inject-rate-limits";
-import { primaryForwardingMode } from "../plugins/primary-forwarding-mode";
+import { forwardWritesToPrimary } from "../plugins/primary-forwarding-mode";
 import { registerV1Routes } from "./v1";
 import { initializeOauthConfigSync } from "./v1/sso-router";
 import { registerV2Routes } from "./v2";
@@ -2147,14 +2147,14 @@ export const registerRoutes = async (
     user: userDAL,
     kmipClient: kmipClientDAL
   });
-  const isPrimaryForwardingMode = Boolean(envConfig.INFISICAL_PRIMARY_URL);
-  if (isPrimaryForwardingMode) {
-    logger.info(`Infisical primary instance is configured: ${envConfig.INFISICAL_PRIMARY_URL}`);
+  const shouldForwardWritesToPrimaryInstance = Boolean(envConfig.INFISICAL_PRIMARY_INSTANCE_URL);
+  if (shouldForwardWritesToPrimaryInstance) {
+    logger.info(`Infisical primary instance is configured: ${envConfig.INFISICAL_PRIMARY_INSTANCE_URL}`);
 
-    await server.register(primaryForwardingMode, { primaryUrl: envConfig.INFISICAL_PRIMARY_URL as string });
+    await server.register(forwardWritesToPrimary, { primaryUrl: envConfig.INFISICAL_PRIMARY_INSTANCE_URL as string });
   }
 
-  await server.register(injectIdentity, { isPrimaryForwardingMode });
+  await server.register(injectIdentity, { shouldForwardWritesToPrimaryInstance });
   await server.register(injectAssumePrivilege);
   await server.register(injectPermission);
   await server.register(injectRateLimits);