From 235ed2f0d0d5332e2bb8cba1187c3a8440a56228 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Tue, 27 Sep 2022 20:11:09 -0400 Subject: [PATCH] Remove current_user variable no longer used --- awx/api/generics.py | 9 ++------- awx/sso/views.py | 5 ----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/awx/api/generics.py b/awx/api/generics.py index d1bef1e837..7b8a098e83 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -6,7 +6,6 @@ import inspect import logging import time import uuid -import urllib.parse # Django from django.conf import settings @@ -30,7 +29,7 @@ from rest_framework.response import Response from rest_framework import status from rest_framework import views from rest_framework.permissions import AllowAny -from rest_framework.renderers import StaticHTMLRenderer, JSONRenderer +from rest_framework.renderers import StaticHTMLRenderer from rest_framework.negotiation import DefaultContentNegotiation # AWX @@ -41,7 +40,7 @@ from awx.main.utils import camelcase_to_underscore, get_search_fields, getattrd, from awx.main.utils.db import get_all_field_names from awx.main.utils.licensing import server_product_name from awx.main.views import ApiErrorView -from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer, UserSerializer +from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer from awx.api.versioning import URLPathVersioning from awx.api.metadata import SublistAttachDetatchMetadata, Metadata from awx.conf import settings_registry @@ -90,13 +89,9 @@ class LoggedLoginView(auth_views.LoginView): def post(self, request, *args, **kwargs): ret = super(LoggedLoginView, self).post(request, *args, **kwargs) - current_user = getattr(request, 'user', None) if request.user.is_authenticated: logger.info(smart_str(u"User {} logged in from {}".format(self.request.user.username, request.META.get('REMOTE_ADDR', None)))) ret.set_cookie('userLoggedIn', 'true') - current_user = UserSerializer(self.request.user) - current_user = smart_str(JSONRenderer().render(current_user.data)) - current_user = urllib.parse.quote('%s' % current_user, '') ret.setdefault('X-API-Session-Cookie-Name', getattr(settings, 'SESSION_COOKIE_NAME', 'awx_sessionid')) return ret diff --git a/awx/sso/views.py b/awx/sso/views.py index 00a392f5b3..4654b8f785 100644 --- a/awx/sso/views.py +++ b/awx/sso/views.py @@ -11,8 +11,6 @@ from django.http import HttpResponse from django.views.generic import View from django.views.generic.base import RedirectView from django.utils.encoding import smart_str -from awx.api.serializers import UserSerializer -from rest_framework.renderers import JSONRenderer from django.conf import settings logger = logging.getLogger('awx.sso.views') @@ -42,9 +40,6 @@ class CompleteView(BaseRedirectView): if self.request.user and self.request.user.is_authenticated: logger.info(smart_str(u"User {} logged in".format(self.request.user.username))) response.set_cookie('userLoggedIn', 'true') - current_user = UserSerializer(self.request.user) - current_user = smart_str(JSONRenderer().render(current_user.data)) - current_user = urllib.parse.quote('%s' % current_user, '') response.setdefault('X-API-Session-Cookie-Name', getattr(settings, 'SESSION_COOKIE_NAME', 'awx_sessionid')) return response