From afe042ecfc0ab99f69c856b5e00017ea1ae55b19 Mon Sep 17 00:00:00 2001 From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:25:44 +0530 Subject: [PATCH] fix: member invite issues (#3028) Co-authored-by: Matti Nannt --- apps/web/app/(app)/(onboarding)/organizations/actions.ts | 2 +- .../[environmentId]/surveys/[surveyId]/edit/actions.ts | 2 +- .../[environmentId]/(people)/attributes/actions.ts | 2 +- .../[environmentId]/(people)/people/[personId]/actions.ts | 2 +- .../[environmentId]/(people)/segments/actions.ts | 2 +- apps/web/app/(app)/environments/[environmentId]/actions.ts | 2 +- .../(app)/environments/[environmentId]/actions/actions.ts | 2 +- .../environments/[environmentId]/integrations/actions.ts | 2 +- .../[environmentId]/integrations/slack/actions.ts | 2 +- .../[environmentId]/integrations/webhooks/actions.ts | 2 +- .../(app)/environments/[environmentId]/product/actions.ts | 2 +- .../[environmentId]/product/api-keys/actions.ts | 2 +- .../environments/[environmentId]/product/general/actions.ts | 2 +- .../environments/[environmentId]/product/tags/actions.ts | 2 +- .../[environmentId]/settings/(account)/profile/actions.ts | 2 +- .../settings/(organization)/billing/actions.ts | 2 +- .../settings/(organization)/members/actions.ts | 6 +++--- .../surveys/[surveyId]/(analysis)/actions.ts | 2 +- .../surveys/[surveyId]/(analysis)/summary/actions.ts | 2 +- .../[environmentId]/surveys/[surveyId]/actions.ts | 2 +- .../app/api/v1/client/[environmentId]/responses/route.ts | 2 +- apps/web/app/s/[surveyId]/actions.ts | 2 +- apps/web/app/s/[surveyId]/page.tsx | 2 +- .../setup/organization/[organizationId]/invite/actions.ts | 2 +- apps/web/app/share/[sharingKey]/actions.ts | 2 +- packages/ee/advanced-targeting/lib/actions.ts | 2 +- packages/ee/multi-language/lib/actions.ts | 2 +- packages/ee/role-management/lib/actions.ts | 4 ++-- packages/lib/action/service.ts | 2 +- packages/lib/actionClass/auth.ts | 2 +- packages/lib/actionClass/service.ts | 2 +- packages/lib/apiKey/auth.ts | 2 +- packages/lib/apiKey/service.ts | 2 +- packages/lib/attribute/service.ts | 2 +- packages/lib/attributeClass/auth.ts | 2 +- packages/lib/attributeClass/service.ts | 2 +- packages/lib/display/service.ts | 2 +- packages/lib/environment/auth.ts | 2 +- packages/lib/environment/service.ts | 2 +- packages/lib/integration/auth.ts | 2 +- packages/lib/integration/service.ts | 2 +- packages/lib/language/service.ts | 2 +- packages/lib/organization/auth.ts | 2 +- packages/lib/organization/hooks/actions.ts | 2 +- packages/lib/organization/service.ts | 2 +- packages/lib/person/auth.ts | 2 +- packages/lib/person/service.ts | 2 +- packages/lib/product/auth.ts | 2 +- packages/lib/product/service.ts | 2 +- packages/lib/response/auth.ts | 2 +- packages/lib/response/service.ts | 2 +- packages/lib/responseNote/auth.ts | 2 +- packages/lib/responseNote/service.ts | 2 +- packages/lib/segment/service.ts | 2 +- packages/lib/storage/service.ts | 2 +- packages/lib/survey/auth.ts | 2 +- packages/lib/survey/service.ts | 3 ++- packages/lib/tag/auth.ts | 2 +- packages/lib/tag/service.ts | 2 +- packages/lib/tagOnResponse/auth.ts | 2 +- packages/lib/tagOnResponse/service.ts | 2 +- packages/lib/user/service.ts | 2 +- packages/lib/webhook/auth.ts | 2 +- packages/lib/webhook/service.ts | 2 +- packages/types/actions.ts | 2 +- packages/types/common.ts | 4 ++++ packages/types/environment.ts | 2 -- packages/types/responses.ts | 2 +- packages/types/surveys/types.ts | 3 +-- packages/ui/ShareSurveyLink/actions.ts | 2 +- packages/ui/SingleResponseCard/actions.ts | 2 +- packages/ui/SurveysList/actions.ts | 2 +- packages/ui/TemplateList/actions.ts | 2 +- 73 files changed, 79 insertions(+), 77 deletions(-) diff --git a/apps/web/app/(app)/(onboarding)/organizations/actions.ts b/apps/web/app/(app)/(onboarding)/organizations/actions.ts index 9d165e84e1..a3e3befaa8 100644 --- a/apps/web/app/(app)/(onboarding)/organizations/actions.ts +++ b/apps/web/app/(app)/(onboarding)/organizations/actions.ts @@ -6,7 +6,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { INVITE_DISABLED } from "@formbricks/lib/constants"; import { inviteUser } from "@formbricks/lib/invite/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { AuthenticationError } from "@formbricks/types/errors"; import { ZMembershipRole } from "@formbricks/types/memberships"; diff --git a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts index c54d52cffb..47ed02dc8d 100644 --- a/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts +++ b/apps/web/app/(app)/(survey-editor)/environments/[environmentId]/surveys/[surveyId]/edit/actions.ts @@ -21,7 +21,7 @@ import { import { surveyCache } from "@formbricks/lib/survey/cache"; import { loadNewSegmentInSurvey, updateSurvey } from "@formbricks/lib/survey/service"; import { ZActionClassInput } from "@formbricks/types/action-classes"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZBaseFilters, ZSegmentFilters, ZSegmentUpdateInput } from "@formbricks/types/segment"; import { ZSurvey } from "@formbricks/types/surveys/types"; diff --git a/apps/web/app/(app)/environments/[environmentId]/(people)/attributes/actions.ts b/apps/web/app/(app)/environments/[environmentId]/(people)/attributes/actions.ts index 2ccdc320af..a9ebeacc9d 100644 --- a/apps/web/app/(app)/environments/[environmentId]/(people)/attributes/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/(people)/attributes/actions.ts @@ -9,7 +9,7 @@ import { } from "@formbricks/lib/organization/utils"; import { getSegmentsByAttributeClassName } from "@formbricks/lib/segment/service"; import { ZAttributeClass } from "@formbricks/types/attribute-classes"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZGetSegmentsByAttributeClassAction = z.object({ environmentId: ZId, diff --git a/apps/web/app/(app)/environments/[environmentId]/(people)/people/[personId]/actions.ts b/apps/web/app/(app)/environments/[environmentId]/(people)/people/[personId]/actions.ts index 6174f60f57..071378add9 100644 --- a/apps/web/app/(app)/environments/[environmentId]/(people)/people/[personId]/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/(people)/people/[personId]/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromPersonId } from "@formbricks/lib/organization/utils"; import { deletePerson } from "@formbricks/lib/person/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZPersonDeleteAction = z.object({ personId: ZId, diff --git a/apps/web/app/(app)/environments/[environmentId]/(people)/segments/actions.ts b/apps/web/app/(app)/environments/[environmentId]/(people)/segments/actions.ts index fac8a1012c..a998ef92fc 100644 --- a/apps/web/app/(app)/environments/[environmentId]/(people)/segments/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/(people)/segments/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromSegmentId } from "@formbricks/lib/organization/utils"; import { deleteSegment, updateSegment } from "@formbricks/lib/segment/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZSegmentFilters, ZSegmentUpdateInput } from "@formbricks/types/segment"; const ZDeleteBasicSegmentAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/actions.ts b/apps/web/app/(app)/environments/[environmentId]/actions.ts index a5d1fc8a86..76e7b33e6c 100644 --- a/apps/web/app/(app)/environments/[environmentId]/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/actions.ts @@ -8,7 +8,7 @@ import { createMembership } from "@formbricks/lib/membership/service"; import { createOrganization } from "@formbricks/lib/organization/service"; import { createProduct } from "@formbricks/lib/product/service"; import { updateUser } from "@formbricks/lib/user/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { OperationNotAllowedError } from "@formbricks/types/errors"; import { ZProductUpdateInput } from "@formbricks/types/product"; import { TUserNotificationSettings } from "@formbricks/types/user"; diff --git a/apps/web/app/(app)/environments/[environmentId]/actions/actions.ts b/apps/web/app/(app)/environments/[environmentId]/actions/actions.ts index 953797f02e..3ff5965856 100644 --- a/apps/web/app/(app)/environments/[environmentId]/actions/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/actions/actions.ts @@ -7,7 +7,7 @@ import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromActionClassId } from "@formbricks/lib/organization/utils"; import { getSurveysByActionClassId } from "@formbricks/lib/survey/service"; import { ZActionClassInput } from "@formbricks/types/action-classes"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ResourceNotFoundError } from "@formbricks/types/errors"; const ZDeleteActionClassAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/actions.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/actions.ts index a962579a6f..beeba66026 100644 --- a/apps/web/app/(app)/environments/[environmentId]/integrations/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/integrations/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { createOrUpdateIntegration, deleteIntegration } from "@formbricks/lib/integration/service"; import { getOrganizationIdFromEnvironmentId } from "@formbricks/lib/organization/utils"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZIntegrationInput } from "@formbricks/types/integration"; const ZCreateOrUpdateIntegrationAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/slack/actions.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/slack/actions.ts index 3bbbb6a732..b96fcb68e0 100644 --- a/apps/web/app/(app)/environments/[environmentId]/integrations/slack/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/integrations/slack/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromEnvironmentId } from "@formbricks/lib/organization/utils"; import { getSlackChannels } from "@formbricks/lib/slack/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZRefreshChannelsAction = z.object({ environmentId: ZId, diff --git a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts index 380ceaa288..4d0d0f1c40 100644 --- a/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/actions.ts @@ -9,7 +9,7 @@ import { } from "@formbricks/lib/organization/utils"; import { createWebhook, deleteWebhook, updateWebhook } from "@formbricks/lib/webhook/service"; import { testEndpoint } from "@formbricks/lib/webhook/utils"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZWebhookInput } from "@formbricks/types/webhooks"; const ZCreateWebhookAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/product/actions.ts b/apps/web/app/(app)/environments/[environmentId]/product/actions.ts index c9ec85c4c2..d610f773a7 100644 --- a/apps/web/app/(app)/environments/[environmentId]/product/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/product/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromProductId } from "@formbricks/lib/organization/utils"; import { updateProduct } from "@formbricks/lib/product/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZProductUpdateInput } from "@formbricks/types/product"; const ZUpdateProductAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/product/api-keys/actions.ts b/apps/web/app/(app)/environments/[environmentId]/product/api-keys/actions.ts index 0ee2a1c848..225f5785ec 100644 --- a/apps/web/app/(app)/environments/[environmentId]/product/api-keys/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/product/api-keys/actions.ts @@ -9,7 +9,7 @@ import { getOrganizationIdFromEnvironmentId, } from "@formbricks/lib/organization/utils"; import { ZApiKeyCreateInput } from "@formbricks/types/api-keys"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZDeleteApiKeyAction = z.object({ id: ZId, diff --git a/apps/web/app/(app)/environments/[environmentId]/product/general/actions.ts b/apps/web/app/(app)/environments/[environmentId]/product/general/actions.ts index 75818d75a3..712518245d 100644 --- a/apps/web/app/(app)/environments/[environmentId]/product/general/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/product/general/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromProductId } from "@formbricks/lib/organization/utils"; import { deleteProduct, getProducts } from "@formbricks/lib/product/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZProductDeleteAction = z.object({ productId: ZId, diff --git a/apps/web/app/(app)/environments/[environmentId]/product/tags/actions.ts b/apps/web/app/(app)/environments/[environmentId]/product/tags/actions.ts index a3b821a9f5..cb37fa90da 100644 --- a/apps/web/app/(app)/environments/[environmentId]/product/tags/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/product/tags/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromTagId } from "@formbricks/lib/organization/utils"; import { deleteTag, mergeTags, updateTagName } from "@formbricks/lib/tag/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZDeleteTagAction = z.object({ tagId: ZId, diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts index c6ea517f46..9fe04d1d0f 100644 --- a/apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts @@ -8,7 +8,7 @@ import { getOrganizationIdFromEnvironmentId } from "@formbricks/lib/organization import { deleteFile } from "@formbricks/lib/storage/service"; import { getFileNameWithIdFromUrl } from "@formbricks/lib/storage/utils"; import { updateUser } from "@formbricks/lib/user/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZUserUpdateInput } from "@formbricks/types/user"; export const updateUserAction = authenticatedActionClient diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/billing/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/billing/actions.ts index 980fe8d3bb..14bdc9d988 100644 --- a/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/billing/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/billing/actions.ts @@ -9,7 +9,7 @@ import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { STRIPE_PRICE_LOOKUP_KEYS } from "@formbricks/lib/constants"; import { WEBAPP_URL } from "@formbricks/lib/constants"; import { getOrganization } from "@formbricks/lib/organization/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors"; const ZUpgradePlanAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/members/actions.ts b/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/members/actions.ts index a737a9ebb8..d1e7f29e80 100644 --- a/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/members/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/settings/(organization)/members/actions.ts @@ -15,7 +15,7 @@ import { } from "@formbricks/lib/membership/service"; import { deleteOrganization, updateOrganization } from "@formbricks/lib/organization/service"; import { getOrganizationIdFromInviteId } from "@formbricks/lib/organization/utils"; -import { ZId } from "@formbricks/types/environment"; +import { ZId, ZUuid } from "@formbricks/types/common"; import { AuthenticationError, OperationNotAllowedError, ValidationError } from "@formbricks/types/errors"; import { ZMembershipRole } from "@formbricks/types/memberships"; import { ZOrganizationUpdateInput } from "@formbricks/types/organizations"; @@ -39,7 +39,7 @@ export const updateOrganizationNameAction = authenticatedActionClient }); const ZDeleteInviteAction = z.object({ - inviteId: ZId, + inviteId: ZUuid, organizationId: ZId, }); @@ -130,7 +130,7 @@ export const createInviteTokenAction = authenticatedActionClient }); const ZResendInviteAction = z.object({ - inviteId: ZId, + inviteId: ZUuid, organizationId: ZId, }); diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions.ts index 05095a3ae4..6edf88643d 100644 --- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions.ts @@ -6,7 +6,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromSurveyId } from "@formbricks/lib/organization/utils"; import { getResponseCountBySurveyId, getResponses, getSurveySummary } from "@formbricks/lib/response/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZResponseFilterCriteria } from "@formbricks/types/responses"; export const revalidateSurveyIdPath = async (environmentId: string, surveyId: string) => { diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts index 1b14aa6a31..7c1b0b4f19 100644 --- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/actions.ts @@ -8,7 +8,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromSurveyId } from "@formbricks/lib/organization/utils"; import { getSurvey, updateSurvey } from "@formbricks/lib/survey/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ResourceNotFoundError } from "@formbricks/types/errors"; const ZSendEmbedSurveyPreviewEmailAction = z.object({ diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions.ts index fd4952bd72..9bbe3a2c9a 100644 --- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions.ts +++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/actions.ts @@ -7,7 +7,7 @@ import { getOrganizationIdFromSurveyId } from "@formbricks/lib/organization/util import { getResponseDownloadUrl, getResponseFilteringValues } from "@formbricks/lib/response/service"; import { getSurvey, updateSurvey } from "@formbricks/lib/survey/service"; import { getTagsByEnvironmentId } from "@formbricks/lib/tag/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ResourceNotFoundError } from "@formbricks/types/errors"; import { ZResponseFilterCriteria } from "@formbricks/types/responses"; import { ZSurvey } from "@formbricks/types/surveys/types"; diff --git a/apps/web/app/api/v1/client/[environmentId]/responses/route.ts b/apps/web/app/api/v1/client/[environmentId]/responses/route.ts index ffd086f65e..b619a06dae 100644 --- a/apps/web/app/api/v1/client/[environmentId]/responses/route.ts +++ b/apps/web/app/api/v1/client/[environmentId]/responses/route.ts @@ -7,7 +7,7 @@ import { getPerson } from "@formbricks/lib/person/service"; import { capturePosthogEnvironmentEvent } from "@formbricks/lib/posthogServer"; import { createResponse } from "@formbricks/lib/response/service"; import { getSurvey } from "@formbricks/lib/survey/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { InvalidInputError } from "@formbricks/types/errors"; import { TResponse, TResponseInput, ZResponseInput } from "@formbricks/types/responses"; diff --git a/apps/web/app/s/[surveyId]/actions.ts b/apps/web/app/s/[surveyId]/actions.ts index e5258ef046..0825735348 100644 --- a/apps/web/app/s/[surveyId]/actions.ts +++ b/apps/web/app/s/[surveyId]/actions.ts @@ -6,8 +6,8 @@ import { sendLinkSurveyToVerifiedEmail } from "@formbricks/email"; import { actionClient } from "@formbricks/lib/actionClient"; import { verifyTokenForLinkSurvey } from "@formbricks/lib/jwt"; import { getSurvey } from "@formbricks/lib/survey/service"; +import { ZId } from "@formbricks/types/common"; import { ZLinkSurveyEmailData } from "@formbricks/types/email"; -import { ZId } from "@formbricks/types/environment"; export const sendLinkSurveyEmailAction = actionClient .schema(ZLinkSurveyEmailData) diff --git a/apps/web/app/s/[surveyId]/page.tsx b/apps/web/app/s/[surveyId]/page.tsx index 5b2cff989f..2ebf817c83 100644 --- a/apps/web/app/s/[surveyId]/page.tsx +++ b/apps/web/app/s/[surveyId]/page.tsx @@ -13,7 +13,7 @@ import { createPerson, getPersonByUserId } from "@formbricks/lib/person/service" import { getProductByEnvironmentId } from "@formbricks/lib/product/service"; import { getResponseBySingleUseId, getResponseCountBySurveyId } from "@formbricks/lib/response/service"; import { getSurvey } from "@formbricks/lib/survey/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { TResponse } from "@formbricks/types/responses"; import { getEmailVerificationDetails } from "./lib/helpers"; diff --git a/apps/web/app/setup/organization/[organizationId]/invite/actions.ts b/apps/web/app/setup/organization/[organizationId]/invite/actions.ts index ac869c07c3..c7bb5e6fee 100644 --- a/apps/web/app/setup/organization/[organizationId]/invite/actions.ts +++ b/apps/web/app/setup/organization/[organizationId]/invite/actions.ts @@ -7,7 +7,7 @@ import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { INVITE_DISABLED } from "@formbricks/lib/constants"; import { inviteUser } from "@formbricks/lib/invite/service"; import { getOrganizationsByUserId } from "@formbricks/lib/organization/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { AuthenticationError } from "@formbricks/types/errors"; const ZInviteOrganizationMemberAction = z.object({ diff --git a/apps/web/app/share/[sharingKey]/actions.ts b/apps/web/app/share/[sharingKey]/actions.ts index fdbe5e2a60..1d9add65a7 100644 --- a/apps/web/app/share/[sharingKey]/actions.ts +++ b/apps/web/app/share/[sharingKey]/actions.ts @@ -10,7 +10,7 @@ import { } from "@formbricks/lib/response/service"; import { getSurveyIdByResultShareKey } from "@formbricks/lib/survey/service"; import { getTagsByEnvironmentId } from "@formbricks/lib/tag/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { AuthorizationError } from "@formbricks/types/errors"; import { ZResponseFilterCriteria } from "@formbricks/types/responses"; diff --git a/packages/ee/advanced-targeting/lib/actions.ts b/packages/ee/advanced-targeting/lib/actions.ts index db571b6cfa..2366330b0d 100644 --- a/packages/ee/advanced-targeting/lib/actions.ts +++ b/packages/ee/advanced-targeting/lib/actions.ts @@ -16,7 +16,7 @@ import { updateSegment, } from "@formbricks/lib/segment/service"; import { loadNewSegmentInSurvey } from "@formbricks/lib/survey/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZSegmentCreateInput, ZSegmentFilters, ZSegmentUpdateInput } from "@formbricks/types/segment"; export const createSegmentAction = authenticatedActionClient diff --git a/packages/ee/multi-language/lib/actions.ts b/packages/ee/multi-language/lib/actions.ts index a22fd16054..9455aec55d 100644 --- a/packages/ee/multi-language/lib/actions.ts +++ b/packages/ee/multi-language/lib/actions.ts @@ -14,7 +14,7 @@ import { getOrganizationIdFromLanguageId, getOrganizationIdFromProductId, } from "@formbricks/lib/organization/utils"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ResourceNotFoundError } from "@formbricks/types/errors"; import { ZLanguageInput } from "@formbricks/types/product"; diff --git a/packages/ee/role-management/lib/actions.ts b/packages/ee/role-management/lib/actions.ts index dbcfd4910f..a3c32b7968 100644 --- a/packages/ee/role-management/lib/actions.ts +++ b/packages/ee/role-management/lib/actions.ts @@ -10,7 +10,7 @@ import { transferOwnership, updateMembership, } from "@formbricks/lib/membership/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId, ZUuid } from "@formbricks/types/common"; import { AuthorizationError, ValidationError } from "@formbricks/types/errors"; import { ZInviteUpdateInput } from "@formbricks/types/invites"; import { ZMembershipUpdateInput } from "@formbricks/types/memberships"; @@ -44,7 +44,7 @@ export const transferOwnershipAction = authenticatedActionClient }); const ZUpdateInviteAction = z.object({ - inviteId: ZId, + inviteId: ZUuid, organizationId: ZId, data: ZInviteUpdateInput, }); diff --git a/packages/lib/action/service.ts b/packages/lib/action/service.ts index 81393cb7c2..ef594b3468 100644 --- a/packages/lib/action/service.ts +++ b/packages/lib/action/service.ts @@ -5,7 +5,7 @@ import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { TAction, TActionInput, ZActionInput } from "@formbricks/types/actions"; import { ZOptionalNumber } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, OperationNotAllowedError } from "@formbricks/types/errors"; import { actionClassCache } from "../actionClass/cache"; import { getActionClassByEnvironmentIdAndName } from "../actionClass/service"; diff --git a/packages/lib/actionClass/auth.ts b/packages/lib/actionClass/auth.ts index 0be6a21859..358311f85e 100644 --- a/packages/lib/actionClass/auth.ts +++ b/packages/lib/actionClass/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { getMembershipByUserIdOrganizationId } from "../membership/service"; diff --git a/packages/lib/actionClass/service.ts b/packages/lib/actionClass/service.ts index d69bfbe60a..c87b09795c 100644 --- a/packages/lib/actionClass/service.ts +++ b/packages/lib/actionClass/service.ts @@ -6,7 +6,7 @@ import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { TActionClass, TActionClassInput, ZActionClassInput } from "@formbricks/types/action-classes"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors"; import { cache } from "../cache"; import { ITEMS_PER_PAGE } from "../constants"; diff --git a/packages/lib/apiKey/auth.ts b/packages/lib/apiKey/auth.ts index 40ed5ace37..89b525c12f 100644 --- a/packages/lib/apiKey/auth.ts +++ b/packages/lib/apiKey/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { validateInputs } from "../utils/validate"; diff --git a/packages/lib/apiKey/service.ts b/packages/lib/apiKey/service.ts index 31dd253aaf..285430e90f 100644 --- a/packages/lib/apiKey/service.ts +++ b/packages/lib/apiKey/service.ts @@ -5,7 +5,7 @@ import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { TApiKey, TApiKeyCreateInput, ZApiKeyCreateInput } from "@formbricks/types/api-keys"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, InvalidInputError } from "@formbricks/types/errors"; import { cache } from "../cache"; import { ITEMS_PER_PAGE } from "../constants"; diff --git a/packages/lib/attribute/service.ts b/packages/lib/attribute/service.ts index 6d0961f0d4..3f6a15fd86 100644 --- a/packages/lib/attribute/service.ts +++ b/packages/lib/attribute/service.ts @@ -4,7 +4,7 @@ import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { TAttributes, ZAttributes } from "@formbricks/types/attributes"; import { ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, OperationNotAllowedError } from "@formbricks/types/errors"; import { attributeCache } from "../attribute/cache"; import { attributeClassCache } from "../attributeClass/cache"; diff --git a/packages/lib/attributeClass/auth.ts b/packages/lib/attributeClass/auth.ts index f25c2e5cba..78e8bb1631 100644 --- a/packages/lib/attributeClass/auth.ts +++ b/packages/lib/attributeClass/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { validateInputs } from "../utils/validate"; diff --git a/packages/lib/attributeClass/service.ts b/packages/lib/attributeClass/service.ts index e464245384..1317349c96 100644 --- a/packages/lib/attributeClass/service.ts +++ b/packages/lib/attributeClass/service.ts @@ -12,7 +12,7 @@ import { ZAttributeClassUpdateInput, } from "@formbricks/types/attribute-classes"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, OperationNotAllowedError } from "@formbricks/types/errors"; import { cache } from "../cache"; import { ITEMS_PER_PAGE, MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT } from "../constants"; diff --git a/packages/lib/display/service.ts b/packages/lib/display/service.ts index 95c3a0b807..a925bf61a0 100644 --- a/packages/lib/display/service.ts +++ b/packages/lib/display/service.ts @@ -3,6 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber } from "@formbricks/types/common"; +import { ZId } from "@formbricks/types/common"; import { TDisplay, TDisplayCreateInput, @@ -11,7 +12,6 @@ import { ZDisplayCreateInput, ZDisplayUpdateInput, } from "@formbricks/types/displays"; -import { ZId } from "@formbricks/types/environment"; import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TPerson } from "@formbricks/types/people"; import { cache } from "../cache"; diff --git a/packages/lib/environment/auth.ts b/packages/lib/environment/auth.ts index 7bee822adb..8ae4a2b371 100644 --- a/packages/lib/environment/auth.ts +++ b/packages/lib/environment/auth.ts @@ -1,6 +1,6 @@ import { Prisma } from "@prisma/client"; import { prisma } from "@formbricks/database"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError } from "@formbricks/types/errors"; import { cache } from "../cache"; import { organizationCache } from "../organization/cache"; diff --git a/packages/lib/environment/service.ts b/packages/lib/environment/service.ts index 201e8e8f2c..8a07284748 100644 --- a/packages/lib/environment/service.ts +++ b/packages/lib/environment/service.ts @@ -3,6 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { z } from "zod"; import { prisma } from "@formbricks/database"; +import { ZId } from "@formbricks/types/common"; import type { TEnvironment, TEnvironmentCreateInput, @@ -12,7 +13,6 @@ import { ZEnvironment, ZEnvironmentCreateInput, ZEnvironmentUpdateInput, - ZId, } from "@formbricks/types/environment"; import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors"; import { cache } from "../cache"; diff --git a/packages/lib/integration/auth.ts b/packages/lib/integration/auth.ts index 5183113ead..852e7f6b34 100644 --- a/packages/lib/integration/auth.ts +++ b/packages/lib/integration/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { validateInputs } from "../utils/validate"; diff --git a/packages/lib/integration/service.ts b/packages/lib/integration/service.ts index 2e6cc7198a..a5f06e1135 100644 --- a/packages/lib/integration/service.ts +++ b/packages/lib/integration/service.ts @@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError } from "@formbricks/types/errors"; import { TIntegration, TIntegrationInput, ZIntegrationType } from "@formbricks/types/integration"; import { cache } from "../cache"; diff --git a/packages/lib/language/service.ts b/packages/lib/language/service.ts index 2fedf490bb..081dd689ca 100644 --- a/packages/lib/language/service.ts +++ b/packages/lib/language/service.ts @@ -1,7 +1,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ResourceNotFoundError, ValidationError } from "@formbricks/types/errors"; import { TLanguage, diff --git a/packages/lib/organization/auth.ts b/packages/lib/organization/auth.ts index da227de64a..6cb7731057 100644 --- a/packages/lib/organization/auth.ts +++ b/packages/lib/organization/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { getMembershipByUserIdOrganizationId } from "../membership/service"; import { getAccessFlags } from "../membership/utils"; diff --git a/packages/lib/organization/hooks/actions.ts b/packages/lib/organization/hooks/actions.ts index 63db66fb14..f2aac75d3e 100644 --- a/packages/lib/organization/hooks/actions.ts +++ b/packages/lib/organization/hooks/actions.ts @@ -2,7 +2,7 @@ import "server-only"; import { z } from "zod"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { authenticatedActionClient } from "../../actionClient"; import { checkAuthorization } from "../../actionClient/utils"; import { getOrganization } from "../service"; diff --git a/packages/lib/organization/service.ts b/packages/lib/organization/service.ts index 72da377f94..6ef87ff5b1 100644 --- a/packages/lib/organization/service.ts +++ b/packages/lib/organization/service.ts @@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TOrganization, diff --git a/packages/lib/person/auth.ts b/packages/lib/person/auth.ts index eee3de32b6..2dc7ebbbbe 100644 --- a/packages/lib/person/auth.ts +++ b/packages/lib/person/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { validateInputs } from "../utils/validate"; diff --git a/packages/lib/person/service.ts b/packages/lib/person/service.ts index 0666068944..3ad71cf4d5 100644 --- a/packages/lib/person/service.ts +++ b/packages/lib/person/service.ts @@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError } from "@formbricks/types/errors"; import { TPerson } from "@formbricks/types/people"; import { cache } from "../cache"; diff --git a/packages/lib/product/auth.ts b/packages/lib/product/auth.ts index ab9926f4f1..7d4212d895 100644 --- a/packages/lib/product/auth.ts +++ b/packages/lib/product/auth.ts @@ -1,4 +1,4 @@ -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { getMembershipByUserIdOrganizationId } from "../membership/service"; import { getAccessFlags } from "../membership/utils"; diff --git a/packages/lib/product/service.ts b/packages/lib/product/service.ts index 7bc988f087..de43d89ec4 100644 --- a/packages/lib/product/service.ts +++ b/packages/lib/product/service.ts @@ -4,7 +4,7 @@ import { cache as reactCache } from "react"; import { z } from "zod"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ValidationError } from "@formbricks/types/errors"; import type { TProduct, TProductUpdateInput } from "@formbricks/types/product"; import { ZProduct, ZProductUpdateInput } from "@formbricks/types/product"; diff --git a/packages/lib/response/auth.ts b/packages/lib/response/auth.ts index a5f7122f0e..689c3c64af 100644 --- a/packages/lib/response/auth.ts +++ b/packages/lib/response/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { getSurvey } from "../survey/service"; diff --git a/packages/lib/response/service.ts b/packages/lib/response/service.ts index 6dabaadbae..bed519ebd6 100644 --- a/packages/lib/response/service.ts +++ b/packages/lib/response/service.ts @@ -4,7 +4,7 @@ import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { TAttributes } from "@formbricks/types/attributes"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TPerson } from "@formbricks/types/people"; import { diff --git a/packages/lib/responseNote/auth.ts b/packages/lib/responseNote/auth.ts index 7ad756aa5e..289c162ca6 100644 --- a/packages/lib/responseNote/auth.ts +++ b/packages/lib/responseNote/auth.ts @@ -1,4 +1,4 @@ -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { canUserAccessResponse } from "../response/auth"; import { getResponse } from "../response/service"; diff --git a/packages/lib/responseNote/service.ts b/packages/lib/responseNote/service.ts index 4afb548663..8882777c0a 100644 --- a/packages/lib/responseNote/service.ts +++ b/packages/lib/responseNote/service.ts @@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TResponseNote } from "@formbricks/types/responses"; import { cache } from "../cache"; diff --git a/packages/lib/segment/service.ts b/packages/lib/segment/service.ts index a7f0996596..ac77666a23 100644 --- a/packages/lib/segment/service.ts +++ b/packages/lib/segment/service.ts @@ -2,7 +2,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, OperationNotAllowedError, diff --git a/packages/lib/storage/service.ts b/packages/lib/storage/service.ts index 461efceec3..510584065f 100644 --- a/packages/lib/storage/service.ts +++ b/packages/lib/storage/service.ts @@ -20,12 +20,12 @@ import { S3_ACCESS_KEY, S3_BUCKET_NAME, S3_ENDPOINT_URL, + S3_FORCE_PATH_STYLE, S3_REGION, S3_SECRET_KEY, UPLOADS_DIR, WEBAPP_URL, isS3Configured, - S3_FORCE_PATH_STYLE, } from "../constants"; import { generateLocalSignedUrl } from "../crypto"; import { env } from "../env"; diff --git a/packages/lib/survey/auth.ts b/packages/lib/survey/auth.ts index 951da37ea3..810573a8a7 100644 --- a/packages/lib/survey/auth.ts +++ b/packages/lib/survey/auth.ts @@ -1,4 +1,4 @@ -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { getMembershipByUserIdOrganizationId } from "../membership/service"; diff --git a/packages/lib/survey/service.ts b/packages/lib/survey/service.ts index 2078f08ecb..77cbc3dba6 100644 --- a/packages/lib/survey/service.ts +++ b/packages/lib/survey/service.ts @@ -5,7 +5,8 @@ import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { TActionClass } from "@formbricks/types/action-classes"; import { ZOptionalNumber } from "@formbricks/types/common"; -import { TEnvironment, ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; +import { TEnvironment } from "@formbricks/types/environment"; import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TPerson } from "@formbricks/types/people"; import { TProduct } from "@formbricks/types/product"; diff --git a/packages/lib/tag/auth.ts b/packages/lib/tag/auth.ts index f2b9b06d9e..1e75bd7d58 100644 --- a/packages/lib/tag/auth.ts +++ b/packages/lib/tag/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { getMembershipByUserIdOrganizationId } from "../membership/service"; import { getAccessFlags } from "../membership/utils"; diff --git a/packages/lib/tag/service.ts b/packages/lib/tag/service.ts index 44a9351851..df6ff44175 100644 --- a/packages/lib/tag/service.ts +++ b/packages/lib/tag/service.ts @@ -2,7 +2,7 @@ import "server-only"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber, ZString } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { TTag } from "@formbricks/types/tags"; import { cache } from "../cache"; import { ITEMS_PER_PAGE } from "../constants"; diff --git a/packages/lib/tagOnResponse/auth.ts b/packages/lib/tagOnResponse/auth.ts index 67e8cb3cf7..15be2c7ddf 100644 --- a/packages/lib/tagOnResponse/auth.ts +++ b/packages/lib/tagOnResponse/auth.ts @@ -1,5 +1,5 @@ import "server-only"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { getMembershipByUserIdOrganizationId } from "../membership/service"; import { getAccessFlags } from "../membership/utils"; diff --git a/packages/lib/tagOnResponse/service.ts b/packages/lib/tagOnResponse/service.ts index 7db0a254ae..3406543ee0 100644 --- a/packages/lib/tagOnResponse/service.ts +++ b/packages/lib/tagOnResponse/service.ts @@ -2,7 +2,7 @@ import "server-only"; import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { prisma } from "@formbricks/database"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError } from "@formbricks/types/errors"; import { TTagsCount, TTagsOnResponses } from "@formbricks/types/tags"; import { cache } from "../cache"; diff --git a/packages/lib/user/service.ts b/packages/lib/user/service.ts index 5b8adcbdf0..241a8b8154 100644 --- a/packages/lib/user/service.ts +++ b/packages/lib/user/service.ts @@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client"; import { cache as reactCache } from "react"; import { z } from "zod"; import { prisma } from "@formbricks/database"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TMembership } from "@formbricks/types/memberships"; import { TUser, TUserCreateInput, TUserUpdateInput, ZUserUpdateInput } from "@formbricks/types/user"; diff --git a/packages/lib/webhook/auth.ts b/packages/lib/webhook/auth.ts index f3b4626118..f88839aa61 100644 --- a/packages/lib/webhook/auth.ts +++ b/packages/lib/webhook/auth.ts @@ -1,4 +1,4 @@ -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { cache } from "../cache"; import { hasUserEnvironmentAccess } from "../environment/auth"; import { validateInputs } from "../utils/validate"; diff --git a/packages/lib/webhook/service.ts b/packages/lib/webhook/service.ts index 4a10edc198..c80b47ae72 100644 --- a/packages/lib/webhook/service.ts +++ b/packages/lib/webhook/service.ts @@ -2,7 +2,7 @@ import "server-only"; import { Prisma } from "@prisma/client"; import { prisma } from "@formbricks/database"; import { ZOptionalNumber } from "@formbricks/types/common"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { DatabaseError, InvalidInputError, ResourceNotFoundError } from "@formbricks/types/errors"; import { TWebhook, TWebhookInput, ZWebhookInput } from "@formbricks/types/webhooks"; import { cache } from "../cache"; diff --git a/packages/types/actions.ts b/packages/types/actions.ts index 8524228f85..7418abd1e1 100644 --- a/packages/types/actions.ts +++ b/packages/types/actions.ts @@ -1,6 +1,6 @@ import { z } from "zod"; import { ZActionClass } from "./action-classes"; -import { ZId } from "./environment"; +import { ZId } from "./common"; export const ZAction = z.object({ id: ZId, diff --git a/packages/types/common.ts b/packages/types/common.ts index e6b7397fef..eb45cff676 100644 --- a/packages/types/common.ts +++ b/packages/types/common.ts @@ -37,3 +37,7 @@ export const ZAllowedFileExtension = z.enum([ ]); export type TAllowedFileExtension = z.infer; + +export const ZId = z.string().cuid2(); + +export const ZUuid = z.string().uuid(); diff --git a/packages/types/environment.ts b/packages/types/environment.ts index aa45c2500c..9111ad3901 100644 --- a/packages/types/environment.ts +++ b/packages/types/environment.ts @@ -25,8 +25,6 @@ export const ZEnvironmentUpdateInput = z.object({ websiteSetupCompleted: z.boolean(), }); -export const ZId = z.string().cuid2(); - export const ZEnvironmentCreateInput = z.object({ type: z.enum(["development", "production"]).optional(), appSetupCompleted: z.boolean().optional(), diff --git a/packages/types/responses.ts b/packages/types/responses.ts index 2e7c637e0b..d31a5fda07 100644 --- a/packages/types/responses.ts +++ b/packages/types/responses.ts @@ -1,6 +1,6 @@ import { z } from "zod"; import { ZAttributes } from "./attributes"; -import { ZId } from "./environment"; +import { ZId } from "./common"; import { ZSurvey, ZSurveyLogicCondition } from "./surveys/types"; import { ZTag } from "./tags"; diff --git a/packages/types/surveys/types.ts b/packages/types/surveys/types.ts index 8b279b748a..48671fea35 100644 --- a/packages/types/surveys/types.ts +++ b/packages/types/surveys/types.ts @@ -1,8 +1,7 @@ import { z } from "zod"; import { ZActionClass, ZActionClassNoCodeConfig } from "../action-classes"; import { ZAttributes } from "../attributes"; -import { ZAllowedFileExtension, ZColor, ZPlacement } from "../common"; -import { ZId } from "../environment"; +import { ZAllowedFileExtension, ZColor, ZPlacement , ZId } from "../common"; import { ZLanguage } from "../product"; import { ZSegment } from "../segment"; import { ZBaseStyling } from "../styling"; diff --git a/packages/ui/ShareSurveyLink/actions.ts b/packages/ui/ShareSurveyLink/actions.ts index c68331e0d7..f176441958 100644 --- a/packages/ui/ShareSurveyLink/actions.ts +++ b/packages/ui/ShareSurveyLink/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromSurveyId } from "@formbricks/lib/organization/utils"; import { generateSurveySingleUseId } from "@formbricks/lib/utils/singleUseSurveys"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZGenerateSingleUseIdAction = z.object({ surveyId: ZId, diff --git a/packages/ui/SingleResponseCard/actions.ts b/packages/ui/SingleResponseCard/actions.ts index 7643f02f31..029a40d9a9 100644 --- a/packages/ui/SingleResponseCard/actions.ts +++ b/packages/ui/SingleResponseCard/actions.ts @@ -17,7 +17,7 @@ import { } from "@formbricks/lib/responseNote/service"; import { createTag } from "@formbricks/lib/tag/service"; import { addTagToRespone, deleteTagOnResponse } from "@formbricks/lib/tagOnResponse/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; const ZCreateTagAction = z.object({ environmentId: ZId, diff --git a/packages/ui/SurveysList/actions.ts b/packages/ui/SurveysList/actions.ts index abd917f8b4..7404bf541f 100644 --- a/packages/ui/SurveysList/actions.ts +++ b/packages/ui/SurveysList/actions.ts @@ -15,7 +15,7 @@ import { getSurveys, } from "@formbricks/lib/survey/service"; import { generateSurveySingleUseId } from "@formbricks/lib/utils/singleUseSurveys"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZSurveyFilterCriteria } from "@formbricks/types/surveys/types"; const ZGetSurveyAction = z.object({ diff --git a/packages/ui/TemplateList/actions.ts b/packages/ui/TemplateList/actions.ts index 182c7a4284..2fb8c92e63 100644 --- a/packages/ui/TemplateList/actions.ts +++ b/packages/ui/TemplateList/actions.ts @@ -5,7 +5,7 @@ import { authenticatedActionClient } from "@formbricks/lib/actionClient"; import { checkAuthorization } from "@formbricks/lib/actionClient/utils"; import { getOrganizationIdFromEnvironmentId } from "@formbricks/lib/organization/utils"; import { createSurvey } from "@formbricks/lib/survey/service"; -import { ZId } from "@formbricks/types/environment"; +import { ZId } from "@formbricks/types/common"; import { ZSurveyCreateInput } from "@formbricks/types/surveys/types"; const ZCreateSurveyAction = z.object({