Add base URL as env variable (Fix #3)

AntonioVdlC · Feb 13, 2022 · 4ce8fa9 · 4ce8fa9
1 parent b2c7ffd
commit 4ce8fa9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,5 +1,6 @@
 DATABASE_URL=
 SESSION_SECRET=
+BASE_URL=
 
 ADMIN_EMAIL=
 

diff --git a/app/routes/admin/dashboard.tsx b/app/routes/admin/dashboard.tsx
@@ -73,7 +73,7 @@ export const action: ActionFunction = async ({ request }) => {
           subject: "Welcome to Fantomely",
           text: `Welcome to Fantomely!
           You can now finish your registration using the following link: ${
-            new URL(request.url).origin
+            process.env.BASE_URL
           }/auth/waitlist/callback?email=${encodeURIComponent(
             user.email
           )}&token=${waitlistToken}`,

diff --git a/app/routes/app/websites.details.$id.tsx b/app/routes/app/websites.details.$id.tsx
@@ -31,7 +31,7 @@ export const loader: LoaderFunction = async ({ params, request }) => {
   const user = await requireCurrentUser(request);
   const website = await db.website.findUnique({ where: { id: params.id } });
 
-  return { website, user, origin: new URL(request.url).origin };
+  return { website, user, origin: process.env.BASE_URL };
 };
 
 export default function WebsiteDetailsRoute() {

diff --git a/app/routes/auth/login.tsx b/app/routes/auth/login.tsx
@@ -82,7 +82,7 @@ export const action: ActionFunction = async ({ request }) => {
       subject: "Log into fantomely",
       text: `Log into fantomely!
           Here is your magic link to log into your fantomely account: ${
-            new URL(request.url).origin
+            process.env.BASE_URL
           }/auth/login/callback?email=${encodeURIComponent(email)}&token=${
         magicLink.token
       }&redirectTo=${redirectTo}`,

diff --git a/fly.toml b/fly.toml
@@ -8,6 +8,7 @@ processes = []
 
 [env]
   PORT = "8080"
+  BASE_URL = "https://fantomely.com"
 
 [experimental]
   allowed_public_ports = []