fix: cakepay countries endpoint

Author: julian-CStack

lib/pages/cakepay/cakepay_vendors_view.dart

@@ -60,15 +60,27 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
 
   /// Derive a country list from the loaded vendors so we don't need the
   /// broken /marketplace/countries/ endpoint.
-  void _deriveCountries() {
-    final seen = <String>{};
-    _countryNames =
-        _vendors
-            .map((v) => v.country)
-            .whereType<String>()
-            .where((c) => c.isNotEmpty && seen.add(c))
-            .toList()
-          ..sort();
+  Future<void> _deriveCountries() async {
+    // naive caching
+    if (_countryNames.isNotEmpty) return;
+
+    final response = await CakePayService.instance.client.getAllCountries();
+
+    if (response.hasError || response.value == null) {
+      if (mounted) {
+        setState(() {
+          _error = response.exception?.message ?? "Failed to load countries";
+        });
+      }
+    } else {
+      _countryNames =
+          response.value!
+              .where((e) => e.available)
+              .map((e) => e.name)
+              .toSet()
+              .toList(growable: false)
+            ..sort();
+    }
   }
 
   Future<void> _loadVendors() async {
@@ -86,15 +98,16 @@ class _CakePayVendorsViewState extends State<CakePayVendorsView> {
 
     if (!mounted) return;
 
-    setState(() {
-      _loading = false;
-      if (!resp.hasError && resp.value != null) {
-        _vendors = resp.value!;
-        _deriveCountries();
-      } else {
+    if (resp.hasError || resp.value == null) {
+      setState(() {
         _error = resp.exception?.message ?? "Failed to load gift cards";
-      }
-    });
+      });
+    } else {
+      _vendors = resp.value!;
+      await _deriveCountries();
+    }
+
+    if (mounted) setState(() => _loading = false);
   }
 
   Future<void> _onCardTapped(CakePayCard card) async {

lib/services/cakepay/src/client.dart

@@ -27,7 +27,7 @@ class CakePayClient {
     HTTP? httpClient,
   }) : _httpClient = httpClient ?? const HTTP();
 
-  Map<String, String> _headers() => {
+  late final _authHeaders = {
     'Authorization': 'Bearer $apiToken',
     'Content-Type': 'application/json',
   };
@@ -175,44 +175,8 @@ class CakePayClient {
     );
   }
 
-  Future<ApiResponse<List<CakePayCountry>>> getCountries({
-    int? page,
-    int? pageSize,
-  }) async {
-    final query = <String, String>{};
-    if (page != null) query['page'] = page.toString();
-    if (pageSize != null) query['page_size'] = pageSize.toString();
-
-    return _requestRaw(
-      'GET',
-      '/marketplace/countries/',
-      query: query,
-      parse: (body) {
-        final decoded = jsonDecode(body);
-        if (decoded is List) {
-          return decoded
-              .whereType<Map<String, dynamic>>()
-              .map(CakePayCountry.fromJson)
-              .toList();
-        }
-        if (decoded is Map<String, dynamic>) {
-          final results = decoded['results'];
-          if (results is List) {
-            return results
-                .whereType<Map<String, dynamic>>()
-                .map(CakePayCountry.fromJson)
-                .toList();
-          }
-        }
-        return [];
-      },
-    );
-  }
-
   /// Fetches all countries by following pagination til last page.
-  Future<ApiResponse<List<CakePayCountry>>> getAllCountries({
-    int pageSize = 250,
-  }) async {
+  Future<ApiResponse<List<CakePayCountry>>> getAllCountries() async {
     try {
       final allCountries = <CakePayCountry>[];
       int page = 1;
@@ -221,7 +185,8 @@ class CakePayClient {
         final response = await _send(
           'GET',
           '/marketplace/countries/',
-          query: {'page': page.toString(), 'page_size': pageSize.toString()},
+          query: {'page': page.toString()},
+          overrideHeaders: {}, // Auth here leads to 403. Why? Who knows?
         );
 
         if (response.code < 200 || response.code >= 300) {
@@ -236,15 +201,16 @@ class CakePayClient {
 
         final decoded = jsonDecode(response.body);
 
+        // This never gets hit according to docs
         // Handle non-paginated response (plain list).
-        if (decoded is List) {
-          return ApiResponse(
-            value: decoded
-                .whereType<Map<String, dynamic>>()
-                .map(CakePayCountry.fromJson)
-                .toList(),
-          );
-        }
+        // if (decoded is List) {
+        //   return ApiResponse(
+        //     value: decoded
+        //         .whereType<Map<String, dynamic>>()
+        //         .map(CakePayCountry.fromJson)
+        //         .toList(),
+        //   );
+        // }
 
         if (decoded is Map<String, dynamic>) {
           final results = decoded['results'];
@@ -466,15 +432,20 @@ class CakePayClient {
     String path, {
     Map<String, dynamic>? body,
     Map<String, String>? query,
+    Map<String, String>? overrideHeaders,
   }) async {
     var uri = Uri.parse('$baseUrl$path');
     if (query != null && query.isNotEmpty) {
       uri = uri.replace(queryParameters: query);
     }
-    final headers = _headers();
+    final headers = overrideHeaders ?? _authHeaders;
     final proxy = _proxyInfo;
 
-    Logging.instance.t("$_kTag $method $uri");
+    try {
+      throw Exception(path);
+    } catch (e, s) {
+      Logging.instance.f("$_kTag $method $uri", error: e, stackTrace: s);
+    }
 
     switch (method) {
       case 'GET':