From 6d688ed2bcd4566545e2d558c139c873465a625b Mon Sep 17 00:00:00 2001 From: Ankit Sridhar <36269838+ankitsridhar16@users.noreply.github.com> Date: Wed, 5 Apr 2023 21:53:27 +0530 Subject: [PATCH] refactor: removing unused env variables from env example (#66) --- .env.example | 2 -- packages/hoppscotch-backend/.env.example | 41 ----------------------- packages/hoppscotch-backend/Dockerfile | 6 ++-- packages/hoppscotch-sh-admin/.env.example | 4 --- 4 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 packages/hoppscotch-backend/.env.example delete mode 100644 packages/hoppscotch-sh-admin/.env.example diff --git a/.env.example b/.env.example index 1343a229b..aa98c1c03 100644 --- a/.env.example +++ b/.env.example @@ -3,7 +3,6 @@ DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch # Auth Tokens Config -SIGNED_COOKIE_SECRET = "supersecretcode" JWT_SECRET="secret1233" TOKEN_SALT_COMPLEXITY=10 MAGIC_LINK_TOKEN_VALIDITY= 3 @@ -12,7 +11,6 @@ ACCESS_TOKEN_VALIDITY="86400000" # Default validity is 1 day (86400000 ms) in ms SESSION_SECRET='add some secret here' # Hoppscotch App Domain Config -APP_DOMAIN="http://localhost:3170" REDIRECT_URL="http://localhost:3170/graphql" WHITELISTED_ORIGINS = "http://localhost:3170,http://localhost:3000" diff --git a/packages/hoppscotch-backend/.env.example b/packages/hoppscotch-backend/.env.example deleted file mode 100644 index c2fcf5264..000000000 --- a/packages/hoppscotch-backend/.env.example +++ /dev/null @@ -1,41 +0,0 @@ -# Prisma Config -DATABASE_URL=postgresql://postgres:testpass@dev-db:5432/hoppscotch - -# Mailer config -MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com" -MAILER_ADDRESS_FROM='"From Name Here" ' - -# Rate Limit Config -RATE_LIMIT_TTL=60 # In seconds -RATE_LIMIT_MAX=100 # Max requests per IP - -# Auth Tokens Config -JWT_SECRET='add some secret here' -TOKEN_SALT_COMPLEXITY=10 -MAGIC_LINK_TOKEN_VALIDITY=3 -REFRESH_TOKEN_VALIDITY="604800000" # Default validity is 7 days -ACCESS_TOKEN_VALIDITY="120000" # Default validity is 1 day -SESSION_SECRET='add some secret here' - -# Hoppscotch App Domain Config -APP_DOMAIN="************************************************"" -REDIRECT_URL="************************************************"" -WHITELISTED_ORIGINS="************************************************" - -# Google Auth Config -GOOGLE_CLIENT_ID="************************************************" -GOOGLE_CLIENT_SECRET="************************************************" -GOOGLE_CALLBACK_URL="************************************************" -GOOGLE_SCOPE="['email', 'profile']," - -# Github Auth Config -GITHUB_CLIENT_ID="************************************************" -GITHUB_CLIENT_SECRET="************************************************" -GITHUB_CALLBACK_URL="************************************************" -GITHUB_SCOPE="user:email" - -# Microsoft Auth Config -MICROSOFT_CLIENT_ID="************************************************" -MICROSOFT_CLIENT_SECRET="************************************************" -MICROSOFT_CALLBACK_URL="************************************************" -MICROSOFT_SCOPE="user.read" diff --git a/packages/hoppscotch-backend/Dockerfile b/packages/hoppscotch-backend/Dockerfile index e08b05710..34b383d9e 100644 --- a/packages/hoppscotch-backend/Dockerfile +++ b/packages/hoppscotch-backend/Dockerfile @@ -21,16 +21,16 @@ RUN pnpm exec prisma generate FROM builder AS dev -ENV PRODUCTION = false +ENV PRODUCTION="false" -CMD ["pnpm", "run", "start"] +CMD ["pnpm", "run", "start:dev"] EXPOSE 3170 FROM builder AS prod -ENV PRODUCTION = true +ENV PRODUCTION="true" CMD ["pnpm", "run", "start:prod"] diff --git a/packages/hoppscotch-sh-admin/.env.example b/packages/hoppscotch-sh-admin/.env.example deleted file mode 100644 index baf0c1722..000000000 --- a/packages/hoppscotch-sh-admin/.env.example +++ /dev/null @@ -1,4 +0,0 @@ -# Backend URLs -VITE_BACKEND_GQL_URL='*****************************' -VITE_BACKEND_WS_URL='******************************' -VITE_BACKEND_API_URL='*****************************'