diff --git a/awx/main/signals.py b/awx/main/signals.py index 4f34097d2f..2f426b74b3 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -407,5 +407,4 @@ def get_current_user_from_drf_request(sender, **kwargs): ''' request = get_current_request() drf_request = getattr(request, 'drf_request', None) - print drf_request return (getattr(drf_request, 'user', False), 0) diff --git a/awx/sso/middleware.py b/awx/sso/middleware.py index 49d07482f6..4085286d2b 100644 --- a/awx/sso/middleware.py +++ b/awx/sso/middleware.py @@ -8,7 +8,7 @@ import urllib import six # Django -from django.contrib.auth import logout +from django.contrib.auth import login, logout from django.shortcuts import redirect from django.utils.timezone import now @@ -87,4 +87,4 @@ class SocialAuthMiddleware(SocialAuthExceptionMiddleware): def get_redirect_uri(self, request, exception): strategy = getattr(request, 'social_strategy', None) - return strategy.session_get('next', '') or strategy.setting('LOGIN_ERROR_URL') + return strategy.session_get('next', '') or strategy.setting('LOGIN_ERROR_URL') diff --git a/awx/sso/urls.py b/awx/sso/urls.py index 9de510e9a8..876b697146 100644 --- a/awx/sso/urls.py +++ b/awx/sso/urls.py @@ -2,9 +2,10 @@ # All Rights Reserved. # Django -from django.conf.urls import include, patterns, url +from django.conf.urls import patterns, url -urlpatterns = patterns('awx.sso.views', +urlpatterns = patterns( + 'awx.sso.views', url(r'^complete/$', 'sso_complete', name='sso_complete'), url(r'^error/$', 'sso_error', name='sso_error'), url(r'^inactive/$', 'sso_inactive', name='sso_inactive'), diff --git a/awx/sso/views.py b/awx/sso/views.py index d8832ab32e..a75bcd96ae 100644 --- a/awx/sso/views.py +++ b/awx/sso/views.py @@ -5,7 +5,6 @@ import urllib # Django -from django.contrib.auth import logout as auth_logout from django.core.urlresolvers import reverse from django.http import HttpResponse from django.utils.timezone import now, utc