Skip to content

Commit

Permalink
make Django 4 support backwards compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
larslevie committed Nov 29, 2023
1 parent 42e8992 commit 2174ab1
Showing 2 changed files with 19 additions and 6 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -15,6 +15,14 @@ Step 1: `pip install django-admin-oauth2` and include it in your project's requi

Step 2: Include the django-admin-oauth2 urlconf in your project's urls.py:

Django 1.x

```python
url(r'/admin/oauth/', include('oauthadmin.urls'))
```

Django >= 2.0

```python
re_path(r'/admin/oauth/', include('oauthadmin.urls'))
```
@@ -85,7 +93,7 @@ When the CSRF validation token doesn't match, django-admin-oauth2 will redirect


## Changelog
* 1.2.1: Add support for django 4
* 1.2.1: Add support for django 4, retain backwards compat with Django 1.x
* 1.2.0: Allow overriding oauth scope with new parameter, OAUTHADMIN_SCOP
* 1.1.3: Bugfix in adminsite (tabs vs spaces)
* 1.1.2: Add support for django 2
15 changes: 10 additions & 5 deletions oauthadmin/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
from django.urls import re_path
import oauthadmin.views

try:
from django.urls import re_path as url
except ImportError:
from django.conf.urls import url


urlpatterns = [
re_path(r'login/', oauthadmin.views.login),
re_path(r'callback/', oauthadmin.views.callback),
re_path(r'logout/', oauthadmin.views.logout),
re_path(r'logout_redirect/', oauthadmin.views.logout_redirect),
url(r"login/", oauthadmin.views.login),
url(r"callback/", oauthadmin.views.callback),
url(r"logout/", oauthadmin.views.logout),
url(r"logout_redirect/", oauthadmin.views.logout_redirect),
]

0 comments on commit 2174ab1

Please sign in to comment.