Fixed: HTTP method misaligned parameters.

Author: CodingAleCR

CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## 0.1.1
+
+* Fixed: HTTP Methods have misaligned parameters. Now they are called via named parameters to avoid type mismatch exceptions when being used.
+
 ## 0.1.0
 
-* Added: Documentation for the example.
+* Added: Query Parameters to GET requests, it allows you to set proper parameters without having to add them to the URL beforehand.
+* Modified: Documentation for the example to include the new Query Parameters usage.
 
 ## 0.0.3
 

example/pubspec.lock

@@ -59,7 +59,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.1"
   http_parser:
     dependency: transitive
     description:

lib/http_client_with_interceptor.dart

@@ -1,11 +1,14 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
+import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
 import 'package:http_interceptor/models/models.dart';
 import 'package:http_interceptor/interceptor_contract.dart';
 
+import 'http_methods.dart';
+
 ///Class to be used by the user to set up a new `http.Client` with interceptor supported.
 ///call the `build()` constructor passing in the list of interceptors.
 ///Example:
@@ -50,27 +53,57 @@ class HttpClientWithInterceptor extends http.BaseClient {
     );
   }
 
-  Future<Response> head(url, {Map<String, String> headers}) =>
-      _sendUnstreamed("HEAD", url, headers, null);
+  Future<Response> head(url, {Map<String, String> headers}) => _sendUnstreamed(
+        method: Method.HEAD,
+        url: url,
+        headers: headers,
+      );
 
   Future<Response> get(url,
           {Map<String, String> headers, Map<String, String> params}) =>
-      _sendUnstreamed("GET", url, headers, params);
+      _sendUnstreamed(
+        method: Method.GET,
+        url: url,
+        headers: headers,
+        params: params,
+      );
 
   Future<Response> post(url,
           {Map<String, String> headers, body, Encoding encoding}) =>
-      _sendUnstreamed("POST", url, headers, body, encoding);
+      _sendUnstreamed(
+        method: Method.POST,
+        url: url,
+        headers: headers,
+        body: body,
+        encoding: encoding,
+      );
 
   Future<Response> put(url,
           {Map<String, String> headers, body, Encoding encoding}) =>
-      _sendUnstreamed("PUT", url, headers, body, encoding);
+      _sendUnstreamed(
+        method: Method.PUT,
+        url: url,
+        headers: headers,
+        body: body,
+        encoding: encoding,
+      );
 
   Future<Response> patch(url,
           {Map<String, String> headers, body, Encoding encoding}) =>
-      _sendUnstreamed("PATCH", url, headers, body, encoding);
+      _sendUnstreamed(
+        method: Method.PATCH,
+        url: url,
+        headers: headers,
+        body: body,
+        encoding: encoding,
+      );
 
   Future<Response> delete(url, {Map<String, String> headers}) =>
-      _sendUnstreamed("DELETE", url, headers, null);
+      _sendUnstreamed(
+        method: Method.DELETE,
+        url: url,
+        headers: headers,
+      );
 
   Future<String> read(url, {Map<String, String> headers}) {
     return get(url, headers: headers).then((response) {
@@ -88,22 +121,26 @@ class HttpClientWithInterceptor extends http.BaseClient {
 
   Future<StreamedResponse> send(BaseRequest request) => _client.send(request);
 
-  Future<Response> _sendUnstreamed(String method, url,
-      Map<String, String> headers, Map<String, String> params,
-      [body, Encoding encoding]) async {
-    if (url is String) {
-      var paramUrl = url;
-      if (params != null && params.length > 0) {
-        paramUrl += "?";
-        params.forEach((key, value) {
-          paramUrl += "$key=$value&";
-        });
-        paramUrl = paramUrl.substring(0, paramUrl.length); // to remove the last '&' character
-      }
-      url = Uri.parse(paramUrl);
+  Future<Response> _sendUnstreamed({
+    @required Method method,
+    @required String url,
+    @required Map<String, String> headers,
+    Map<String, String> params,
+    dynamic body,
+    Encoding encoding,
+  }) async {
+    String paramUrl = url;
+    if (params != null && params.length > 0) {
+      paramUrl += "?";
+      params.forEach((key, value) {
+        paramUrl += "$key=$value&";
+      });
+      paramUrl = paramUrl.substring(
+          0, paramUrl.length); // to remove the last '&' character
     }
 
-    var request = new Request(method, url);
+    var requestUrl = Uri.parse(paramUrl);
+    var request = new Request(methodToString(method), requestUrl);
 
     if (headers != null) request.headers.addAll(headers);
     if (encoding != null) request.encoding = encoding;

lib/http_with_interceptor.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 import 'dart:typed_data';
+import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 import 'package:http_interceptor/http_methods.dart';
 import 'package:http_interceptor/models/models.dart';
@@ -54,7 +54,8 @@ class HttpWithInterceptor {
       {Map<String, String> headers, Map<String, String> params}) async {
     RequestData data = await _sendInterception(
         method: Method.GET, headers: headers, url: url, params: params);
-    return _withClient((client) => client.get(data.requestUrl, headers: data.headers));
+    return _withClient(
+        (client) => client.get(data.requestUrl, headers: data.headers));
   }
 
   Future<Response> post(url,
@@ -108,12 +109,12 @@ class HttpWithInterceptor {
       _withClient((client) => client.readBytes(url, headers: headers));
 
   Future<RequestData> _sendInterception({
-    Method method,
-    Encoding encoding,
-    dynamic body,
-    String url,
-    Map<String, String> headers,
+    @required Method method,
+    @required String url,
+    @required Map<String, String> headers,
     Map<String, String> params,
+    dynamic body,
+    Encoding encoding,
   }) async {
     RequestData data = RequestData(
       method: method,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: http_interceptor
-description: A Plugin that allows you to intercept request and response objects and modify them if desired.
-version: 0.1.0
+description: A lightweight, simple plugin that allows you to intercept request and response objects and modify them if desired.
+version: 0.1.1
 author: Alejandro Ulate (codingalecr) <[email protected]>
 homepage: https://github.com/CodingAleCR/http_interceptor
 

test/http_interceptor_test.dart

@@ -1,3 +1 @@
-void main() {
-  //TODO: Add Tests.
-}
+void main() {}