Skip to content

Commit 5a8c8c0

Browse files
Akalanka47000Akalanka47000
committed
Fix(enhanced-http): issue in header interceptor
1 parent 4c708ea commit 5a8c8c0

File tree

3 files changed

+62
-37
lines changed

3 files changed

+62
-37
lines changed

‎packages/enhanced_http/lib/enhanced_http.dart

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
3131
return await streamed(
3232
'GET',
3333
url,
34-
mergeHeaders(
35-
this.headers, headers, this.interceptors!.headers?.call()),
34+
mergeHeaders(this.headers, headers,
35+
await this.interceptors!.headers?.call()),
3636
responseType: responseType);
3737
}
3838
return await http.get(
3939
url,
4040
headers: mergeHeaders(
41-
this.headers, headers, this.interceptors!.headers?.call()),
41+
this.headers, headers, await this.interceptors!.headers?.call()),
4242
);
4343
}, url, options, interceptors);
4444
}
@@ -56,16 +56,16 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
5656
return await streamed(
5757
'POST',
5858
url,
59-
mergeHeaders(
60-
this.headers, headers, this.interceptors!.headers?.call()),
59+
mergeHeaders(this.headers, headers,
60+
await this.interceptors!.headers?.call()),
6161
payload: payload,
6262
files: files,
6363
responseType: responseType);
6464
}
6565
return await http.post(
6666
url,
6767
headers: mergeHeaders(
68-
this.headers, headers, this.interceptors!.headers?.call()),
68+
this.headers, headers, await this.interceptors!.headers?.call()),
6969
body: payload == null ? {} : jsonEncode(payload),
7070
);
7171
}, url, options, interceptors);
@@ -79,8 +79,8 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
7979
return await streamed(
8080
method,
8181
url,
82-
mergeHeaders(
83-
this.headers, headers, this.interceptors!.headers?.call()),
82+
mergeHeaders(this.headers, headers,
83+
await this.interceptors!.headers?.call()),
8484
payload: payload,
8585
files: files,
8686
responseType: responseType);
@@ -89,15 +89,15 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
8989
if (method == "PUT") {
9090
return await http.put(
9191
url,
92-
headers: mergeHeaders(
93-
this.headers, headers, this.interceptors!.headers?.call()),
92+
headers: mergeHeaders(this.headers, headers,
93+
await this.interceptors!.headers?.call()),
9494
body: jsonEncode(payload),
9595
);
9696
}
9797
return await http.patch(
9898
url,
9999
headers: mergeHeaders(
100-
this.headers, headers, this.interceptors!.headers?.call()),
100+
this.headers, headers, await this.interceptors!.headers?.call()),
101101
body: jsonEncode(payload),
102102
);
103103
}
@@ -137,14 +137,14 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
137137
return await streamed(
138138
'DELETE',
139139
url,
140-
mergeHeaders(
141-
this.headers, headers, this.interceptors!.headers?.call()),
140+
mergeHeaders(this.headers, headers,
141+
await this.interceptors!.headers?.call()),
142142
responseType: responseType);
143143
}
144144
return await http.delete(
145145
url,
146146
headers: mergeHeaders(
147-
this.headers, headers, this.interceptors!.headers?.call()),
147+
this.headers, headers, await this.interceptors!.headers?.call()),
148148
);
149149
}, url, options, interceptors);
150150
}
@@ -159,7 +159,7 @@ class EnhancedHttp extends StreamedRequest with Interceptor, Utils {
159159
return await http.head(
160160
url,
161161
headers: mergeHeaders(
162-
this.headers, headers, this.interceptors!.headers?.call()),
162+
this.headers, headers, await this.interceptors!.headers?.call()),
163163
);
164164
}, url, options, interceptors);
165165
}

‎packages/enhanced_http/lib/interceptor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:enhanced_http/http_error.dart';
44
class InterceptorOptions {
55
Function(dynamic res)? response;
66
Function(dynamic e)? error;
7-
Function()? headers;
7+
Future<Map<String, String>> Function()? headers;
88

99
InterceptorOptions({this.response, this.error});
1010
}

‎packages/enhanced_http/pubspec.lock

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.2"
43+
version: "1.18.0"
4444
fake_async:
4545
dependency: transitive
4646
description:
@@ -75,38 +75,62 @@ packages:
7575
url: "https://pub.dev"
7676
source: hosted
7777
version: "4.0.2"
78+
leak_tracker:
79+
dependency: transitive
80+
description:
81+
name: leak_tracker
82+
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
83+
url: "https://pub.dev"
84+
source: hosted
85+
version: "10.0.5"
86+
leak_tracker_flutter_testing:
87+
dependency: transitive
88+
description:
89+
name: leak_tracker_flutter_testing
90+
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
91+
url: "https://pub.dev"
92+
source: hosted
93+
version: "3.0.5"
94+
leak_tracker_testing:
95+
dependency: transitive
96+
description:
97+
name: leak_tracker_testing
98+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
99+
url: "https://pub.dev"
100+
source: hosted
101+
version: "3.0.1"
78102
matcher:
79103
dependency: transitive
80104
description:
81105
name: matcher
82-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
106+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
83107
url: "https://pub.dev"
84108
source: hosted
85-
version: "0.12.16"
109+
version: "0.12.16+1"
86110
material_color_utilities:
87111
dependency: transitive
88112
description:
89113
name: material_color_utilities
90-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
114+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
91115
url: "https://pub.dev"
92116
source: hosted
93-
version: "0.5.0"
117+
version: "0.11.1"
94118
meta:
95119
dependency: transitive
96120
description:
97121
name: meta
98-
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
122+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
99123
url: "https://pub.dev"
100124
source: hosted
101-
version: "1.9.1"
125+
version: "1.15.0"
102126
path:
103127
dependency: "direct main"
104128
description:
105129
name: path
106-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
130+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
107131
url: "https://pub.dev"
108132
source: hosted
109-
version: "1.8.3"
133+
version: "1.9.0"
110134
sky_engine:
111135
dependency: transitive
112136
description: flutter
@@ -124,18 +148,18 @@ packages:
124148
dependency: transitive
125149
description:
126150
name: stack_trace
127-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
151+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
128152
url: "https://pub.dev"
129153
source: hosted
130-
version: "1.11.0"
154+
version: "1.11.1"
131155
stream_channel:
132156
dependency: transitive
133157
description:
134158
name: stream_channel
135-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
159+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
136160
url: "https://pub.dev"
137161
source: hosted
138-
version: "2.1.1"
162+
version: "2.1.2"
139163
string_scanner:
140164
dependency: transitive
141165
description:
@@ -156,10 +180,10 @@ packages:
156180
dependency: transitive
157181
description:
158182
name: test_api
159-
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
183+
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
160184
url: "https://pub.dev"
161185
source: hosted
162-
version: "0.6.0"
186+
version: "0.7.2"
163187
typed_data:
164188
dependency: transitive
165189
description:
@@ -176,13 +200,14 @@ packages:
176200
url: "https://pub.dev"
177201
source: hosted
178202
version: "2.1.4"
179-
web:
203+
vm_service:
180204
dependency: transitive
181205
description:
182-
name: web
183-
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
206+
name: vm_service
207+
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
184208
url: "https://pub.dev"
185209
source: hosted
186-
version: "0.1.4-beta"
210+
version: "14.2.5"
187211
sdks:
188-
dart: ">=3.1.0-185.0.dev <3.7.0"
212+
dart: ">=3.3.0 <3.7.0"
213+
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)