From 05b6bfc32ae32c2aa350eaecf0460cb0be844196 Mon Sep 17 00:00:00 2001 From: Keith Bauer Date: Tue, 9 Jul 2019 10:07:45 -0500 Subject: [PATCH 1/3] Include request in authenticate --- cas/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cas/views.py b/cas/views.py index 09c4fa5..454fbcd 100644 --- a/cas/views.py +++ b/cas/views.py @@ -187,7 +187,7 @@ def login(request, next_page=None, required=False, gateway=False): service = _service_url(request, next_page, False) if ticket: - user = auth.authenticate(ticket=ticket, service=service) + user = auth.authenticate(request=request, ticket=ticket, service=service) if user is not None: From 261cd3b4bfdd5db7197c8b7b1ee24a3b02ead29d Mon Sep 17 00:00:00 2001 From: Keith Bauer Date: Tue, 9 Jul 2019 10:08:11 -0500 Subject: [PATCH 2/3] Fix gateway query_list --- cas/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cas/views.py b/cas/views.py index 454fbcd..b0e1a23 100644 --- a/cas/views.py +++ b/cas/views.py @@ -67,7 +67,7 @@ def _service_url(request, redirect_to=None, gateway=False): for index, item2 in enumerate(gateway_params): if item[0] == item2[0]: gateway_params.pop(index) - extra_params = gateway_params + query_list + extra_params = gateway_params + list(query_list) #Sort params by key name so they are always in the same order. sorted_params = sorted(extra_params, key=itemgetter(0)) From de6f5fc8e407b35585be875450e41b828666039b Mon Sep 17 00:00:00 2001 From: Keith Bauer Date: Tue, 9 Jul 2019 10:16:05 -0500 Subject: [PATCH 3/3] Version bump, Changelog update --- CHANGELOG.md | 3 +++ README.md | 4 ++-- docs/source/changelog.rst | 4 ++++ docs/source/conf.py | 4 ++-- setup.py | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a6769..3bc7ca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.5.1 +- Include request in authenticate and evaluate gateway query_list (https://github.com/kstateome/django-cas/pull/87) + ### 1.5.0 - Path Change (https://github.com/kstateome/django-cas/pull/76) - Update authenticate method (https://github.com/kstateome/django-cas/pull/77/files) diff --git a/README.md b/README.md index 9a62637..7956351 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ CAS client for Django. This library requires Django 1.5 or above, and Python 2.6, 2.7, 3.4 -Current version: 1.5.0 +Current version: 1.5.1 This is [K-State's fork](https://github.com/kstateome/django-cas) of [the original](https://bitbucket.org/cpcc/django-cas/overview) and includes [several additional features](https://github.com/kstateome/django-cas/#additional-features) as well as features merged from @@ -14,7 +14,7 @@ This is [K-State's fork](https://github.com/kstateome/django-cas) of [the or This project is registered on PyPi as django-cas-client. To install:: - pip install django-cas-client==1.5.0 + pip install django-cas-client==1.5.1 ### Add to URLs diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 45925ac..15eeba1 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,10 @@ Changelog ========= +1.5.1 +------------------ +- Include request in authenticate and evaluate gateway query_list (https://github.com/kstateome/django-cas/pull/87) + 1.5.0 ------------------ - Path Change (https://github.com/kstateome/django-cas/pull/76) diff --git a/docs/source/conf.py b/docs/source/conf.py index 4f58b39..c853760 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -58,9 +58,9 @@ # built documents. # # The short X.Y version. -version = '1.5.0' +version = '1.5.1' # The full version, including alpha/beta/rc tags. -release = '1.5.0' +release = '1.5.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index a334420..2faf3ce 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -version = '1.5.0' +version = '1.5.1' def read(fname):