refactor: simplify auth configuration by using NEXT_PUBLIC_BASE_URL instead of BETTER_AUTH_URL (#66)

.env.example

@@ -18,7 +18,6 @@ S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 
 BETTER_AUTH_SECRET=
-BETTER_AUTH_URL=
 BETTER_AUTH_TRUSTED_ORIGINS=
 
 GOOGLE_CLIENT_ID=

README.md

@@ -115,8 +115,7 @@ pnpm dev
 | `SMTP_PASSWORD`                  | SMTP password/token           | For Email          | `re_xxxx`                                     |
 | `NEXT_PUBLIC_BASE_URL`           | Base URL of your installation | Yes                | `http://localhost:3000`                       |
 | `BETTER_AUTH_SECRET`             | Auth encryption secret        | Yes                | Random 32+ char string                        |
-| `BETTER_AUTH_URL`                | Auth callback URL             | Yes                | Same as `NEXT_PUBLIC_BASE_URL`                |
+| `BETTER_AUTH_TRUSTED_ORIGINS`    | Allowed callback origins      | No                 | `http://localhost:3000,http://localhost:3001` |
-| `BETTER_AUTH_TRUSTED_ORIGINS`    | Allowed callback origins      | Yes                | `http://localhost:3000,http://localhost:3001` |
 | `GOOGLE_CLIENT_ID`               | Google OAuth client ID        | For Google login   | `xxx.apps.googleusercontent.com`              |
 | `GOOGLE_CLIENT_SECRET`           | Google OAuth client secret    | For Google login   | `xxx`                                         |
 | `DISCORD_CLIENT_ID`              | Discord OAuth client ID       | For Discord login  | `xxx`                                         |

apps/web/src/env.ts

@@ -15,12 +15,12 @@ export const env = createEnv({
    */
   server: {
     BETTER_AUTH_SECRET: z.string(),
-    BETTER_AUTH_URL: z.string().url(),
     BETTER_AUTH_TRUSTED_ORIGINS: z
       .string()
       .refine((s) =>
         s.split(",").every((l) => z.string().url().safeParse(l).success),
-      ),
+      )
+      .optional(),
     POSTGRES_URL: z.string().url(),
     STRIPE_SECRET_KEY: z.string().optional(),
     GOOGLE_CLIENT_ID: z.string().optional(),

docker-compose.yml

@@ -20,7 +20,6 @@ services:
       - SMTP_USER=${SMTP_USER}
       - SMTP_PASSWORD=${SMTP_PASSWORD}
       - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET}
-      - BETTER_AUTH_URL=${BETTER_AUTH_URL}
       - BETTER_AUTH_TRUSTED_ORIGINS=${BETTER_AUTH_TRUSTED_ORIGINS}
       - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
       - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}

packages/auth/src/auth.ts

@@ -100,10 +100,13 @@ async function downloadImage(url: string): Promise<Buffer> {
 export const initAuth = (db: dbClient) => {
   return betterAuth({
     secret: process.env.BETTER_AUTH_SECRET!,
-    baseURL: process.env.BETTER_AUTH_BASE_URL!,
+    baseURL: process.env.NEXT_PUBLIC_BASE_URL!,
     trustedOrigins: process.env.BETTER_AUTH_TRUSTED_ORIGINS
-      ? process.env.BETTER_AUTH_TRUSTED_ORIGINS.split(",")
+      ? [
-      : [],
+          process.env.NEXT_PUBLIC_BASE_URL!,
+          ...process.env.BETTER_AUTH_TRUSTED_ORIGINS.split(","),
+        ]
+      : [process.env.NEXT_PUBLIC_BASE_URL!],
     database: drizzleAdapter(db, {
       provider: "pg",
       schema: {

turbo.json

@@ -104,7 +104,6 @@
     "S3_ENDPOINT",
     "PORT",
     "BETTER_AUTH_SECRET",
-    "BETTER_AUTH_URL",
     "BETTER_AUTH_TRUSTED_ORIGINS"
   ],
   "globalPassThroughEnv": [