From 2c237ee2775796c634397336b836d4eca194c591 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Tue, 18 Jun 2024 00:53:56 +0800 Subject: [PATCH] feat: moved oidc to ee directory --- backend/src/@types/fastify.d.ts | 2 +- backend/src/ee/routes/v1/index.ts | 2 ++ .../{server => ee}/routes/v1/oidc-router.ts | 4 ++-- .../{ => ee}/services/oidc/oidc-config-dal.ts | 0 .../services/oidc/oidc-config-service.ts | 22 +++++++++---------- .../services/oidc/oidc-config-types.ts | 0 backend/src/server/routes/index.ts | 4 ++-- backend/src/server/routes/v1/index.ts | 2 -- 8 files changed, 18 insertions(+), 18 deletions(-) rename backend/src/{server => ee}/routes/v1/oidc-router.ts (98%) rename backend/src/{ => ee}/services/oidc/oidc-config-dal.ts (100%) rename backend/src/{ => ee}/services/oidc/oidc-config-service.ts (95%) rename backend/src/{ => ee}/services/oidc/oidc-config-types.ts (100%) diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.ts index 06cca28b3..80080f6c5 100644 --- a/backend/src/@types/fastify.d.ts +++ b/backend/src/@types/fastify.d.ts @@ -12,6 +12,7 @@ import { TGroupServiceFactory } from "@app/ee/services/group/group-service"; import { TIdentityProjectAdditionalPrivilegeServiceFactory } from "@app/ee/services/identity-project-additional-privilege/identity-project-additional-privilege-service"; import { TLdapConfigServiceFactory } from "@app/ee/services/ldap-config/ldap-config-service"; import { TLicenseServiceFactory } from "@app/ee/services/license/license-service"; +import { TOidcConfigServiceFactory } from "@app/ee/services/oidc/oidc-config-service"; import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service"; import { TProjectUserAdditionalPrivilegeServiceFactory } from "@app/ee/services/project-user-additional-privilege/project-user-additional-privilege-service"; import { TSamlConfigServiceFactory } from "@app/ee/services/saml-config/saml-config-service"; @@ -40,7 +41,6 @@ import { TIdentityProjectServiceFactory } from "@app/services/identity-project/i import { TIdentityUaServiceFactory } from "@app/services/identity-ua/identity-ua-service"; import { TIntegrationServiceFactory } from "@app/services/integration/integration-service"; import { TIntegrationAuthServiceFactory } from "@app/services/integration-auth/integration-auth-service"; -import { TOidcConfigServiceFactory } from "@app/services/oidc/oidc-config-service"; import { TOrgRoleServiceFactory } from "@app/services/org/org-role-service"; import { TOrgServiceFactory } from "@app/services/org/org-service"; import { TProjectServiceFactory } from "@app/services/project/project-service"; diff --git a/backend/src/ee/routes/v1/index.ts b/backend/src/ee/routes/v1/index.ts index 16e23eb88..de59c22aa 100644 --- a/backend/src/ee/routes/v1/index.ts +++ b/backend/src/ee/routes/v1/index.ts @@ -7,6 +7,7 @@ import { registerGroupRouter } from "./group-router"; import { registerIdentityProjectAdditionalPrivilegeRouter } from "./identity-project-additional-privilege-router"; import { registerLdapRouter } from "./ldap-router"; import { registerLicenseRouter } from "./license-router"; +import { registerOidcRouter } from "./oidc-router"; import { registerOrgRoleRouter } from "./org-role-router"; import { registerProjectRoleRouter } from "./project-role-router"; import { registerProjectRouter } from "./project-router"; @@ -55,6 +56,7 @@ export const registerV1EERoutes = async (server: FastifyZodProvider) => { ); await server.register(registerSamlRouter, { prefix: "/sso" }); + await server.register(registerOidcRouter, { prefix: "/oidc" }); await server.register(registerScimRouter, { prefix: "/scim" }); await server.register(registerLdapRouter, { prefix: "/ldap" }); await server.register(registerSecretScanningRouter, { prefix: "/secret-scanning" }); diff --git a/backend/src/server/routes/v1/oidc-router.ts b/backend/src/ee/routes/v1/oidc-router.ts similarity index 98% rename from backend/src/server/routes/v1/oidc-router.ts rename to backend/src/ee/routes/v1/oidc-router.ts index 05c2bd90e..49d1d5223 100644 --- a/backend/src/server/routes/v1/oidc-router.ts +++ b/backend/src/ee/routes/v1/oidc-router.ts @@ -33,13 +33,13 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => { url: "/login", method: "GET", schema: { - params: z.object({ + querystring: z.object({ orgSlug: z.string().trim() }) }, handler: async (req, res) => { // get params, save to session - const { orgSlug } = req.params; + const { orgSlug } = req.query; req.session.set("oidcOrgSlug", orgSlug); const oidcStrategy = await server.services.oidc.getOrgAuthStrategy(orgSlug); ( diff --git a/backend/src/services/oidc/oidc-config-dal.ts b/backend/src/ee/services/oidc/oidc-config-dal.ts similarity index 100% rename from backend/src/services/oidc/oidc-config-dal.ts rename to backend/src/ee/services/oidc/oidc-config-dal.ts diff --git a/backend/src/services/oidc/oidc-config-service.ts b/backend/src/ee/services/oidc/oidc-config-service.ts similarity index 95% rename from backend/src/services/oidc/oidc-config-service.ts rename to backend/src/ee/services/oidc/oidc-config-service.ts index d80b506d2..049dee52b 100644 --- a/backend/src/services/oidc/oidc-config-service.ts +++ b/backend/src/ee/services/oidc/oidc-config-service.ts @@ -18,18 +18,18 @@ import { infisicalSymmetricEncypt } from "@app/lib/crypto/encryption"; import { BadRequestError } from "@app/lib/errors"; +import { AuthMethod, AuthTokenType } from "@app/services/auth/auth-type"; +import { TAuthTokenServiceFactory } from "@app/services/auth-token/auth-token-service"; +import { TokenType } from "@app/services/auth-token/auth-token-types"; +import { TOrgBotDALFactory } from "@app/services/org/org-bot-dal"; +import { TOrgDALFactory } from "@app/services/org/org-dal"; +import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal"; +import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service"; +import { TUserDALFactory } from "@app/services/user/user-dal"; +import { normalizeUsername } from "@app/services/user/user-fns"; +import { TUserAliasDALFactory } from "@app/services/user-alias/user-alias-dal"; +import { UserAliasType } from "@app/services/user-alias/user-alias-types"; -import { AuthMethod, AuthTokenType } from "../auth/auth-type"; -import { TAuthTokenServiceFactory } from "../auth-token/auth-token-service"; -import { TokenType } from "../auth-token/auth-token-types"; -import { TOrgBotDALFactory } from "../org/org-bot-dal"; -import { TOrgDALFactory } from "../org/org-dal"; -import { TOrgMembershipDALFactory } from "../org-membership/org-membership-dal"; -import { SmtpTemplates, TSmtpService } from "../smtp/smtp-service"; -import { TUserDALFactory } from "../user/user-dal"; -import { normalizeUsername } from "../user/user-fns"; -import { TUserAliasDALFactory } from "../user-alias/user-alias-dal"; -import { UserAliasType } from "../user-alias/user-alias-types"; import { TOidcConfigDALFactory } from "./oidc-config-dal"; import { TCreateOidcCfgDTO, TGetOidcCfgDTO, TOidcLoginDTO, TUpdateOidcCfgDTO } from "./oidc-config-types"; diff --git a/backend/src/services/oidc/oidc-config-types.ts b/backend/src/ee/services/oidc/oidc-config-types.ts similarity index 100% rename from backend/src/services/oidc/oidc-config-types.ts rename to backend/src/ee/services/oidc/oidc-config-types.ts diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts index 0bf4d0ae5..925ae5f39 100644 --- a/backend/src/server/routes/index.ts +++ b/backend/src/server/routes/index.ts @@ -30,6 +30,8 @@ import { ldapConfigServiceFactory } from "@app/ee/services/ldap-config/ldap-conf import { ldapGroupMapDALFactory } from "@app/ee/services/ldap-config/ldap-group-map-dal"; import { licenseDALFactory } from "@app/ee/services/license/license-dal"; import { licenseServiceFactory } from "@app/ee/services/license/license-service"; +import { oidcConfigDALFactory } from "@app/ee/services/oidc/oidc-config-dal"; +import { oidcConfigServiceFactory } from "@app/ee/services/oidc/oidc-config-service"; import { permissionDALFactory } from "@app/ee/services/permission/permission-dal"; import { permissionServiceFactory } from "@app/ee/services/permission/permission-service"; import { projectUserAdditionalPrivilegeDALFactory } from "@app/ee/services/project-user-additional-privilege/project-user-additional-privilege-dal"; @@ -101,8 +103,6 @@ import { integrationAuthServiceFactory } from "@app/services/integration-auth/in import { kmsDALFactory } from "@app/services/kms/kms-dal"; import { kmsRootConfigDALFactory } from "@app/services/kms/kms-root-config-dal"; import { kmsServiceFactory } from "@app/services/kms/kms-service"; -import { oidcConfigDALFactory } from "@app/services/oidc/oidc-config-dal"; -import { oidcConfigServiceFactory } from "@app/services/oidc/oidc-config-service"; import { incidentContactDALFactory } from "@app/services/org/incident-contacts-dal"; import { orgBotDALFactory } from "@app/services/org/org-bot-dal"; import { orgDALFactory } from "@app/services/org/org-dal"; diff --git a/backend/src/server/routes/v1/index.ts b/backend/src/server/routes/v1/index.ts index 4b8480cd5..fd8255e63 100644 --- a/backend/src/server/routes/v1/index.ts +++ b/backend/src/server/routes/v1/index.ts @@ -11,7 +11,6 @@ import { registerIdentityUaRouter } from "./identity-ua"; import { registerIntegrationAuthRouter } from "./integration-auth-router"; import { registerIntegrationRouter } from "./integration-router"; import { registerInviteOrgRouter } from "./invite-org-router"; -import { registerOidcRouter } from "./oidc-router"; import { registerOrgRouter } from "./organization-router"; import { registerPasswordRouter } from "./password-router"; import { registerProjectEnvRouter } from "./project-env-router"; @@ -30,7 +29,6 @@ import { registerWebhookRouter } from "./webhook-router"; export const registerV1Routes = async (server: FastifyZodProvider) => { await server.register(registerSsoRouter, { prefix: "/sso" }); - await server.register(registerOidcRouter, { prefix: "/oidc" }); await server.register( async (authRouter) => { await authRouter.register(registerAuthRoutes);