fix: Dio does not expand Cache-Control values

llfbandit · May 7, 2021 · a8521ee · a8521ee
1 parent 2ae5510
commit a8521ee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.3.1
+- fix: Cache-Control parsing. Dio does not expand multi valued headers.
+
 ## 2.3.0
 - feat: `allowPostMethod` added to `CacheOptions`.
 

diff --git a/lib/src/model/cache_control.dart b/lib/src/model/cache_control.dart
@@ -37,16 +37,22 @@ class CacheControl {
     final other = <String>[];
 
     for (var value in headerValues) {
-      if (value == 'no-cache') {
-        noCache = true;
-      } else if (value == 'no-store') {
-        noStore = true;
-      } else if (value == 'public' || value == 'private') {
-        privacy = value;
-      } else if (value.startsWith('max-age')) {
-        maxAge = int.tryParse(value.substring(value.indexOf('=') + 1));
-      } else {
-        other.add(value);
+      // Expand values since dio does not do it !
+      for (var expandedValue in value.split(',')) {
+        expandedValue = expandedValue.trim();
+        if (expandedValue == 'no-cache') {
+          noCache = true;
+        } else if (expandedValue == 'no-store') {
+          noStore = true;
+        } else if (expandedValue == 'public' || expandedValue == 'private') {
+          privacy = expandedValue;
+        } else if (expandedValue.startsWith('max-age')) {
+          maxAge = int.tryParse(
+            expandedValue.substring(expandedValue.indexOf('=') + 1),
+          );
+        } else {
+          other.add(expandedValue);
+        }
       }
     }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Dio HTTP cache interceptor with multiple stores respecting HTTP dir
 repository: https://github.com/llfbandit/dio_cache_interceptor
 issue_tracker: https://github.com/llfbandit/dio_cache_interceptor/issues
 
-version: 2.3.0
+version: 2.3.1
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

diff --git a/test/mock_httpclient_adapter.dart b/test/mock_httpclient_adapter.dart
@@ -153,7 +153,7 @@ class MockHttpClientAdapter extends HttpClientAdapter {
             200,
             headers: {
               Headers.contentTypeHeader: [Headers.jsonContentType],
-              'cache-control': ['public', 'max-age=1'],
+              'cache-control': ['public, max-age=1'],
             },
           );
         }