Fix(enhanced-http): issue in header interceptor

sliit-foss · Oct 18, 2024 · 5a8c8c0 · 5a8c8c0
1 parent 4c708ea
commit 5a8c8c0
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 37 deletions.
diff --git a/packages/enhanced_http/lib/enhanced_http.dart b/packages/enhanced_http/lib/enhanced_http.dart
@@ -31,14 +31,14 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
         return await streamed(
             'GET',
             url,
-            mergeHeaders(
-                this.headers, headers, this.interceptors!.headers?.call()),
+            mergeHeaders(this.headers, headers,
+                await this.interceptors!.headers?.call()),
             responseType: responseType);
       }
       return await http.get(
         url,
         headers: mergeHeaders(
-            this.headers, headers, this.interceptors!.headers?.call()),
+            this.headers, headers, await this.interceptors!.headers?.call()),
       );
     }, url, options, interceptors);
   }
@@ -56,16 +56,16 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
         return await streamed(
             'POST',
             url,
-            mergeHeaders(
-                this.headers, headers, this.interceptors!.headers?.call()),
+            mergeHeaders(this.headers, headers,
+                await this.interceptors!.headers?.call()),
             payload: payload,
             files: files,
             responseType: responseType);
       }
       return await http.post(
         url,
         headers: mergeHeaders(
-            this.headers, headers, this.interceptors!.headers?.call()),
+            this.headers, headers, await this.interceptors!.headers?.call()),
         body: payload == null ? {} : jsonEncode(payload),
       );
     }, url, options, interceptors);
@@ -79,8 +79,8 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
         return await streamed(
             method,
             url,
-            mergeHeaders(
-                this.headers, headers, this.interceptors!.headers?.call()),
+            mergeHeaders(this.headers, headers,
+                await this.interceptors!.headers?.call()),
             payload: payload,
             files: files,
             responseType: responseType);
@@ -89,15 +89,15 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
         if (method == "PUT") {
           return await http.put(
             url,
-            headers: mergeHeaders(
-                this.headers, headers, this.interceptors!.headers?.call()),
+            headers: mergeHeaders(this.headers, headers,
+                await this.interceptors!.headers?.call()),
             body: jsonEncode(payload),
           );
         }
         return await http.patch(
           url,
           headers: mergeHeaders(
-              this.headers, headers, this.interceptors!.headers?.call()),
+              this.headers, headers, await this.interceptors!.headers?.call()),
           body: jsonEncode(payload),
         );
       }
@@ -137,14 +137,14 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
         return await streamed(
             'DELETE',
             url,
-            mergeHeaders(
-                this.headers, headers, this.interceptors!.headers?.call()),
+            mergeHeaders(this.headers, headers,
+                await this.interceptors!.headers?.call()),
             responseType: responseType);
       }
       return await http.delete(
         url,
         headers: mergeHeaders(
-            this.headers, headers, this.interceptors!.headers?.call()),
+            this.headers, headers, await this.interceptors!.headers?.call()),
       );
     }, url, options, interceptors);
   }
@@ -159,7 +159,7 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
       return await http.head(
         url,
         headers: mergeHeaders(
-            this.headers, headers, this.interceptors!.headers?.call()),
+            this.headers, headers, await this.interceptors!.headers?.call()),
       );
     }, url, options, interceptors);
   }

diff --git a/packages/enhanced_http/lib/interceptor.dart b/packages/enhanced_http/lib/interceptor.dart
@@ -4,7 +4,7 @@ import 'package:enhanced_http/http_error.dart';
 class InterceptorOptions {
   Function(dynamic res)? response;
   Function(dynamic e)? error;
-  Function()? headers;
+  Future<Map<String, String>> Function()? headers;
 
   InterceptorOptions({this.response, this.error});
 }

diff --git a/packages/enhanced_http/pubspec.lock b/packages/enhanced_http/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   fake_async:
     dependency: transitive
     description:
@@ -75,38 +75,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.5"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.5"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.15.0"
   path:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -124,18 +148,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -156,10 +180,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.2"
   typed_data:
     dependency: transitive
     description:
@@ -176,13 +200,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      name: vm_service
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "14.2.5"
 sdks:
-  dart: ">=3.1.0-185.0.dev <3.7.0"
+  dart: ">=3.3.0 <3.7.0"
+  flutter: ">=3.18.0-18.0.pre.54"