Skip to content

Commit

Permalink
Add name to AUTHORS as requested in docs, added djangorestframework-j…
Browse files Browse the repository at this point in the history
…wt dependency, made the User model come from get_user_model method
  • Loading branch information
mahaffey committed Sep 11, 2018
1 parent 90a2409 commit 4071492
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ Contributors
- `Tonymke <https://github.com/tonymke/>`_
- `pintor <https://github.com/pintor>`_
- `BaconAndEggs <https://github.com/BaconAndEggs>`_
- `Ryan Mahaffey <https://github.com/mahaffey>`_
8 changes: 6 additions & 2 deletions django_saml2_auth/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@
from django import get_version
from pkg_resources import parse_version
from django.conf import settings
from django.contrib.auth.models import (User, Group)
from django.contrib.auth.models import Group
from django.contrib.auth.decorators import login_required
from django.contrib.auth import login, logout
from django.contrib.auth import login, logout, get_user_model
from django.shortcuts import render
from django.views.decorators.csrf import csrf_exempt
from django.template import TemplateDoesNotExist
from django.http import HttpResponseRedirect
from django.utils.http import is_safe_url


# default User or custom User. Now both will work.
User = get_user_model()

try:
import urllib2 as _urllib
except:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@

packages=find_packages(),

install_requires=['pysaml2>=4.5.0'],
install_requires=['pysaml2>=4.5.0',
'djangorestframework-jwt'],
include_package_data=True,
)

0 comments on commit 4071492

Please sign in to comment.