Allow more European countries in free mode (#636)

Author: jahooma

freebuff/web/src/app/home-client.tsx

@@ -31,7 +31,7 @@ const faqs = [
   {
     question: 'Which countries is Freebuff available in?',
     answer:
-      'Freebuff is currently available in:\n\nUnited States, Canada, United Kingdom, Australia, New Zealand, Norway, Sweden, Netherlands, Denmark, Germany, Finland, Belgium, Luxembourg, Liechtenstein, Switzerland, Austria, Singapore, Malta, Israel, Ireland, and Iceland.',
+      'Freebuff is currently available in:\n\nUnited States, Canada, United Kingdom, Australia, New Zealand, Norway, Sweden, Netherlands, Denmark, Germany, France, Italy, Spain, Portugal, Finland, Belgium, Luxembourg, Liechtenstein, Switzerland, Austria, Singapore, Malta, Israel, Ireland, and Iceland.',
   },
   {
     question: 'Are you training on my data?',

web/src/app/api/v1/freebuff/session/__tests__/session.test.ts

@@ -230,15 +230,15 @@ describe('POST /api/v1/freebuff/session', () => {
   test('returns country_blocked without joining the queue for disallowed country', async () => {
     const sessionDeps = makeSessionDeps()
     const resp = await postFreebuffSession(
-      makeReq('ok', { cfCountry: 'FR' }),
+      makeReq('ok', { cfCountry: 'JP' }),
       makeDeps(sessionDeps, 'u1'),
     )
     // 403 (not 200) so older CLIs that don't know `country_blocked` fall into
     // their error-retry backoff instead of tight-polling.
     expect(resp.status).toBe(403)
     const body = await resp.json()
     expect(body.status).toBe('country_blocked')
-    expect(body.countryCode).toBe('FR')
+    expect(body.countryCode).toBe('JP')
     expect(body.countryBlockReason).toBe('country_not_allowed')
     expect(sessionDeps.rows.size).toBe(0)
   })
@@ -326,13 +326,13 @@ describe('GET /api/v1/freebuff/session', () => {
   test('returns country_blocked for disallowed country on GET', async () => {
     const sessionDeps = makeSessionDeps()
     const resp = await getFreebuffSession(
-      makeReq('ok', { cfCountry: 'FR' }),
+      makeReq('ok', { cfCountry: 'JP' }),
       makeDeps(sessionDeps, 'u1'),
     )
     expect(resp.status).toBe(403)
     const body = await resp.json()
     expect(body.status).toBe('country_blocked')
-    expect(body.countryCode).toBe('FR')
+    expect(body.countryCode).toBe('JP')
     expect(body.countryBlockReason).toBe('country_not_allowed')
   })
 
@@ -358,7 +358,7 @@ describe('GET /api/v1/freebuff/session', () => {
     })
     let countryChecks = 0
     const resp = await getFreebuffSession(
-      makeReq('ok', { cfCountry: 'FR' }),
+      makeReq('ok', { cfCountry: 'JP' }),
       makeDeps(sessionDeps, 'u1', {
         getCountryAccess: async (req) => {
           countryChecks++

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

@@ -29,6 +29,11 @@ describe('free mode country access', () => {
     ['SG', 'SG'],
     ['MT', 'MT'],
     ['IL', 'IL'],
+    ['FR', 'FR'],
+    ['BE', 'BE'],
+    ['IT', 'IT'],
+    ['ES', 'ES'],
+    ['PT', 'PT'],
   ])('allows allowlisted Cloudflare country %s', async (header, expected) => {
     const access = await getFreeModeCountryAccess(
       makeReq({
@@ -44,11 +49,11 @@ describe('free mode country access', () => {
 
   test('blocks countries outside the allowlist', async () => {
     const access = await getFreeModeCountryAccess(
-      makeReq({ 'cf-ipcountry': 'FR' }),
+      makeReq({ 'cf-ipcountry': 'JP' }),
       noAnonymousNetwork,
     )
     expect(access.allowed).toBe(false)
-    expect(access.countryCode).toBe('FR')
+    expect(access.countryCode).toBe('JP')
     expect(access.blockReason).toBe('country_not_allowed')
   })
 
@@ -295,7 +300,7 @@ describe('free mode country access', () => {
 
   test('allowLocalhost does not bypass when cf-ipcountry is set', async () => {
     const access = await getFreeModeCountryAccess(
-      makeReq({ 'cf-ipcountry': 'FR' }),
+      makeReq({ 'cf-ipcountry': 'JP' }),
       {
         ipinfoToken: 'test-token',
         allowLocalhost: true,

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

@@ -19,6 +19,10 @@ export const FREE_MODE_ALLOWED_COUNTRIES = new Set([
   'NL',
   'DK',
   'DE',
+  'FR',
+  'IT',
+  'ES',
+  'PT',
   'FI',
   'BE',
   'LU',