From c753a919584255d7dd5580d2ec4463ed53475597 Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Thu, 28 Mar 2024 12:44:44 -0700 Subject: [PATCH] run linter --- backend/src/@types/fastify.d.ts | 2 +- backend/src/ee/routes/v1/group-router.ts | 10 +++++----- backend/src/ee/routes/v1/index.ts | 2 +- backend/src/server/routes/index.ts | 6 +++--- backend/src/server/routes/v1/organization-router.ts | 2 +- frontend/src/hooks/api/index.tsx | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/src/@types/fastify.d.ts b/backend/src/@types/fastify.d.ts index 801633ecc..3c22cd3c6 100644 --- a/backend/src/@types/fastify.d.ts +++ b/backend/src/@types/fastify.d.ts @@ -3,9 +3,9 @@ import "fastify"; import { TUsers } from "@app/db/schemas"; import { TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-service"; import { TCreateAuditLogDTO } from "@app/ee/services/audit-log/audit-log-types"; -import { TGroupServiceFactory } from "@app/ee/services/group/group-service"; import { TDynamicSecretServiceFactory } from "@app/ee/services/dynamic-secret/dynamic-secret-service"; import { TDynamicSecretLeaseServiceFactory } from "@app/ee/services/dynamic-secret-lease/dynamic-secret-lease-service"; +import { TGroupServiceFactory } from "@app/ee/services/group/group-service"; import { TLdapConfigServiceFactory } from "@app/ee/services/ldap-config/ldap-config-service"; import { TLicenseServiceFactory } from "@app/ee/services/license/license-service"; import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service"; diff --git a/backend/src/ee/routes/v1/group-router.ts b/backend/src/ee/routes/v1/group-router.ts index a386f8380..628d5e696 100644 --- a/backend/src/ee/routes/v1/group-router.ts +++ b/backend/src/ee/routes/v1/group-router.ts @@ -72,7 +72,7 @@ export const registerGroupRouter = async (server: FastifyZodProvider) => { currentSlug: req.params.currentSlug, actor: req.permission.type, actorId: req.permission.id, - orgId: req.permission.orgId as string, // note + orgId: req.permission.orgId, // note actorAuthMethod: req.permission.authMethod, actorOrgId: req.permission.orgId, ...req.body @@ -99,7 +99,7 @@ export const registerGroupRouter = async (server: FastifyZodProvider) => { groupSlug: req.params.groupSlug, actor: req.permission.type, actorId: req.permission.id, - orgId: req.permission.orgId as string, // note + orgId: req.permission.orgId, // note actorAuthMethod: req.permission.authMethod, actorOrgId: req.permission.orgId }); @@ -137,7 +137,7 @@ export const registerGroupRouter = async (server: FastifyZodProvider) => { groupSlug: req.params.slug, actor: req.permission.type, actorId: req.permission.id, - orgId: req.permission.orgId as string, + orgId: req.permission.orgId, actorAuthMethod: req.permission.authMethod, actorOrgId: req.permission.orgId }); @@ -170,7 +170,7 @@ export const registerGroupRouter = async (server: FastifyZodProvider) => { username: req.params.username, actor: req.permission.type, actorId: req.permission.id, - orgId: req.permission.orgId as string, + orgId: req.permission.orgId, actorAuthMethod: req.permission.authMethod, actorOrgId: req.permission.orgId }); @@ -204,7 +204,7 @@ export const registerGroupRouter = async (server: FastifyZodProvider) => { username: req.params.username, actor: req.permission.type, actorId: req.permission.id, - orgId: req.permission.orgId as string, + orgId: req.permission.orgId, actorAuthMethod: req.permission.authMethod, actorOrgId: req.permission.orgId }); diff --git a/backend/src/ee/routes/v1/index.ts b/backend/src/ee/routes/v1/index.ts index 3f050f2c1..95ae58731 100644 --- a/backend/src/ee/routes/v1/index.ts +++ b/backend/src/ee/routes/v1/index.ts @@ -1,6 +1,6 @@ -import { registerGroupRouter } from "./group-router"; import { registerDynamicSecretLeaseRouter } from "./dynamic-secret-lease-router"; import { registerDynamicSecretRouter } from "./dynamic-secret-router"; +import { registerGroupRouter } from "./group-router"; import { registerLdapRouter } from "./ldap-router"; import { registerLicenseRouter } from "./license-router"; import { registerOrgRoleRouter } from "./org-role-router"; diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts index c0630ad48..ca800533d 100644 --- a/backend/src/server/routes/index.ts +++ b/backend/src/server/routes/index.ts @@ -5,15 +5,15 @@ import { registerV1EERoutes } from "@app/ee/routes/v1"; import { auditLogDALFactory } from "@app/ee/services/audit-log/audit-log-dal"; import { auditLogQueueServiceFactory } from "@app/ee/services/audit-log/audit-log-queue"; import { auditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-service"; -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"; import { dynamicSecretDALFactory } from "@app/ee/services/dynamic-secret/dynamic-secret-dal"; import { dynamicSecretServiceFactory } from "@app/ee/services/dynamic-secret/dynamic-secret-service"; import { buildDynamicSecretProviders } from "@app/ee/services/dynamic-secret/providers"; import { dynamicSecretLeaseDALFactory } from "@app/ee/services/dynamic-secret-lease/dynamic-secret-lease-dal"; import { dynamicSecretLeaseQueueServiceFactory } from "@app/ee/services/dynamic-secret-lease/dynamic-secret-lease-queue"; import { dynamicSecretLeaseServiceFactory } from "@app/ee/services/dynamic-secret-lease/dynamic-secret-lease-service"; +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"; import { ldapConfigDALFactory } from "@app/ee/services/ldap-config/ldap-config-dal"; import { ldapConfigServiceFactory } from "@app/ee/services/ldap-config/ldap-config-service"; import { licenseDALFactory } from "@app/ee/services/license/license-dal"; diff --git a/backend/src/server/routes/v1/organization-router.ts b/backend/src/server/routes/v1/organization-router.ts index c015fd899..df6db62b7 100644 --- a/backend/src/server/routes/v1/organization-router.ts +++ b/backend/src/server/routes/v1/organization-router.ts @@ -232,7 +232,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => { const groups = await server.services.org.getOrgGroups({ actor: req.permission.type, actorId: req.permission.id, - orgId: req.permission.orgId as string, + orgId: req.permission.orgId, actorAuthMethod: req.permission.authMethod, actorOrgId: req.permission.orgId }); diff --git a/frontend/src/hooks/api/index.tsx b/frontend/src/hooks/api/index.tsx index ca18cbe88..23c4b89db 100644 --- a/frontend/src/hooks/api/index.tsx +++ b/frontend/src/hooks/api/index.tsx @@ -3,9 +3,9 @@ export * from "./apiKeys"; export * from "./auditLogs"; export * from "./auth"; export * from "./bots"; -export * from "./groups"; export * from "./dynamicSecret"; export * from "./dynamicSecretLease"; +export * from "./groups"; export * from "./identities"; export * from "./incidentContacts"; export * from "./integrationAuth";