Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/api/admin/bootstrap/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
getAdminClaims,
normalizeEmail,
} from "@/lib/admin-auth";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin-auth";
import { logAdminAudit } from "@/lib/admin-audit";
import { ensureAdminUser, updateAdminUser } from "@/lib/admin-users";
import { getBearerToken, unauthorizedResponse } from "@/lib/api-auth";
Expand Down
2 changes: 1 addition & 1 deletion app/api/admin/invitations/[id]/resend/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
recordInvitationEmailAttempt,
} from "@/lib/admin-invitations";
import { canResendInvitation } from "@/lib/admin-invitation-resend-policy";
import { getFirebaseAdminDb } from "@/lib/firebase-admin";
import { getFirebaseAdminDb } from "@/lib/firebase-admin-db";
import { serializeAdminInvitation } from "@/lib/admin-serializers";
import {
badRequestResponse,
Expand Down
3 changes: 2 additions & 1 deletion app/api/admin/invitations/accept/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import {
normalizeEmail,
verifyAdminIdToken,
} from "@/lib/admin-auth";
import { getFirebaseAdminAuth, getFirebaseAdminDb } from "@/lib/firebase-admin";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin-auth";
import { getFirebaseAdminDb } from "@/lib/firebase-admin-db";
import { logAdminAudit } from "@/lib/admin-audit";
import { getPendingInvitationByEmail } from "@/lib/admin-invitations";
import { getAdminUser } from "@/lib/admin-users";
Expand Down
2 changes: 1 addition & 1 deletion app/api/admin/users/[uid]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
normalizeEmail,
requireSuperAdminActor,
} from "@/lib/admin-auth";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin-auth";
import { logAdminAudit } from "@/lib/admin-audit";
import {
countActiveSuperAdmins,
Expand Down
2 changes: 1 addition & 1 deletion lib/admin-audit.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "server-only";
import { getFirebaseAdminDb } from "@/lib/firebase-admin";
import { getFirebaseAdminDb } from "@/lib/firebase-admin-db";
import { dropUndefinedValues } from "@/lib/admin-audit-common";
import type { AdminAuditRecord } from "@/lib/admin-types";
import { Timestamp } from "firebase-admin/firestore";
Expand Down
2 changes: 1 addition & 1 deletion lib/admin-auth.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "server-only";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin";
import { getFirebaseAdminAuth } from "@/lib/firebase-admin-auth";
import {
getAdminClaims,
getProtectedAdminEmail,
Expand Down
2 changes: 1 addition & 1 deletion lib/admin-invitations.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "server-only";
import { getFirebaseAdminDb } from "@/lib/firebase-admin";
import { getFirebaseAdminDb } from "@/lib/firebase-admin-db";
import { normalizeEmail } from "@/lib/admin-common";
import type { AdminInvitation, AdminRole } from "@/lib/admin-types";
import { FieldValue, Timestamp } from "firebase-admin/firestore";
Expand Down
2 changes: 1 addition & 1 deletion lib/admin-users.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "server-only";
import { getFirebaseAdminDb } from "@/lib/firebase-admin";
import { getFirebaseAdminDb } from "@/lib/firebase-admin-db";
import {
buildExistingAdminLoginUpdate,
buildNewAdminUserRecord,
Expand Down
10 changes: 0 additions & 10 deletions lib/firebase-admin.ts → lib/firebase-admin-app.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import "server-only";
import { App, cert, getApps, initializeApp } from "firebase-admin/app";
import { getAuth } from "firebase-admin/auth";
import { getFirestore } from "firebase-admin/firestore";

let adminApp: App | undefined;

Expand Down Expand Up @@ -43,11 +41,3 @@ export function getFirebaseAdminApp(): App {

return adminApp;
}

export function getFirebaseAdminAuth() {
return getAuth(getFirebaseAdminApp());
}

export function getFirebaseAdminDb() {
return getFirestore(getFirebaseAdminApp());
}
9 changes: 9 additions & 0 deletions lib/firebase-admin-auth.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import "server-only";
import { getAuth } from "firebase-admin/auth";
import { getFirebaseAdminApp } from "@/lib/firebase-admin-app";

// Auth is isolated in its own module: only routes that actually verify
// tokens or manage users pay for the jwks-rsa -> jose dependency graph.
export function getFirebaseAdminAuth() {
return getAuth(getFirebaseAdminApp());
}
11 changes: 11 additions & 0 deletions lib/firebase-admin-db.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import "server-only";
import { getFirestore } from "firebase-admin/firestore";
import { getFirebaseAdminApp } from "@/lib/firebase-admin-app";

// Firestore lives in its own module so Firestore-only routes never import
// firebase-admin/auth — its jwks-rsa -> ESM-only jose chain is the failure
// that caused the nfl-picks Vercel runtime outage (ERR_REQUIRE_ESM despite
// a clean build).
export function getFirebaseAdminDb() {
return getFirestore(getFirebaseAdminApp());
}
2 changes: 1 addition & 1 deletion lib/trade-leads.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "server-only";
import { FieldValue } from "firebase-admin/firestore";
import { getFirebaseAdminDb } from "@/lib/firebase-admin";
import { getFirebaseAdminDb } from "@/lib/firebase-admin-db";
import { getResendClient } from "@/lib/resend";
import { getDefaultFromEmail } from "@/lib/resend-config";
import { logError, logInfo } from "@/lib/log";
Expand Down
5 changes: 5 additions & 0 deletions next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ const mediaCacheHeaders = [
const nextConfig: NextConfig = {
pageExtensions: ["ts", "tsx", "md", "mdx"],
poweredByHeader: false,
// Keep firebase-admin outside the server bundle: its auth graph pulls
// jwks-rsa -> jose, and bundling the Node-specific chain into a
// serverless chunk caused a Vercel runtime outage class (ERR_REQUIRE_ESM)
// in other projects. Load the real node_modules at runtime instead.
serverExternalPackages: ["firebase-admin"],
images: {
formats: ["image/avif", "image/webp"],
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
Expand Down
Loading
Loading