@greatapps/common 1.1.762 → 1.1.764

package/src/middlewares/chain.ts

@@ -1,6 +1,16 @@
 import { NextRequest, NextResponse } from 'next/server';
 
 import { MiddlewareConfig } from './types';
+import { GEO_COUNTRY_COOKIE, GEO_UNKNOWN_COUNTRIES } from '../utils/geo-country';
+
+function publishGeoCountry(request: NextRequest, response: NextResponse): void {
+  const country = request.headers.get('cf-ipcountry')?.toUpperCase();
+
+  if (!country || GEO_UNKNOWN_COUNTRIES.includes(country)) return;
+  if (request.cookies.get(GEO_COUNTRY_COOKIE)?.value === country) return;
+
+  response.cookies.set(GEO_COUNTRY_COOKIE, country, { path: '/', sameSite: 'lax' });
+}
 
 function shouldProcessPath(pathname: string, config: MiddlewareConfig): boolean {
   const { excludePaths, includePaths } = config;
@@ -40,6 +50,9 @@ export function createMiddlewareChain(middlewares: MiddlewareConfig[]) {
       }
     }
 
-    return NextResponse.next();
+    const response = NextResponse.next();
+    publishGeoCountry(request, response);
+
+    return response;
   };
 }

package/src/modules/subscriptions/types/subscription.type.ts

@@ -66,15 +66,15 @@ export const SubscriptionSchema = z.object({
     schedule_id: z.string(),
     schedule_status: z.string(),
     kind: z.string(),
-    takes_effect_at: z.number(),
-    takes_effect_at_iso: z.string(),
+    takes_effect_at: z.number().nullable(),
+    takes_effect_at_iso: z.string().nullable(),
     new_plan: z.object({
       id: z.number(),
       name: z.string(),
-      periodicity: z.number(),
+      periodicity: z.number().nullable(),
       value: z.number(),
       value_gross: z.number(),
-    }),
+    }).nullable(),
     new_items: z.array(z.object({
       price_id: z.string(),
       id_addon: z.number().nullable(),
@@ -88,8 +88,11 @@ export const SubscriptionSchema = z.object({
     new_discounts: z.array(z.unknown()),
     changes: z.array(z.object({
       type: z.string(),
-      from: z.unknown(),
-      to: z.unknown(),
+      id_addon: z.number().nullable().optional(),
+      addon_name: z.string().nullable().optional(),
+      quantity: z.number().optional(),
+      from: z.unknown().optional(),
+      to: z.unknown().optional(),
     })),
   }).nullable().optional(),
 });

package/src/utils/geo-country.ts

@@ -0,0 +1,15 @@
+import { COUNTRIES } from './countries';
+
+export const GEO_COUNTRY_COOKIE = 'gs-geo-country';
+
+export const GEO_UNKNOWN_COUNTRIES = ['XX', 'T1'];
+
+export function readGeoCountry(): string | null {
+  if (typeof document === 'undefined') return null;
+
+  const match = new RegExp(`(?:^|;\\s*)${GEO_COUNTRY_COOKIE}=([^;]+)`).exec(document.cookie);
+  if (!match) return null;
+
+  const iso = match[1].toUpperCase();
+  return COUNTRIES.some((country: { iso: string }) => country.iso === iso) ? iso : null;
+}