Fix for werkzeug Request.url issue.

ref: https://stackoverflow.com/questions/52300448/authlib-reports-error-trying-to-decode-a-non-urlencoded-string-when-using-andr

authlib/flask/oauth1/authorization_server.py

@@ -5,6 +5,7 @@
     OAuth1Request,
     AuthorizationServer as _AuthorizationServer,
 )
+from authlib.common.encoding import to_unicode
 from authlib.common.security import generate_token
 from authlib.common.urls import url_encode
 from authlib.deprecate import deprecate
@@ -193,4 +194,8 @@ def _create_oauth1_request():
         body = _req.form.to_dict(flat=True)
     else:
         body = None
-    return OAuth1Request(_req.method, _req.url, body, _req.headers)
+
+    url = _req.base_url
+    if _req.query_string:
+        url = url + '?' + to_unicode(_req.query_string)
+    return OAuth1Request(_req.method, url, body, _req.headers)

authlib/flask/oauth2/authorization_server.py

@@ -104,12 +104,13 @@ def process_request(self, request):
             body = q.form.to_dict(flat=True)
         else:
             body = None
-        return OAuth2Request(
-            q.method,
-            q.url,
-            body,
-            q.headers
-        )
+
+        # query string in werkzeug Request.url is very weird
+        # scope=profile%20email will be scope=profile email
+        url = q.base_url
+        if q.query_string:
+            url = url + '?' + to_unicode(q.query_string)
+        return OAuth2Request(q.method, url, body, q.headers)
 
     def handle_response(self, status_code, payload, headers):
         if isinstance(payload, dict):