diff --git a/README.md b/README.md index 886b5333d..10e3ed8c8 100644 --- a/README.md +++ b/README.md @@ -619,12 +619,6 @@ NEXT_PUBLIC_KEYSTATIC_CONTENT_PATH=./content # LOCALES PATH NEXT_PUBLIC_LOCALES_PATH=apps/web/public/locales -# PATHS (to be used in "packages") -SIGN_IN_PATH=/auth/sign-in -SIGN_UP_PATH=/auth/sign-up -TEAM_ACCOUNTS_HOME_PATH=/home -INVITATION_PAGE_PATH=/join - # FEATURE FLAGS NEXT_PUBLIC_ENABLE_THEME_TOGGLE=true NEXT_PUBLIC_ENABLE_PERSONAL_ACCOUNT_DELETION=true diff --git a/apps/web/.env b/apps/web/.env index a34f2aa91..736d67fce 100644 --- a/apps/web/.env +++ b/apps/web/.env @@ -30,12 +30,6 @@ NEXT_PUBLIC_KEYSTATIC_CONTENT_PATH=./content # LOCALES PATH NEXT_PUBLIC_LOCALES_PATH=apps/web/public/locales -# PATHS (to be used in "packages") -SIGN_IN_PATH=/auth/sign-in -SIGN_UP_PATH=/auth/sign-up -TEAM_ACCOUNTS_HOME_PATH=/home -INVITATION_PAGE_PATH=/join - # FEATURE FLAGS NEXT_PUBLIC_ENABLE_THEME_TOGGLE=true NEXT_PUBLIC_ENABLE_PERSONAL_ACCOUNT_DELETION=true diff --git a/packages/features/team-accounts/src/server/actions/create-team-account-server-actions.ts b/packages/features/team-accounts/src/server/actions/create-team-account-server-actions.ts index c86b7f1e0..5527b6e14 100644 --- a/packages/features/team-accounts/src/server/actions/create-team-account-server-actions.ts +++ b/packages/features/team-accounts/src/server/actions/create-team-account-server-actions.ts @@ -2,21 +2,12 @@ import { redirect } from 'next/navigation'; -import { z } from 'zod'; - import { enhanceAction } from '@kit/next/actions'; import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client'; import { CreateTeamSchema } from '../../schema/create-team.schema'; import { createCreateTeamAccountService } from '../services/create-team-account.service'; -const path = z - .string({ - required_error: 'variable TEAM_ACCOUNTS_HOME_PATH is required', - }) - .min(1) - .parse(process.env.TEAM_ACCOUNTS_HOME_PATH); - export const createOrganizationAccountAction = enhanceAction( async (params, user) => { const client = getSupabaseServerActionClient(); @@ -31,7 +22,7 @@ export const createOrganizationAccountAction = enhanceAction( throw new Error('Error creating team account'); } - const accountHomePath = path + '/' + data.slug; + const accountHomePath = '/home/' + data.slug; redirect(accountHomePath); }, diff --git a/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts b/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts index bd638cf5b..882d41090 100644 --- a/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts +++ b/packages/features/team-accounts/src/server/services/webhooks/account-invitations-webhook.service.ts @@ -7,7 +7,7 @@ import { Database } from '@kit/supabase/database'; type Invitation = Database['public']['Tables']['invitations']['Row']; -const invitePath = process.env.INVITATION_PAGE_PATH; +const invitePath = '/join'; const siteURL = process.env.NEXT_PUBLIC_SITE_URL; const productName = process.env.NEXT_PUBLIC_PRODUCT_NAME ?? ''; const emailSender = process.env.EMAIL_SENDER; diff --git a/packages/supabase/src/require-user.ts b/packages/supabase/src/require-user.ts index 8a2ced264..5d240fff5 100644 --- a/packages/supabase/src/require-user.ts +++ b/packages/supabase/src/require-user.ts @@ -1,18 +1,9 @@ import type { SupabaseClient, User } from '@supabase/supabase-js'; -import { z } from 'zod'; - import { checkRequiresMultiFactorAuthentication } from './check-requires-mfa'; -const MULTI_FACTOR_AUTH_VERIFY_PATH = z - .string() - .default('/auth/verify') - .parse(process.env.MULTI_FACTOR_AUTH_VERIFY_PATH); - -const SIGN_IN_PATH = z - .string() - .default('/auth/sign-in') - .parse(process.env.SIGN_IN_PATH); +const MULTI_FACTOR_AUTH_VERIFY_PATH = '/auth/verify'; +const SIGN_IN_PATH = '/auth/sign-in'; /** * @name requireUser diff --git a/turbo.json b/turbo.json index 936504c48..1c70aa706 100644 --- a/turbo.json +++ b/turbo.json @@ -67,10 +67,6 @@ "EMAIL_HOST", "EMAIL_TLS", "EMAIL_USER", - "EMAIL_PASSWORD", - "SIGN_IN_PATH", - "SIGN_UP_PATH", - "TEAM_ACCOUNTS_HOME_PATH", - "INVITATION_PAGE_PATH" + "EMAIL_PASSWORD" ] } \ No newline at end of file