X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkManifestServlet.java;h=36e8770bba6fa929feb8bceeaabbb3daf3dd5eee;hb=2e895e3a6f06f18642851b72d90fd72391e4a81a;hp=2c62ba10cfa647321a6eae52581db4e84a023561;hpb=0aa28bb882ec27c76ed88c3ec1c33bd09af13d12;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
index 2c62ba1..36e8770 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
@@ -54,12 +54,9 @@ public class OdkManifestServlet extends HttpServlet {
 		if (pathInfo.startsWith("//"))
 			pathInfo = pathInfo.substring(1);
 
-//		String serverName = req.getServerName();
-//		int serverPort = req.getServerPort();
-//		String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
-//		String baseServer = protocol + "://" + serverName
-//				+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort);
-		StringBuilder baseServer = ServletUtils.getRequestUrlBase(req);
+		// we force HTTPS since ODK Collect will fail anyhow when sending http
+		// cf. https://forum.getodk.org/t/authentication-for-non-https-schems/32967/4
+		StringBuilder baseServer = ServletUtils.getRequestUrlBase(req, true);
 
 		Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req));