From 0cfd3ad19833573ce881a80674986bdd0e4c3910 Mon Sep 17 00:00:00 2001
From: Mike Olund <michaelo@openroad.ca>
Date: Sun, 19 Feb 2017 19:38:10 -0800
Subject: [PATCH] Fixed 302 redirect behaviour with Justice reverse proxy

---
 edivorce/apps/core/decorators.py     | 2 +-
 edivorce/apps/core/views/localdev.py | 2 +-
 edivorce/apps/core/views/main.py     | 6 +++---
 edivorce/settings/base.py            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/edivorce/apps/core/decorators.py b/edivorce/apps/core/decorators.py
index d74fb410..32e9b8b2 100644
--- a/edivorce/apps/core/decorators.py
+++ b/edivorce/apps/core/decorators.py
@@ -9,7 +9,7 @@ def bceid_required(function=None):
     def _dec(view_func):
         def _view(request, *args, **kwargs):
             if not request.bceid_user.is_authenticated:
-                return redirect(settings.FORCE_SCRIPT_NAME + '/login')
+                return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/login')
             else:
                 return view_func(request, *args, **kwargs)
 
diff --git a/edivorce/apps/core/views/localdev.py b/edivorce/apps/core/views/localdev.py
index 57d4be2a..51e80b59 100644
--- a/edivorce/apps/core/views/localdev.py
+++ b/edivorce/apps/core/views/localdev.py
@@ -19,7 +19,7 @@ def bceid(request):
         # save the guid in a session variable
         request.session['fake-bceid-guid'] = fake_guid
 
-        return redirect(settings.FORCE_SCRIPT_NAME + '/login')
+        return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/login')
 
     else:
         return render(request, 'localdev/bceid.html')
diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py
index 499c6fa0..49110b5f 100644
--- a/edivorce/apps/core/views/main.py
+++ b/edivorce/apps/core/views/main.py
@@ -32,7 +32,7 @@ def preview(request, form):
 
 def login(request):
     if not request.session.get('fake-bceid-guid'):
-        return redirect(settings.FORCE_SCRIPT_NAME + '/bceid')
+        return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/bceid')
     else:
         guid = request.bceid_user.guid
         user, created = BceidUser.objects.get_or_create(user_guid=guid)
@@ -42,12 +42,12 @@ def login(request):
 
         copy_session_to_db(request, user)
 
-        return redirect(settings.FORCE_SCRIPT_NAME + '/overview')
+        return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/overview')
 
 
 def logout(request):
     request.session.flush()
-    return redirect(settings.FORCE_SCRIPT_NAME + '/intro')
+    return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/intro')
 
 
 @bceid_required
diff --git a/edivorce/settings/base.py b/edivorce/settings/base.py
index 0a141984..e4e1d476 100644
--- a/edivorce/settings/base.py
+++ b/edivorce/settings/base.py
@@ -116,4 +116,4 @@ COMPRESS_PRECOMPILERS = (
     ('text/x-scss', 'django_libsass.SassCompiler'),
 )
 
-FORCE_SCRIPT_NAME = ''
+FORCE_SCRIPT_NAME = '/'