diff --git a/backend/src/ee/routes/v1/sso.ts b/backend/src/ee/routes/v1/sso.ts index cf949f2f1..fb26e1064 100644 --- a/backend/src/ee/routes/v1/sso.ts +++ b/backend/src/ee/routes/v1/sso.ts @@ -11,8 +11,8 @@ import { ssoController } from "../../controllers/v1"; import { authLimiter } from "../../../helpers/rateLimiter"; import { ACCEPTED, - OWNER, - ADMIN + ADMIN, + OWNER } from "../../../variables"; router.get( diff --git a/backend/src/index.ts b/backend/src/index.ts index 1043b1616..0235e601d 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -35,6 +35,7 @@ import { membership as v1MembershipRouter, organization as v1OrganizationRouter, password as v1PasswordRouter, + secretImport as v1SecretImportRouter, secret as v1SecretRouter, secretScanning as v1SecretScanningRouter, secretsFolder as v1SecretsFolder, @@ -43,8 +44,7 @@ import { userAction as v1UserActionRouter, user as v1UserRouter, webhooks as v1WebhooksRouter, - workspace as v1WorkspaceRouter, - secretImport as v1SecretImportRouter + workspace as v1WorkspaceRouter } from "./routes/v1"; import { auth as v2AuthRouter, diff --git a/backend/src/integrations/apps.ts b/backend/src/integrations/apps.ts index 4ea342c16..dea45ac99 100644 --- a/backend/src/integrations/apps.ts +++ b/backend/src/integrations/apps.ts @@ -13,6 +13,8 @@ import { INTEGRATION_CIRCLECI_API_URL, INTEGRATION_CLOUDFLARE_PAGES, INTEGRATION_CLOUDFLARE_PAGES_API_URL, + INTEGRATION_CODEFRESH, + INTEGRATION_CODEFRESH_API_URL, INTEGRATION_FLYIO, INTEGRATION_FLYIO_API_URL, INTEGRATION_GITHUB, @@ -33,9 +35,7 @@ import { INTEGRATION_TRAVISCI, INTEGRATION_TRAVISCI_API_URL, INTEGRATION_VERCEL, - INTEGRATION_VERCEL_API_URL, - INTEGRATION_CODEFRESH, - INTEGRATION_CODEFRESH_API_URL + INTEGRATION_VERCEL_API_URL } from "../variables"; interface App { diff --git a/backend/src/integrations/sync.ts b/backend/src/integrations/sync.ts index b58a62636..2c2ed8d1f 100644 --- a/backend/src/integrations/sync.ts +++ b/backend/src/integrations/sync.ts @@ -22,6 +22,8 @@ import { INTEGRATION_CIRCLECI_API_URL, INTEGRATION_CLOUDFLARE_PAGES, INTEGRATION_CLOUDFLARE_PAGES_API_URL, + INTEGRATION_CODEFRESH, + INTEGRATION_CODEFRESH_API_URL, INTEGRATION_FLYIO, INTEGRATION_FLYIO_API_URL, INTEGRATION_GITHUB, @@ -43,9 +45,7 @@ import { INTEGRATION_TRAVISCI, INTEGRATION_TRAVISCI_API_URL, INTEGRATION_VERCEL, - INTEGRATION_VERCEL_API_URL, - INTEGRATION_CODEFRESH, - INTEGRATION_CODEFRESH_API_URL + INTEGRATION_VERCEL_API_URL } from "../variables"; import { standardRequest } from "../config/request"; @@ -182,34 +182,6 @@ const syncSecrets = async ({ accessToken, }); break; - case INTEGRATION_FLYIO: - await syncSecretsFlyio({ - integration, - secrets, - accessToken, - }); - break; - case INTEGRATION_CIRCLECI: - await syncSecretsCircleCI({ - integration, - secrets, - accessToken, - }); - break; - case INTEGRATION_TRAVISCI: - await syncSecretsTravisCI({ - integration, - secrets, - accessToken, - }); - break; - case INTEGRATION_SUPABASE: - await syncSecretsSupabase({ - integration, - secrets, - accessToken, - }); - break; case INTEGRATION_CHECKLY: await syncSecretsCheckly({ integration, @@ -1942,7 +1914,7 @@ const syncSecretsCloudflarePages = async ({ } ) ) - .data.result['deployment_configs'][integration.targetEnvironment]['env_vars']; + .data.result["deployment_configs"][integration.targetEnvironment]["env_vars"]; // copy the secrets object, so we can set deleted keys to null const secretsObj: any = { ...secrets }; diff --git a/backend/src/models/integration.ts b/backend/src/models/integration.ts index a7b050a2e..05e089f37 100644 --- a/backend/src/models/integration.ts +++ b/backend/src/models/integration.ts @@ -7,6 +7,7 @@ import { INTEGRATION_CHECKLY, INTEGRATION_CIRCLECI, INTEGRATION_CLOUDFLARE_PAGES, + INTEGRATION_CODEFRESH, INTEGRATION_FLYIO, INTEGRATION_GITHUB, INTEGRATION_GITLAB, @@ -18,8 +19,7 @@ import { INTEGRATION_RENDER, INTEGRATION_SUPABASE, INTEGRATION_TRAVISCI, - INTEGRATION_VERCEL, - INTEGRATION_CODEFRESH + INTEGRATION_VERCEL } from "../variables"; export interface IIntegration { diff --git a/backend/src/models/integrationAuth.ts b/backend/src/models/integrationAuth.ts index 4908ee2bd..409249bf3 100644 --- a/backend/src/models/integrationAuth.ts +++ b/backend/src/models/integrationAuth.ts @@ -9,6 +9,7 @@ import { INTEGRATION_BITBUCKET, INTEGRATION_CIRCLECI, INTEGRATION_CLOUDFLARE_PAGES, + INTEGRATION_CODEFRESH, INTEGRATION_FLYIO, INTEGRATION_GITHUB, INTEGRATION_GITLAB, @@ -20,8 +21,7 @@ import { INTEGRATION_RENDER, INTEGRATION_SUPABASE, INTEGRATION_TRAVISCI, - INTEGRATION_VERCEL, - INTEGRATION_CODEFRESH + INTEGRATION_VERCEL } from "../variables"; export interface IIntegrationAuth extends Document { diff --git a/backend/src/utils/aes-gcm.ts b/backend/src/utils/aes-gcm.ts index 4457616a6..21734611b 100644 --- a/backend/src/utils/aes-gcm.ts +++ b/backend/src/utils/aes-gcm.ts @@ -4,8 +4,6 @@ const ALGORITHM = "aes-256-gcm"; const BLOCK_SIZE_BYTES = 16; export default class AesGCM { - constructor() {} - static encrypt( text: string, secret: string diff --git a/backend/src/utils/auth.ts b/backend/src/utils/auth.ts index aebafa5a3..dccd5b5e4 100644 --- a/backend/src/utils/auth.ts +++ b/backend/src/utils/auth.ts @@ -4,11 +4,11 @@ import { Types } from "mongoose"; import { AuthData } from "../interfaces/middleware"; import { AuthProvider, + MembershipOrg, + Organization, ServiceAccount, ServiceTokenData, - User, - Organization, - MembershipOrg + User } from "../models"; import { createToken } from "../helpers/auth"; import { @@ -18,8 +18,8 @@ import { getJwtProviderAuthSecret, } from "../config"; import { getSSOConfigHelper } from "../ee/helpers/organizations"; -import { OrganizationNotFoundError, InternalServerError } from "./errors"; -import { MEMBER, INVITED } from "../variables"; +import { InternalServerError, OrganizationNotFoundError } from "./errors"; +import { INVITED, MEMBER } from "../variables"; import { getSiteURL } from "../config"; // eslint-disable-next-line @typescript-eslint/no-var-requires