From 254c8b5ac44ca8edacaa9019c9b1d479ef6cfb9b Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Fri, 31 Mar 2017 07:47:00 -0700 Subject: [PATCH] moved view logic to middleware --- edivorce/apps/core/middleware/bceid_middleware.py | 8 ++++++++ edivorce/apps/core/views/main.py | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/edivorce/apps/core/middleware/bceid_middleware.py b/edivorce/apps/core/middleware/bceid_middleware.py index b8f5baff..a72592c6 100644 --- a/edivorce/apps/core/middleware/bceid_middleware.py +++ b/edivorce/apps/core/middleware/bceid_middleware.py @@ -17,6 +17,14 @@ class BceidUser(object): class BceidMiddleware(object): def process_request(self, request): + # Save SiteMinder headers to session variables. /login* is the only actual + # SiteMinder-protected part of the site, so the headers aren't availabale anywhere else + if request.META.get('HTTP_SMGOV_USERGUID', ''): + request.session['smgov_userguid'] = request.META.get('HTTP_SMGOV_USERGUID') + + if request.META.get('HTTP_SMGOV_USERDISPLAYNAME', ''): + request.session['smgov_userdisplayname'] = request.META.get('HTTP_SMGOV_USERDISPLAYNAME') + # get SiteMinder variables from the headers first, then from the session smgov_userguid = request.META.get('HTTP_SMGOV_USERGUID', request.session.get('smgov_userguid', False)) diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index d0a57f73..06d11edd 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -97,13 +97,6 @@ def login(request): if settings.DEPLOYMENT_TYPE == 'localdev' and not request.session.get('fake_bceid_guid'): return redirect(settings.PROXY_BASE_URL + settings.FORCE_SCRIPT_NAME[:-1] + '/bceid') else: - # Save SiteMinder headers to session variables. /login* is the only actual - # SiteMinder-protected part of the site, so the headers aren't availabale anywhere else - if request.META.get('HTTP_SMGOV_USERGUID', ''): - request.session['SMGOV_USERGUID'] = request.META.get('HTTP_SMGOV_USERGUID') - - if request.META.get('HTTP_SMGOV_USERDISPLAYNAME', ''): - request.session['SMGOV_USERDISPLAYNAME'] = request.META.get('HTTP_SMGOV_USERDISPLAYNAME') # get the Guid that was set in the middleware if request.bceid_user.guid is None: