fix: member invite issues (#3028)

Co-authored-by: Matti Nannt <mail@matthiasnannt.com>

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";
 

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";
 

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,

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,

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({

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";

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({

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({

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,

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({

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({

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,

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,

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,

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

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({

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,
 });
 

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) => {

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({

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";

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";
 

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)

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";
 

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({

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";
 

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

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";
 

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,
 });

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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,

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";

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";

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,

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";

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";

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";

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";

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";

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 {

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";

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";

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,

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";

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";

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";

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";

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";

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";

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";

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";

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";

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";

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,

packages/types/common.ts

@@ -37,3 +37,7 @@ export const ZAllowedFileExtension = z.enum([
 ]);
 
 export type TAllowedFileExtension = z.infer<typeof ZAllowedFileExtension>;
+
+export const ZId = z.string().cuid2();
+
+export const ZUuid = z.string().uuid();

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(),

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";
 

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";

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,

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,

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({

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({