import org.argeo.app.odk.OrxManifestName;
import org.argeo.cms.auth.RemoteAuthUtils;
import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletUtils;
import org.argeo.jcr.Jcr;
import org.argeo.jcr.JcrxApi;
resp.setHeader("X-OpenRosa-Version", "1.0");
resp.setDateHeader("Date", System.currentTimeMillis());
- String serverName = req.getServerName();
- int serverPort = req.getServerPort();
- String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
+ // 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);
String pathInfo = req.getPathInfo();
sb.append("<hash>md5:" + JcrxApi.getChecksum(node, JcrxApi.MD5) + "</hash>");
if (node.hasProperty(Property.JCR_DESCRIPTION))
sb.append("<name>" + node.getProperty(Property.JCR_DESCRIPTION).getString() + "</name>");
- sb.append("<downloadUrl>" + protocol + "://" + serverName
- + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form"
- + node.getPath() + "</downloadUrl>");
+ sb.append("<downloadUrl>" + baseServer + "/api/odk/form" + node.getPath() + "</downloadUrl>");
if (node.hasNode(OrxManifestName.manifest.name())) {
- sb.append("<manifestUrl>" + protocol + "://" + serverName
- + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort)
- + "/api/odk/formManifest" + node.getNode(OrxManifestName.manifest.name()).getPath()
- + "</manifestUrl>");
+ sb.append("<manifestUrl>" + baseServer + "/api/odk/formManifest"
+ + node.getNode(OrxManifestName.manifest.name()).getPath() + "</manifestUrl>");
}
sb.append("</xform>");
} else if (node.isNodeType(EntityType.formSet.get())) {
sb.append("<xforms-group>");
sb.append("<groupId>" + node.getPath() + "</groupId>");
sb.append("<name>" + node.getProperty(Property.JCR_TITLE).getString() + "</name>");
- sb.append("<listUrl>" + protocol + "://" + serverName
- + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/formList"
- + node.getPath() + "</listUrl>");
+ sb.append("<listUrl>" + baseServer + "/api/odk/formList" + node.getPath() + "</listUrl>");
sb.append("</xforms-group>");
}
String str = sb.toString();