Merge pull request #1334 from sadiqkhoja/enketo-redirection-copy

Enketo redirection copy

Author: sadiqkhoja

main.nginx.conf

@@ -46,6 +46,21 @@ http {
     ~^__Host-(session=.+)$ $1;
   }
 
+  map $args $qp_deliminator {
+    ~.+ "&";
+    default "?";
+  }
+
+  map $arg_st $redirect_non_single_prefix {
+    ~.+     "${is_args}${args}${qp_deliminator}single=false";
+    default "/new${is_args}${args}";
+  }
+
+  map $arg_st $redirect_single_prefix {
+    ~.+     "${is_args}${args}";
+    default "/new${is_args}${args}${qp_deliminator}single=true";
+  }
+
   server {
     listen 8686;
     server_name localhost;
@@ -70,7 +85,9 @@ http {
     # Following are the locations that serve a Form and these are redirected to the frontend:
     location ~ "^/-/single/(?<enketoId>[a-zA-Z0-9]+)$" {
       # Form fill link, public
-      return 301 "/f/$enketoId$is_args$args";
+      # If 'st' query parameter is not present, redirect to protected route with single only
+      # end-of-form behavior (/new?single=true)
+      return 301 "/f/$enketoId$redirect_single_prefix";
     }
     location ~ "^/-/preview/(?<enketoId>[a-zA-Z0-9]+)$" {
       # preview link
@@ -81,7 +98,8 @@ http {
     # we don't want them to be redirected to central-frontend
     location ~ "^/-/(?!thanks$|connection$|login$|logout$|api$|preview$)(?<enketoId>[a-zA-Z0-9]+)$" {
       # Form fill link (non-public), or Draft
-      return 301 "/f/$enketoId/new$is_args$args";
+      # If 'st' query parameter is present, add ?single=false for public access
+      return 301 "/f/$enketoId$redirect_non_single_prefix";
     }
     location = /-/single/check-submitted {
         alias ./dist/blank.html;