From d923fa852cdd41bfe880e3f1cd2b89703083222a Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Fri, 11 Sep 2020 16:43:55 -0700
Subject: [PATCH] Got the uploader working with Redis back-end on OpenShift

---
 edivorce/apps/core/templates/dashboard/final_filing.html   | 3 ++-
 edivorce/apps/core/templates/dashboard/initial_filing.html | 3 ++-
 edivorce/apps/poc/views.py                                 | 5 +++--
 vue/src/components/Uploader.vue                            | 5 ++++-
 vue/src/pages/final-filing/FinalFiling.vue                 | 3 ++-
 vue/src/pages/initial-filing/InitialFiling.vue             | 3 ++-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/edivorce/apps/core/templates/dashboard/final_filing.html b/edivorce/apps/core/templates/dashboard/final_filing.html
index a6629505..fe2578f1 100644
--- a/edivorce/apps/core/templates/dashboard/final_filing.html
+++ b/edivorce/apps/core/templates/dashboard/final_filing.html
@@ -27,7 +27,8 @@
             how-to-sign="{{ how_to_sign }}"
             how-to-file="{{ how_to_file }}"
             sign-file-options-url="{% url 'dashboard_nav' 'sign_file_options' %}"
-            print-form-url="{% url 'dashboard_nav' 'print_form' %}">
+            print-form-url="{% url 'dashboard_nav' 'print_form' %}"
+            proxy-root-path="{{ proxy_root_path }}">
         </final-filing-uploader>
     </div>
 
diff --git a/edivorce/apps/core/templates/dashboard/initial_filing.html b/edivorce/apps/core/templates/dashboard/initial_filing.html
index d7d634e8..26c4a0a2 100644
--- a/edivorce/apps/core/templates/dashboard/initial_filing.html
+++ b/edivorce/apps/core/templates/dashboard/initial_filing.html
@@ -22,7 +22,8 @@
             <initial-filing-uploader 
                 signing-location="{{ signing_location }}"
                 signing-location-you="{{ signing_location_you }}"
-                signing-location-spouse="{{ signing_location_spouse }}">
+                signing-location-spouse="{{ signing_location_spouse }}"
+                proxy-root-path="{{ proxy_root_path }}">
             </initial-filing-uploader>
         </div>
 
diff --git a/edivorce/apps/poc/views.py b/edivorce/apps/poc/views.py
index f667eb2a..3994e362 100644
--- a/edivorce/apps/poc/views.py
+++ b/edivorce/apps/poc/views.py
@@ -4,6 +4,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.edit import FormView, CreateView, DeleteView
 from django import forms
 from django.http import HttpResponse
+from django.conf import settings
 
 from edivorce.apps.core.validators import file_scan_validation
 from edivorce.apps.poc.models import Document
@@ -31,7 +32,7 @@ class UploadStorage(CreateView):
     model = Document
     fields = ['file']
     template_name = "storage.html"
-    success_url = '/poc/storage'
+    success_url = settings.FORCE_SCRIPT_NAME + 'poc/storage'
 
     @method_decorator(csrf_exempt)
     def dispatch(self, request, *args, **kwargs):
@@ -44,7 +45,7 @@ class UploadStorage(CreateView):
 
 class UploadStorageDelete(DeleteView):
     model = Document
-    success_url = '/poc/storage'
+    success_url = settings.FORCE_SCRIPT_NAME + 'poc/storage'
 
 
 def view_document_file(request, document_id):
diff --git a/vue/src/components/Uploader.vue b/vue/src/components/Uploader.vue
index 3b68ad42..754b659c 100644
--- a/vue/src/components/Uploader.vue
+++ b/vue/src/components/Uploader.vue
@@ -21,7 +21,7 @@
       :multiple="true"
       :drop="true"
       :drop-directory="false"
-      post-action="/poc/storage"
+      :post-action="postAction"
       @input-file="inputFile"
       @input-filter="inputFilter"
       :input-id="inputId"
@@ -86,6 +86,9 @@ export default {
     },
     formInfo() {
       return Forms[this.docType];
+    },
+    postAction() {
+      return this.$parent.proxyRootPath + "poc/storage"
     }
   },
   methods: {
diff --git a/vue/src/pages/final-filing/FinalFiling.vue b/vue/src/pages/final-filing/FinalFiling.vue
index b39cd76c..83a98d14 100644
--- a/vue/src/pages/final-filing/FinalFiling.vue
+++ b/vue/src/pages/final-filing/FinalFiling.vue
@@ -169,7 +169,8 @@ export default {
     howToSign: String, 
     howToFile: String, 
     signFileOptionsUrl: String, 
-    printFormUrl: String
+    printFormUrl: String,
+    proxyRootPath: String
   }
 }
 </script>
diff --git a/vue/src/pages/initial-filing/InitialFiling.vue b/vue/src/pages/initial-filing/InitialFiling.vue
index 03bf39d7..4b0c6f04 100644
--- a/vue/src/pages/initial-filing/InitialFiling.vue
+++ b/vue/src/pages/initial-filing/InitialFiling.vue
@@ -132,7 +132,8 @@ export default {
   props: {
     signingLocation: String,
     signingLocationYou: String,
-    signingLocationSpouse: String
+    signingLocationSpouse: String,
+    proxyRootPath: String
   }
 }
 </script>