Merge pull request #229 from olist/v0.5.x
Update project to support Django 2.0
This commit is contained in:
commit
33dc30ab0e
|
@ -10,8 +10,11 @@ env:
|
||||||
- DJANGO=1.9
|
- DJANGO=1.9
|
||||||
- DJANGO=1.10
|
- DJANGO=1.10
|
||||||
- DJANGO=1.11
|
- DJANGO=1.11
|
||||||
|
- DJANGO=2.0
|
||||||
matrix:
|
matrix:
|
||||||
exclude:
|
exclude:
|
||||||
|
- python: "2.7"
|
||||||
|
env: DJANGO=2.0
|
||||||
- python: "3.5"
|
- python: "3.5"
|
||||||
env: DJANGO=1.7
|
env: DJANGO=1.7
|
||||||
- python: "3.6"
|
- python: "3.6"
|
||||||
|
|
|
@ -2,8 +2,10 @@
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
### [Unreleased]
|
### [0.5.3] - 2018-02-01
|
||||||
|
|
||||||
|
##### Fixed
|
||||||
|
- Update project to support Django 2.0
|
||||||
|
|
||||||
### [0.5.2] - 2017-08-22
|
### [0.5.2] - 2017-08-22
|
||||||
|
|
||||||
|
@ -11,7 +13,6 @@ All notable changes to this project will be documented in this file.
|
||||||
- Fix infinite login loop if "prompt=login" (#198)
|
- Fix infinite login loop if "prompt=login" (#198)
|
||||||
- Fix Django 2.0 deprecation warnings (#185)
|
- Fix Django 2.0 deprecation warnings (#185)
|
||||||
|
|
||||||
|
|
||||||
### [0.5.1] - 2017-07-11
|
### [0.5.1] - 2017-07-11
|
||||||
|
|
||||||
##### Changed
|
##### Changed
|
||||||
|
|
|
@ -29,11 +29,11 @@ MIDDLEWARE_CLASSES = [
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
|
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'oidc_provider.middleware.SessionManagementMiddleware',
|
'oidc_provider.middleware.SessionManagementMiddleware',
|
||||||
]
|
]
|
||||||
|
MIDDLEWARE = MIDDLEWARE_CLASSES
|
||||||
|
|
||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
|
try:
|
||||||
|
from django.urls import include, url
|
||||||
|
except ImportError:
|
||||||
from django.conf.urls import include, url
|
from django.conf.urls import include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.views.generic import TemplateView
|
from django.views.generic import TemplateView
|
||||||
|
@ -8,8 +11,6 @@ urlpatterns = [
|
||||||
url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
|
url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
|
||||||
url(r'^accounts/login/$', auth_views.login, {'template_name': 'login.html'}, name='login'),
|
url(r'^accounts/login/$', auth_views.login, {'template_name': 'login.html'}, name='login'),
|
||||||
url(r'^accounts/logout/$', auth_views.logout, {'next_page': '/'}, name='logout'),
|
url(r'^accounts/logout/$', auth_views.logout, {'next_page': '/'}, name='logout'),
|
||||||
|
|
||||||
url(r'^', include('oidc_provider.urls', namespace='oidc_provider')),
|
url(r'^', include('oidc_provider.urls', namespace='oidc_provider')),
|
||||||
|
url(r'^admin/', admin.site.urls),
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
|
||||||
]
|
]
|
||||||
|
|
5
oidc_provider/compat.py
Normal file
5
oidc_provider/compat.py
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
def get_attr_or_callable(obj, name):
|
||||||
|
target = getattr(obj, name)
|
||||||
|
if callable(target):
|
||||||
|
return target()
|
||||||
|
return target
|
|
@ -1,4 +1,7 @@
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
|
try:
|
||||||
|
from django.urls import include, url
|
||||||
|
except ImportError:
|
||||||
from django.conf.urls import include, url
|
from django.conf.urls import include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.views.generic import TemplateView
|
from django.views.generic import TemplateView
|
||||||
|
@ -11,5 +14,5 @@ urlpatterns = [
|
||||||
|
|
||||||
url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')),
|
url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')),
|
||||||
|
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
url(r'^admin/', admin.site.urls),
|
||||||
]
|
]
|
||||||
|
|
|
@ -13,6 +13,9 @@ from mock import patch, mock
|
||||||
|
|
||||||
from django.contrib.auth.models import AnonymousUser
|
from django.contrib.auth.models import AnonymousUser
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
|
try:
|
||||||
|
from django.urls import reverse
|
||||||
|
except ImportError:
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.test import (
|
from django.test import (
|
||||||
RequestFactory,
|
RequestFactory,
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
|
try:
|
||||||
|
from django.urls import reverse
|
||||||
|
except ImportError:
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
|
@ -51,4 +54,3 @@ class EndSessionTestCase(TestCase):
|
||||||
self.client.get(self.url)
|
self.client.get(self.url)
|
||||||
self.assertTrue(hook_function.called, 'OIDC_AFTER_END_SESSION_HOOK should be called')
|
self.assertTrue(hook_function.called, 'OIDC_AFTER_END_SESSION_HOOK should be called')
|
||||||
self.assertTrue(hook_function.call_count == 1, 'OIDC_AFTER_END_SESSION_HOOK should be called once but was {}'.format(hook_function.call_count))
|
self.assertTrue(hook_function.call_count == 1, 'OIDC_AFTER_END_SESSION_HOOK should be called once but was {}'.format(hook_function.call_count))
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
try:
|
||||||
|
from django.urls import url
|
||||||
|
except ImportError:
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from django.test import TestCase, override_settings
|
from django.test import TestCase, override_settings
|
||||||
from django.views.generic import View
|
from django.views.generic import View
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
try:
|
||||||
|
from django.urls import reverse
|
||||||
|
except ImportError:
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.test import RequestFactory
|
from django.test import RequestFactory
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
|
@ -9,6 +9,9 @@ except ImportError:
|
||||||
from urllib import urlencode
|
from urllib import urlencode
|
||||||
|
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
|
try:
|
||||||
|
from django.urls import reverse
|
||||||
|
except ImportError:
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.test import (
|
from django.test import (
|
||||||
RequestFactory,
|
RequestFactory,
|
||||||
|
|
|
@ -6,6 +6,9 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from urllib import urlencode
|
from urllib import urlencode
|
||||||
|
|
||||||
|
try:
|
||||||
|
from django.urls import reverse
|
||||||
|
except ImportError:
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.test import RequestFactory
|
from django.test import RequestFactory
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
try:
|
||||||
|
from django.urls import url
|
||||||
|
except ImportError:
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from django.views.decorators.csrf import csrf_exempt
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
|
|
||||||
|
|
|
@ -11,13 +11,10 @@ from django.contrib.auth.views import (
|
||||||
redirect_to_login,
|
redirect_to_login,
|
||||||
logout,
|
logout,
|
||||||
)
|
)
|
||||||
|
try:
|
||||||
import django
|
|
||||||
if django.VERSION >= (1, 11):
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
else:
|
except ImportError:
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
|
|
||||||
from django.contrib.auth import logout as django_user_logout
|
from django.contrib.auth import logout as django_user_logout
|
||||||
from django.http import JsonResponse
|
from django.http import JsonResponse
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
|
@ -28,6 +25,7 @@ from django.views.decorators.http import require_http_methods
|
||||||
from django.views.generic import View
|
from django.views.generic import View
|
||||||
from jwkest import long_to_base64
|
from jwkest import long_to_base64
|
||||||
|
|
||||||
|
from oidc_provider.compat import get_attr_or_callable
|
||||||
from oidc_provider.lib.claims import StandardScopeClaims
|
from oidc_provider.lib.claims import StandardScopeClaims
|
||||||
from oidc_provider.lib.endpoints.authorize import AuthorizeEndpoint
|
from oidc_provider.lib.endpoints.authorize import AuthorizeEndpoint
|
||||||
from oidc_provider.lib.endpoints.token import TokenEndpoint
|
from oidc_provider.lib.endpoints.token import TokenEndpoint
|
||||||
|
@ -65,7 +63,7 @@ class AuthorizeView(View):
|
||||||
try:
|
try:
|
||||||
authorize.validate_params()
|
authorize.validate_params()
|
||||||
|
|
||||||
if request.user.is_authenticated():
|
if get_attr_or_callable(request.user, 'is_authenticated'):
|
||||||
# Check if there's a hook setted.
|
# Check if there's a hook setted.
|
||||||
hook_resp = settings.get('OIDC_AFTER_USERLOGIN_HOOK', import_str=True)(
|
hook_resp = settings.get('OIDC_AFTER_USERLOGIN_HOOK', import_str=True)(
|
||||||
request=request, user=request.user,
|
request=request, user=request.user,
|
||||||
|
|
|
@ -26,6 +26,12 @@ DEFAULT_SETTINGS = dict(
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
MIDDLEWARE=[
|
||||||
|
'django.middleware.common.CommonMiddleware',
|
||||||
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
|
],
|
||||||
|
|
||||||
TEMPLATES=[
|
TEMPLATES=[
|
||||||
{
|
{
|
||||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -10,7 +10,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='django-oidc-provider',
|
name='django-oidc-provider',
|
||||||
version='0.5.2',
|
version='0.5.3',
|
||||||
packages=find_packages(),
|
packages=find_packages(),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
license='MIT License',
|
license='MIT License',
|
||||||
|
|
7
tox.ini
7
tox.ini
|
@ -3,9 +3,9 @@
|
||||||
envlist=
|
envlist=
|
||||||
clean,
|
clean,
|
||||||
py27-django{17,18,19,110,111},
|
py27-django{17,18,19,110,111},
|
||||||
py34-django{17,18,19,110,111},
|
py34-django{17,18,19,110,111,20},
|
||||||
py35-django{18,19,110,111},
|
py35-django{18,19,110,111,20},
|
||||||
py36-django{18,19,110,111},
|
py36-django{18,19,110,111,20},
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@ deps =
|
||||||
django19: django>=1.9,<1.10
|
django19: django>=1.9,<1.10
|
||||||
django110: django>=1.10,<1.11
|
django110: django>=1.10,<1.11
|
||||||
django111: django>=1.11,<1.12
|
django111: django>=1.11,<1.12
|
||||||
|
django20: django>=2.0,<2.1
|
||||||
coverage
|
coverage
|
||||||
mock
|
mock
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue