🧑‍💻 Improve env variables type safety and management (#718)

Closes #679

apps/builder/src/features/auth/api/customAdapter.ts

@@ -14,6 +14,7 @@ import { convertInvitationsToCollaborations } from '@/features/auth/helpers/conv
 import { getNewUserInvitations } from '@/features/auth/helpers/getNewUserInvitations'
 import { joinWorkspaces } from '@/features/auth/helpers/joinWorkspaces'
 import { parseWorkspaceDefaultPlan } from '@/features/workspace/helpers/parseWorkspaceDefaultPlan'
+import { env } from '@typebot.io/env'
 
 export function customAdapter(p: PrismaClient): Adapter {
   return {
@@ -26,8 +27,8 @@ export function customAdapter(p: PrismaClient): Adapter {
         user.email
       )
       if (
-        process.env.DISABLE_SIGNUP === 'true' &&
-        process.env.ADMIN_EMAIL !== user.email &&
+        env.DISABLE_SIGNUP &&
+        env.ADMIN_EMAIL !== user.email &&
         invitations.length === 0 &&
         workspaceInvitations.length === 0
       )

apps/builder/src/features/auth/components/OnboardingPage.tsx

@@ -13,8 +13,8 @@ import { useRouter } from 'next/router'
 import { useEffect, useRef, useState } from 'react'
 import confetti from 'canvas-confetti'
 import { useUser } from '@/features/account/hooks/useUser'
-import { env, isEmpty } from '@typebot.io/lib'
 import { useI18n } from '@/locales'
+import { env } from '@typebot.io/env'
 
 const totalSteps = 5
 
@@ -37,7 +37,7 @@ export const OnboardingPage = () => {
 
   useEffect(() => {
     if (!user?.createdAt) return
-    if (isNewUser === false || isEmpty(env('ONBOARDING_TYPEBOT_ID')))
+    if (isNewUser === false || !env.NEXT_PUBLIC_ONBOARDING_TYPEBOT_ID)
       replace('/typebots')
   }, [isNewUser, replace, user?.createdAt])
 
@@ -90,7 +90,7 @@ export const OnboardingPage = () => {
       <Dots currentStep={currentStep} pos="fixed" top="9" />
       <Flex w="full" maxW="800px" h="full" maxH="70vh" rounded="lg">
         <Standard
-          typebot={env('ONBOARDING_TYPEBOT_ID')}
+          typebot={env.NEXT_PUBLIC_ONBOARDING_TYPEBOT_ID}
           style={{ borderRadius: '1rem' }}
           prefilledVariables={{ Name: user?.name, Email: user?.email }}
           onEnd={() => {

apps/builder/src/features/auth/helpers/getAuthenticatedUser.ts

@@ -5,7 +5,7 @@ import { User } from '@typebot.io/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { getServerSession } from 'next-auth'
 import { mockedUser } from '../mockedUser'
-import { env } from '@typebot.io/lib'
+import { env } from '@typebot.io/env'
 
 export const getAuthenticatedUser = async (
   req: NextApiRequest,
@@ -13,12 +13,11 @@ export const getAuthenticatedUser = async (
 ): Promise<User | undefined> => {
   const bearerToken = extractBearerToken(req)
   if (bearerToken) return authenticateByToken(bearerToken)
-  const user =
-    env('E2E_TEST') === 'true'
-      ? mockedUser
-      : ((await getServerSession(req, res, authOptions))?.user as
-          | User
-          | undefined)
+  const user = env.NEXT_PUBLIC_E2E_TEST
+    ? mockedUser
+    : ((await getServerSession(req, res, authOptions))?.user as
+        | User
+        | undefined)
   if (!user || !('id' in user)) return
   setUser({ id: user.id })
   return user