Address country gate review comments

Author: jahooma

web/src/app/api/v1/chat/completions/_post.ts

@@ -65,11 +65,7 @@ import {
   OpenRouterError,
 } from '@/llm-api/openrouter'
 import { checkSessionAdmissible } from '@/server/free-session/public-api'
-import {
-  extractClientIp,
-  getFreeModeCountryAccess,
-  getFreeModeCountryCodeForClient,
-} from '@/server/free-mode-country'
+import { getFreeModeCountryAccess } from '@/server/free-mode-country'
 
 import type { SessionGateResult } from '@/server/free-session/public-api'
 import { extractApiKeyFromHeader } from '@/util/auth'
@@ -261,15 +257,14 @@ export async function postChatCompletions(params: {
     // For free mode requests, require a resolved allowlisted country.
     if (isFreeModeRequest) {
       const countryAccess = getFreeModeCountryAccess(req)
-      const clientIp = extractClientIp(req)
 
       logger.info(
         {
           cfHeader: countryAccess.cfCountry,
           geoipResult: countryAccess.geoipCountry,
           resolvedCountry: countryAccess.countryCode,
           countryBlockReason: countryAccess.blockReason,
-          clientIp: clientIp ? '[redacted]' : undefined,
+          clientIp: countryAccess.hasClientIp ? '[redacted]' : undefined,
         },
         'Free mode country detection',
       )
@@ -282,7 +277,7 @@ export async function postChatCompletions(params: {
             error: 'free_mode_not_available_in_country',
             countryCode: countryAccess.countryCode,
             countryBlockReason: countryAccess.blockReason,
-            clientIp: clientIp ? '[redacted]' : undefined,
+            clientIp: countryAccess.hasClientIp ? '[redacted]' : undefined,
           },
           logger,
         })
@@ -291,7 +286,7 @@ export async function postChatCompletions(params: {
           {
             error: 'free_mode_unavailable',
             message: 'Free mode is not available in your country.',
-            countryCode: getFreeModeCountryCodeForClient(countryAccess),
+            countryCode: countryAccess.countryCode ?? 'UNKNOWN',
           },
           { status: 403 },
         )

web/src/app/api/v1/freebuff/session/_handlers.ts

@@ -5,10 +5,7 @@ import {
   getSessionState,
   requestSession,
 } from '@/server/free-session/public-api'
-import {
-  getFreeModeCountryAccess,
-  getFreeModeCountryCodeForClient,
-} from '@/server/free-mode-country'
+import { getFreeModeCountryAccess } from '@/server/free-mode-country'
 import { extractApiKeyFromHeader } from '@/util/auth'
 
 import type { SessionDeps } from '@/server/free-session/public-api'
@@ -31,7 +28,7 @@ function countryBlockedResponse(req: NextRequest): NextResponse | null {
   return NextResponse.json(
     {
       status: 'country_blocked',
-      countryCode: getFreeModeCountryCodeForClient(countryAccess),
+      countryCode: countryAccess.countryCode ?? 'UNKNOWN',
     },
     { status: 403 },
   )

web/src/server/free-mode-country.ts

@@ -35,6 +35,7 @@ export type FreeModeCountryAccess = {
   blockReason: FreeModeCountryBlockReason | null
   cfCountry: string | null
   geoipCountry: string | null
+  hasClientIp: boolean
 }
 
 export function extractClientIp(req: NextRequest): string | undefined {
@@ -58,6 +59,7 @@ export function getFreeModeCountryAccess(
       blockReason: 'anonymized_or_unknown_country',
       cfCountry,
       geoipCountry: null,
+      hasClientIp: Boolean(clientIp),
     }
   }
 
@@ -69,6 +71,7 @@ export function getFreeModeCountryAccess(
       blockReason: allowed ? null : 'country_not_allowed',
       cfCountry,
       geoipCountry: null,
+      hasClientIp: Boolean(clientIp),
     }
   }
 
@@ -79,6 +82,7 @@ export function getFreeModeCountryAccess(
       blockReason: 'missing_client_ip',
       cfCountry: null,
       geoipCountry: null,
+      hasClientIp: false,
     }
   }
 
@@ -90,6 +94,7 @@ export function getFreeModeCountryAccess(
       blockReason: 'unresolved_client_ip',
       cfCountry: null,
       geoipCountry: null,
+      hasClientIp: true,
     }
   }
 
@@ -100,11 +105,6 @@ export function getFreeModeCountryAccess(
     blockReason: allowed ? null : 'country_not_allowed',
     cfCountry: null,
     geoipCountry,
+    hasClientIp: true,
   }
 }
-
-export function getFreeModeCountryCodeForClient(
-  countryAccess: FreeModeCountryAccess,
-): string {
-  return countryAccess.countryCode ?? 'UNKNOWN'
-}