feat: updated backend to new data structure for org

backend/src/server/routes/index.ts

@@ -28,9 +28,8 @@ import { dynamicSecretLeaseServiceFactory } from "@app/ee/services/dynamic-secre
 import { externalKmsDALFactory } from "@app/ee/services/external-kms/external-kms-dal";
 import { externalKmsServiceFactory } from "@app/ee/services/external-kms/external-kms-service";
 import { gatewayDALFactory } from "@app/ee/services/gateway/gateway-dal";
-import { gatewayInstanceConfigDALFactory } from "@app/ee/services/gateway/gateway-instance-config-dal";
 import { gatewayServiceFactory } from "@app/ee/services/gateway/gateway-service";
-import { orgGatewayRootCaDALFactory } from "@app/ee/services/gateway/org-gateway-root-ca-dal";
+import { orgGatewayConfigDALFactory } from "@app/ee/services/gateway/org-gateway-config-dal";
 import { groupDALFactory } from "@app/ee/services/group/group-dal";
 import { groupServiceFactory } from "@app/ee/services/group/group-service";
 import { userGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";
@@ -397,8 +396,7 @@ export const registerRoutes = async (
   const kmipOrgConfigDAL = kmipOrgConfigDALFactory(db);
   const kmipOrgServerCertificateDAL = kmipOrgServerCertificateDALFactory(db);
 
-  const gatewayInstanceConfigDAL = gatewayInstanceConfigDALFactory(db);
-  const orgGatewayRootCaDAL = orgGatewayRootCaDALFactory(db);
+  const orgGatewayConfigDAL = orgGatewayConfigDALFactory(db);
   const gatewayDAL = gatewayDALFactory(db);
 
   const permissionService = permissionServiceFactory({
@@ -639,7 +637,6 @@ export const registerRoutes = async (
     authService: loginService,
     serverCfgDAL: superAdminDAL,
     kmsRootConfigDAL,
-    gatewayInstanceConfigDAL,
     orgService,
     keyStore,
     licenseService,
@@ -1467,11 +1464,11 @@ export const registerRoutes = async (
   });
 
   const gatewayService = gatewayServiceFactory({
-    orgGatewayRootCaDAL,
     permissionService,
     gatewayDAL,
     kmsService,
-    licenseService
+    licenseService,
+    orgGatewayConfigDAL
   });
 
   await superAdminService.initServerCfg();

backend/src/server/routes/v1/admin-router.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { GatewayInstanceConfigSchema, OrganizationsSchema, SuperAdminSchema, UsersSchema } from "@app/db/schemas";
+import { OrganizationsSchema, SuperAdminSchema, UsersSchema } from "@app/db/schemas";
 import { getConfig } from "@app/lib/config/env";
 import { BadRequestError } from "@app/lib/errors";
 import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
@@ -12,13 +12,6 @@ import { getServerCfg } from "@app/services/super-admin/super-admin-service";
 import { LoginMethod } from "@app/services/super-admin/super-admin-types";
 import { PostHogEventTypes } from "@app/services/telemetry/telemetry-types";
 
-const SanitizedInstanceGatewaySchema = GatewayInstanceConfigSchema.pick({
-  isDisabled: true,
-  infisicalClientCaIssuedAt: true,
-  infisicalClientCaSerialNumber: true,
-  caKeyAlgorithm: true
-});
-
 export const registerAdminRouter = async (server: FastifyZodProvider) => {
   server.route({
     method: "GET",
@@ -254,82 +247,6 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
     }
   });
 
-  server.route({
-    method: "POST",
-    url: "/gateway",
-    config: {
-      rateLimit: writeLimit
-    },
-    schema: {
-      response: {
-        200: z.object({
-          message: z.string()
-        })
-      }
-    },
-    onRequest: (req, res, done) => {
-      verifyAuth([AuthMode.JWT])(req, res, () => {
-        verifySuperAdmin(req, res, done);
-      });
-    },
-    handler: async () => {
-      await server.services.superAdmin.setupInstanceGateway();
-      return { message: "Gateway setup completed" };
-    }
-  });
-
-  server.route({
-    method: "PATCH",
-    url: "/gateway",
-    config: {
-      rateLimit: writeLimit
-    },
-    schema: {
-      body: z.object({
-        isDisabled: z.boolean().optional()
-      }),
-      response: {
-        200: z.object({
-          message: z.string(),
-          gateway: SanitizedInstanceGatewaySchema
-        })
-      }
-    },
-    onRequest: (req, res, done) => {
-      verifyAuth([AuthMode.JWT])(req, res, () => {
-        verifySuperAdmin(req, res, done);
-      });
-    },
-    handler: async (req) => {
-      const gateway = await server.services.superAdmin.updateInstanceGateway(req.body);
-      return { message: "Gateway updated Successfully.", gateway };
-    }
-  });
-
-  server.route({
-    method: "GET",
-    url: "/gateway",
-    config: {
-      rateLimit: readLimit
-    },
-    schema: {
-      response: {
-        200: z.object({
-          gateway: SanitizedInstanceGatewaySchema
-        })
-      }
-    },
-    onRequest: (req, res, done) => {
-      verifyAuth([AuthMode.JWT])(req, res, () => {
-        verifySuperAdmin(req, res, done);
-      });
-    },
-    handler: async () => {
-      const gateway = await server.services.superAdmin.getInstanceGateway();
-      return { gateway };
-    }
-  });
-
   server.route({
     method: "POST",
     url: "/signup",