From db5a4784d2ca3b9659ad210f8d1c5fcf2fd17af1 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 14 Aug 2024 17:17:29 +0800 Subject: [PATCH 1/5] use path in urls --- oauth2_provider/urls.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/oauth2_provider/urls.py b/oauth2_provider/urls.py index 18972612c..669f15f54 100644 --- a/oauth2_provider/urls.py +++ b/oauth2_provider/urls.py @@ -1,4 +1,4 @@ -from django.urls import re_path +from django.urls import path, re_path from . import views @@ -7,24 +7,23 @@ base_urlpatterns = [ - re_path(r"^authorize/$", views.AuthorizationView.as_view(), name="authorize"), - re_path(r"^token/$", views.TokenView.as_view(), name="token"), - re_path(r"^revoke_token/$", views.RevokeTokenView.as_view(), name="revoke-token"), - re_path(r"^introspect/$", views.IntrospectTokenView.as_view(), name="introspect"), + path("authorize/", views.AuthorizationView.as_view(), name="authorize"), + path("token/", views.TokenView.as_view(), name="token"), + path("revoke_token/", views.RevokeTokenView.as_view(), name="revoke-token"), + path("introspect/", views.IntrospectTokenView.as_view(), name="introspect"), ] management_urlpatterns = [ # Application management views - re_path(r"^applications/$", views.ApplicationList.as_view(), name="list"), - re_path(r"^applications/register/$", views.ApplicationRegistration.as_view(), name="register"), - re_path(r"^applications/(?P[\w-]+)/$", views.ApplicationDetail.as_view(), name="detail"), - re_path(r"^applications/(?P[\w-]+)/delete/$", views.ApplicationDelete.as_view(), name="delete"), - re_path(r"^applications/(?P[\w-]+)/update/$", views.ApplicationUpdate.as_view(), name="update"), + path("applications/", views.ApplicationList.as_view(), name="list"), + path("applications/register/", views.ApplicationRegistration.as_view(), name="register"), + path("applications/(?P[\w-]+)/", views.ApplicationDetail.as_view(), name="detail"), + path("applications/(?P[\w-]+)/delete/", views.ApplicationDelete.as_view(), name="delete"), + path("applications/(?P[\w-]+)/update/", views.ApplicationUpdate.as_view(), name="update"), # Token management views - re_path(r"^authorized_tokens/$", views.AuthorizedTokensListView.as_view(), name="authorized-token-list"), - re_path( - r"^authorized_tokens/(?P[\w-]+)/delete/$", + path("authorized_tokens/", views.AuthorizedTokensListView.as_view(), name="authorized-token-list"), + path("authorized_tokens/(?P[\w-]+)/delete/", views.AuthorizedTokenDeleteView.as_view(), name="authorized-token-delete", ), @@ -40,9 +39,9 @@ views.ConnectDiscoveryInfoView.as_view(), name="oidc-connect-discovery-info", ), - re_path(r"^\.well-known/jwks.json$", views.JwksInfoView.as_view(), name="jwks-info"), - re_path(r"^userinfo/$", views.UserInfoView.as_view(), name="user-info"), - re_path(r"^logout/$", views.RPInitiatedLogoutView.as_view(), name="rp-initiated-logout"), + path("\.well-known/jwks.json", views.JwksInfoView.as_view(), name="jwks-info"), + path("userinfo/", views.UserInfoView.as_view(), name="user-info"), + path("logout/", views.RPInitiatedLogoutView.as_view(), name="rp-initiated-logout"), ] From 4b94e41fdc5d15a8f7a2f77cac9f1cada7dc8a30 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 09:19:58 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- oauth2_provider/urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oauth2_provider/urls.py b/oauth2_provider/urls.py index 669f15f54..c6f2f4c64 100644 --- a/oauth2_provider/urls.py +++ b/oauth2_provider/urls.py @@ -23,7 +23,8 @@ path("applications/(?P[\w-]+)/update/", views.ApplicationUpdate.as_view(), name="update"), # Token management views path("authorized_tokens/", views.AuthorizedTokensListView.as_view(), name="authorized-token-list"), - path("authorized_tokens/(?P[\w-]+)/delete/", + path( + "authorized_tokens/(?P[\w-]+)/delete/", views.AuthorizedTokenDeleteView.as_view(), name="authorized-token-delete", ), From 9182370155982cd0e7bc5a85c958a83edc00e10e Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 14 Aug 2024 17:23:40 +0800 Subject: [PATCH 3/5] fix args --- oauth2_provider/urls.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/oauth2_provider/urls.py b/oauth2_provider/urls.py index c6f2f4c64..921876821 100644 --- a/oauth2_provider/urls.py +++ b/oauth2_provider/urls.py @@ -18,13 +18,12 @@ # Application management views path("applications/", views.ApplicationList.as_view(), name="list"), path("applications/register/", views.ApplicationRegistration.as_view(), name="register"), - path("applications/(?P[\w-]+)/", views.ApplicationDetail.as_view(), name="detail"), - path("applications/(?P[\w-]+)/delete/", views.ApplicationDelete.as_view(), name="delete"), - path("applications/(?P[\w-]+)/update/", views.ApplicationUpdate.as_view(), name="update"), + path("applications//", views.ApplicationDetail.as_view(), name="detail"), + path("applications//delete/", views.ApplicationDelete.as_view(), name="delete"), + path("applications//update/", views.ApplicationUpdate.as_view(), name="update"), # Token management views path("authorized_tokens/", views.AuthorizedTokensListView.as_view(), name="authorized-token-list"), - path( - "authorized_tokens/(?P[\w-]+)/delete/", + path("authorized_tokens//delete/", views.AuthorizedTokenDeleteView.as_view(), name="authorized-token-delete", ), From 2c6cbdadded2408aed195b5f225c3f1cc0300f21 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 09:25:18 +0000 Subject: [PATCH 4/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- oauth2_provider/urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oauth2_provider/urls.py b/oauth2_provider/urls.py index 921876821..538807906 100644 --- a/oauth2_provider/urls.py +++ b/oauth2_provider/urls.py @@ -23,7 +23,8 @@ path("applications//update/", views.ApplicationUpdate.as_view(), name="update"), # Token management views path("authorized_tokens/", views.AuthorizedTokensListView.as_view(), name="authorized-token-list"), - path("authorized_tokens//delete/", + path( + "authorized_tokens//delete/", views.AuthorizedTokenDeleteView.as_view(), name="authorized-token-delete", ), From 2fa84fa3cdfe30703e4e5f89c29932c2470adc14 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 14 Aug 2024 17:25:57 +0800 Subject: [PATCH 5/5] fix jwks.json --- oauth2_provider/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauth2_provider/urls.py b/oauth2_provider/urls.py index 538807906..155822f45 100644 --- a/oauth2_provider/urls.py +++ b/oauth2_provider/urls.py @@ -40,7 +40,7 @@ views.ConnectDiscoveryInfoView.as_view(), name="oidc-connect-discovery-info", ), - path("\.well-known/jwks.json", views.JwksInfoView.as_view(), name="jwks-info"), + path(".well-known/jwks.json", views.JwksInfoView.as_view(), name="jwks-info"), path("userinfo/", views.UserInfoView.as_view(), name="user-info"), path("logout/", views.RPInitiatedLogoutView.as_view(), name="rp-initiated-logout"), ]