Rebase on master and migrate url function to re_path

Author: thinkwelltwd

oauth2_provider/urls.py

@@ -28,10 +28,10 @@
 ]
 
 oidc_urlpatterns = [
-    url(r"^\.well-known/openid-configuration/$", views.ConnectDiscoveryInfoView.as_view(),
+    re_path(r"^\.well-known/openid-configuration/$", views.ConnectDiscoveryInfoView.as_view(),
         name="oidc-connect-discovery-info"),
-    url(r"^jwks/$", views.JwksInfoView.as_view(), name="jwks-info"),
-    url(r"^userinfo/$", views.UserInfoView.as_view(), name="user-info")
+    re_path(r"^jwks/$", views.JwksInfoView.as_view(), name="jwks-info"),
+    re_path(r"^userinfo/$", views.UserInfoView.as_view(), name="user-info")
 ]
 
 

oauth2_provider/views/introspect.py

@@ -7,7 +7,7 @@
 from django.views.decorators.csrf import csrf_exempt
 
 from oauth2_provider.models import get_access_token_model
-from oauth2_provider.views import ClientProtectedScopedResourceView
+from oauth2_provider.views.generic import ClientProtectedScopedResourceView
 
 
 @method_decorator(csrf_exempt, name="dispatch")

tests/test_implicit.py

@@ -317,18 +317,16 @@ def test_id_token_skip_authorization_completely(self):
         self.application.skip_authorization = True
         self.application.save()
 
-        query_string = urlencode({
+        query_data = {
             "client_id": self.application.client_id,
             "response_type": "id_token",
             "state": "random_state_string",
             "nonce": "random_nonce_string",
             "scope": "openid",
             "redirect_uri": "http://example.org",
-        })
-
-        url = "{url}?{qs}".format(url=reverse("oauth2_provider:authorize"), qs=query_string)
+        }
 
-        response = self.client.get(url)
+        response = self.client.get(reverse("oauth2_provider:authorize"), data=query_data)
         self.assertEqual(response.status_code, 302)
         self.assertIn("http://example.org#", response["Location"])
         self.assertNotIn("access_token=", response["Location"])
@@ -351,17 +349,15 @@ def test_id_token_skip_authorization_completely_missing_nonce(self):
         self.application.skip_authorization = True
         self.application.save()
 
-        query_string = urlencode({
+        query_data = {
             "client_id": self.application.client_id,
             "response_type": "id_token",
             "state": "random_state_string",
             "scope": "openid",
             "redirect_uri": "http://example.org",
-        })
-
-        url = "{url}?{qs}".format(url=reverse("oauth2_provider:authorize"), qs=query_string)
+        }
 
-        response = self.client.get(url)
+        response = self.client.get(reverse("oauth2_provider:authorize"), data=query_data)
         self.assertEqual(response.status_code, 302)
         self.assertIn("error=invalid_request", response["Location"])
         self.assertIn("error_description=Request+is+missing+mandatory+nonce+paramete", response["Location"])
@@ -425,18 +421,16 @@ def test_access_token_and_id_token_skip_authorization_completely(self):
         self.application.skip_authorization = True
         self.application.save()
 
-        query_string = urlencode({
+        query_data = {
             "client_id": self.application.client_id,
             "response_type": "id_token token",
             "state": "random_state_string",
             "nonce": "random_nonce_string",
             "scope": "openid",
             "redirect_uri": "http://example.org",
-        })
-
-        url = "{url}?{qs}".format(url=reverse("oauth2_provider:authorize"), qs=query_string)
+        }
 
-        response = self.client.get(url)
+        response = self.client.get(reverse("oauth2_provider:authorize"), data=query_data)
         self.assertEqual(response.status_code, 302)
         self.assertIn("http://example.org#", response["Location"])
         self.assertIn("access_token=", response["Location"])

tests/urls.py

@@ -1,13 +1,11 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.contrib import admin
 
 
 admin.autodiscover()
 
 
 urlpatterns = [
-    url(r"^o/", include("oauth2_provider.urls", namespace="oauth2_provider")),
+    re_path(r"^o/", include("oauth2_provider.urls", namespace="oauth2_provider")),
+    re_path(r"^admin/", admin.site.urls),
 ]
-
-
-urlpatterns += [url(r"^admin/", admin.site.urls)]