Skip to content
Snippets Groups Projects
Commit 5752c50e authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '537-oauth-endpoint-urls-broken-in-recent-refactoring' into 'master'

Resolve "[OAuth] Endpoint URLs broken in recent refactoring"

Closes #537

See merge request AlekSIS/official/AlekSIS-Core!775
parents 8019ca64 d500f2da
No related branches found
No related tags found
1 merge request!775Resolve "[OAuth] Endpoint URLs broken in recent refactoring"
Pipeline #40197 passed
Pipeline: AlekSIS

#40209

    ......@@ -14,6 +14,7 @@ Fixed
    * Make style.css and favicons cachable.
    * Import model extensions from other apps before form extensions.
    * Recreate backwards compatiblity for OAuth URLs by using ``oauth/`` again.
    Removed
    ~~~~~~~
    ......
    ......@@ -102,26 +102,26 @@ urlpatterns = [
    ConnectDiscoveryInfoView.as_view(),
    name="oidc_configuration",
    ),
    path("oauth2/applications/", views.OAuth2ListView.as_view(), name="oauth2_applications"),
    path("oauth/applications/", views.OAuth2ListView.as_view(), name="oauth2_applications"),
    path(
    "oauth2/applications/register/",
    "oauth/applications/register/",
    views.OAuth2RegisterView.as_view(),
    name="register_oauth_application",
    ),
    path(
    "oauth2/applications/<int:pk>/", views.OAuth2DetailView.as_view(), name="oauth2_application"
    "oauth/applications/<int:pk>/", views.OAuth2DetailView.as_view(), name="oauth2_application"
    ),
    path(
    "oauth2/applications/<int:pk>/delete/",
    "oauth/applications/<int:pk>/delete/",
    views.OAuth2DeleteView.as_view(),
    name="delete_oauth2_application",
    ),
    path(
    "oauth2/applications/<int:pk>/edit/",
    "oauth/applications/<int:pk>/edit/",
    views.OAuth2EditView.as_view(),
    name="edit_oauth2_application",
    ),
    path("oauth2/", include("oauth2_provider.urls", namespace="oauth2_provider")),
    path("oauth/", include("oauth2_provider.urls", namespace="oauth2_provider")),
    path("__i18n__/", include("django.conf.urls.i18n")),
    path(
    "ckeditor/upload/",
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment