From 417a9329a1aac59429f0ad859a8be72779c04697 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@no-break.space>
Date: Tue, 8 May 2018 20:51:34 +0800
Subject: [PATCH 1/4] Explicitly typed 'Map<String, String>' for
 'additionalParams'

---
 lib/src/authorization.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/authorization.dart b/lib/src/authorization.dart
index fcaf8dd..fc540c2 100644
--- a/lib/src/authorization.dart
+++ b/lib/src/authorization.dart
@@ -41,7 +41,7 @@ class Authorization {
     if (callbackURI == null) {
       callbackURI = 'oob';
     }
-    Map additionalParams = {
+    Map<String, String> additionalParams = {
       'oauth_callback': callbackURI
     };
     var ahb = new AuthorizationHeaderBuilder();
@@ -78,7 +78,7 @@ class Authorization {
    * http://tools.ietf.org/html/rfc5849#section-2.3
    */
   Future<AuthorizationResponse> requestTokenCredentials(Credentials tokenCredentials, String verifier) {
-    Map additionalParams = {
+    MapMap<String, String> additionalParams = {
       'oauth_verifier': verifier
     };
     var ahb = new AuthorizationHeaderBuilder();

From 629bac55f75246f71d68f14efbb70bdc23361cc2 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@no-break.space>
Date: Tue, 8 May 2018 20:52:57 +0800
Subject: [PATCH 2/4] Remove dependency on 'formler' package

---
 lib/src/authorization.dart | 5 ++---
 pubspec.yaml               | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/src/authorization.dart b/lib/src/authorization.dart
index fc540c2..85273ca 100644
--- a/lib/src/authorization.dart
+++ b/lib/src/authorization.dart
@@ -2,7 +2,6 @@ library authorization;
 
 import 'dart:async';
 import 'package:http/http.dart' as http;
-import 'package:formler/formler.dart';
 
 import 'credentials.dart';
 import 'client_credentials.dart';
@@ -57,7 +56,7 @@ class Authorization {
       if ((res as http.Response).statusCode != 200) {
         throw new StateError(res.body);
       }
-      Map<String, String> params = Formler.parseUrlEncoded(res.body);
+      Map<String, String> params = Uri.splitQueryString(res.body);
       if (params['oauth_callback_confirmed'].toLowerCase() != 'true') {
         throw new StateError("oauth_callback_confirmed must be true");
       }
@@ -95,7 +94,7 @@ class Authorization {
       if ((res as http.Response).statusCode != 200) {
         throw new StateError(res.body);
       }
-      Map<String, String> params = Formler.parseUrlEncoded(res.body);
+      Map<String, String> params = Uri.splitQueryString(res.body);
       return new AuthorizationResponse.fromMap(params);
     });
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 0294724..30829b9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,6 @@ version: 0.3.1
 description: A pub package of OAuth 1.0 (RFC 5849) library.
 dependencies:
   crypto: any
-  formler: any
   http: any
   unittest: any
   uuid: any

From b69cdad47d63f1735c8e3e8459948ad937a97a74 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@no-break.space>
Date: Tue, 8 May 2018 20:56:54 +0800
Subject: [PATCH 3/4] Remove dependency on 'formler' package

---
 lib/src/client.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/client.dart b/lib/src/client.dart
index 241a1ae..b10299c 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -2,7 +2,6 @@ library oauth1_client;
 
 import 'dart:async';
 import 'package:http/http.dart' as http;
-import 'package:formler/formler.dart';
 
 import 'signature_method.dart';
 import 'client_credentials.dart';
@@ -41,12 +40,12 @@ class Client extends http.BaseClient {
     var headers = request.headers;
     Map<String, String> additionalParameters = new Map<String, String>();
     if (headers.containsKey('Authorization')) {
-      additionalParameters = Formler.parseUrlEncoded(headers['Authorization']);
+      additionalParameters = Uri.splitQueryString(headers['Authorization']);
     }
     if (headers.containsKey('content-type') &&
         headers['content-type'].contains('application/x-www-form-urlencoded') &&
         (request as http.Request).body != null) {
-      additionalParameters.addAll(Formler.parseUrlEncoded((request as http.Request).body));
+      additionalParameters.addAll(Uri.splitQueryString((request as http.Request).body));
     }
     ahb.additionalParameters = additionalParameters;
 

From f000f62502de0ce96c5fb67df7dd9d32f0b733c5 Mon Sep 17 00:00:00 2001
From: Jan Boon <kaetemi@no-break.space>
Date: Tue, 8 May 2018 21:01:52 +0800
Subject: [PATCH 4/4] Fix typo

---
 lib/src/authorization.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/authorization.dart b/lib/src/authorization.dart
index 85273ca..268b9fe 100644
--- a/lib/src/authorization.dart
+++ b/lib/src/authorization.dart
@@ -77,7 +77,7 @@ class Authorization {
    * http://tools.ietf.org/html/rfc5849#section-2.3
    */
   Future<AuthorizationResponse> requestTokenCredentials(Credentials tokenCredentials, String verifier) {
-    MapMap<String, String> additionalParams = {
+    Map<String, String> additionalParams = {
       'oauth_verifier': verifier
     };
     var ahb = new AuthorizationHeaderBuilder();