Add const auth0 = await getAuth0Client();

Author: zachkirsch

packages/fern-dashboard/src/app/actions/auth0.ts

@@ -1,7 +1,7 @@
 import { GetOrganizations200ResponseOneOfInner, ManagementClient } from "auth0";
 import jwt from "jsonwebtoken";
 
-import { auth0 } from "@/lib/auth0";
+import { getAuth0Client } from "@/lib/auth0";
 
 import { AsyncCache } from "./AsyncCache";
 import { Auth0OrgName } from "./types";
@@ -34,6 +34,7 @@ export function getAuth0ManagementClient() {
 }
 
 export async function getCurrentSession() {
+  const auth0 = await getAuth0Client();
   const session = await auth0.getSession();
   if (session == null) {
     throw new Error("Not authenticated");
@@ -62,6 +63,7 @@ export async function getCurrentSession() {
 }
 
 export async function getCurrentOrgId() {
+  const auth0 = await getAuth0Client();
   const session = await auth0.getSession();
 
   if (session?.user.org_id == null) {

packages/fern-dashboard/src/app/layout.tsx

@@ -3,7 +3,7 @@ import { ThemeProvider } from "next-themes";
 
 import { ProtectedRoute } from "@/components/auth/ProtectedRoute";
 import { AppLayout } from "@/components/layout/AppLayout";
-import { auth0 } from "@/lib/auth0";
+import { getAuth0Client } from "@/lib/auth0";
 
 import { gtPlanar } from "./fonts";
 import "./globals.css";
@@ -19,6 +19,7 @@ export default async function RootLayout({
 }>) {
   let content = children;
 
+  const auth0 = await getAuth0Client();
   const session = await auth0.getSession();
   if (session != null) {
     content = (

packages/fern-dashboard/src/app/page.tsx

@@ -1,9 +1,10 @@
 import { redirect } from "next/navigation";
 
 import { LoginPage } from "@/components/login-page/LoginPage";
-import { auth0 } from "@/lib/auth0";
+import { getAuth0Client } from "@/lib/auth0";
 
 export default async function Page() {
+  const auth0 = await getAuth0Client();
   const session = await auth0.getSession();
 
   if (session == null) {

packages/fern-dashboard/src/components/auth/ProtectedRoute.tsx

@@ -3,7 +3,7 @@ import React from "react";
 
 import { createPersonalProject } from "@/app/actions/createPersonalProject";
 import { getMyOrganizations } from "@/app/actions/getMyOrganizations";
-import { auth0 } from "@/lib/auth0";
+import { getAuth0Client } from "@/lib/auth0";
 
 export declare namespace ProtectedRoute {
   export interface Props {
@@ -12,6 +12,7 @@ export declare namespace ProtectedRoute {
 }
 
 export const ProtectedRoute = async ({ children }: ProtectedRoute.Props) => {
+  const auth0 = await getAuth0Client();
   const session = await auth0.getSession();
 
   if (session == null) {

packages/fern-dashboard/src/lib/auth0.ts

@@ -1,3 +1,4 @@
+import { headers } from "next/headers";
 import { redirect } from "next/navigation";
 
 import { Auth0Client } from "@auth0/nextjs-auth0/server";
@@ -15,25 +16,30 @@ if (ZACH_TEST_APP_BASE_URL == null) {
   throw new Error("ZACH_TEST_APP_BASE_URL is not defined in the environment");
 }
 
-console.log(
-  { NEXT_PUBLIC_VENUS_AUDIENCE, ZACH_TEST_APP_BASE_URL },
-  process.env
-);
-
-export const auth0 = new Auth0Client({
-  async beforeSessionSaved(session, idToken) {
-    return {
-      ...session,
-      idToken,
-    };
-  },
-  authorizationParameters: {
-    audience: NEXT_PUBLIC_VENUS_AUDIENCE,
-  },
-  appBaseUrl: ZACH_TEST_APP_BASE_URL,
-});
+export async function getAuth0Client() {
+  return new Auth0Client({
+    authorizationParameters: {
+      audience: NEXT_PUBLIC_VENUS_AUDIENCE,
+    },
+    appBaseUrl: await getBaseUrl(),
+  });
+}
+
+async function getBaseUrl(): Promise<string> {
+  const headersList = await headers();
+
+  const host = headersList.get("host");
+  if (host == null) {
+    throw new Error("host header is not present");
+  }
+
+  const protocol = headersList.get("x-forwarded-proto") ?? "https";
+
+  return `${protocol}://${host}`;
+}
 
 export async function getSessionOrRedirect() {
+  const auth0 = await getAuth0Client();
   const session = await auth0.getSession();
   if (session == null) {
     redirect("/");

packages/fern-dashboard/src/middleware.ts

@@ -1,9 +1,11 @@
 import { type NextRequest, NextResponse } from "next/server";
 
-import { auth0 } from "./lib/auth0";
+import { getAuth0Client } from "./lib/auth0";
 
 // copied from https://github.com/auth0/nextjs-auth0/issues/1983
 export async function middleware(req: NextRequest) {
+  const auth0 = await getAuth0Client();
+
   const authResponse = await auth0.middleware(req);
 
   // Process Auth0 middleware