From 47157fd5e7bb6a2a5d8f965bcefac40da26e5992 Mon Sep 17 00:00:00 2001
From: "Hieu Nguyen (Jack)" <nc.hieu@live.com>
Date: Thu, 27 Aug 2026 15:46:41 +0700
Subject: [PATCH] fix cf deployment

---
 src/app/api/branding/icon/route.ts | 7 +++++--
 src/lib/cloudflare.ts              | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/api/branding/icon/route.ts b/src/app/api/branding/icon/route.ts
index a311087..aa68d2b 100644
--- a/src/app/api/branding/icon/route.ts
+++ b/src/app/api/branding/icon/route.ts
@@ -2,9 +2,12 @@ import { eq } from "drizzle-orm";
 import { getDb } from "@/db";
 import { appSettings } from "@/db/schema";
 import { APP_SETTINGS_ID } from "@/lib/branding/service";
-import { getEnv } from "@/lib/cloudflare";
+import { getEnvAsync } from "@/lib/cloudflare";
 import { getLicenseEntitlements } from "@/lib/licenses/service";
 
+export const dynamic = "force-dynamic";
+export const revalidate = 0;
+
 async function getDefaultIcon(env: CloudflareEnv): Promise<Response> {
 	const asset = await env.ASSETS.fetch("https://mailflare.local/icon-96.png");
 	return new Response(await asset.arrayBuffer(), {
@@ -15,7 +18,7 @@ async function getDefaultIcon(env: CloudflareEnv): Promise<Response> {
 }
 
 export async function GET(request: Request) {
-	const env = getEnv();
+	const env = await getEnvAsync();
 	if (!(await getLicenseEntitlements(env)).canCustomizeBranding) return getDefaultIcon(env);
 	try {
 		const [settings] = await getDb(env)
diff --git a/src/lib/cloudflare.ts b/src/lib/cloudflare.ts
index 5edf4f1..b330ec5 100644
--- a/src/lib/cloudflare.ts
+++ b/src/lib/cloudflare.ts
@@ -3,3 +3,7 @@ import { getCloudflareContext } from "@opennextjs/cloudflare";
 export function getEnv(): CloudflareEnv {
 	return getCloudflareContext().env as CloudflareEnv;
 }
+
+export async function getEnvAsync(): Promise<CloudflareEnv> {
+	return (await getCloudflareContext({ async: true })).env as CloudflareEnv;
+}