projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename remote auth interfaces
[gpl/argeo-suite.git]
/
org.argeo.support.odk
/
src
/
org
/
argeo
/
support
/
odk
/
servlet
/
OdkSubmissionServlet.java
diff --git
a/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
b/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
index 4e56367a791e88c29f495d776d0f5bda6349b040..1d40743dc81c238b71b2f1b93d4827b876e83ea7 100644
(file)
--- a/
org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
+++ b/
org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
@@
-23,9
+23,11
@@
import javax.servlet.http.Part;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.cms.auth.RemoteAuthRequest;
+import org.argeo.cms.auth.RemoteAuthUtils;
import org.argeo.cms.jcr.CmsJcrUtils;
import org.argeo.cms.jcr.CmsJcrUtils;
-import org.argeo.cms.servlet.Servlet
AuthUtils
;
+import org.argeo.cms.servlet.Servlet
HttpRequest
;
import org.argeo.jcr.Jcr;
import org.argeo.jcr.JcrUtils;
import org.argeo.suite.SuiteUtils;
import org.argeo.jcr.Jcr;
import org.argeo.jcr.JcrUtils;
import org.argeo.suite.SuiteUtils;
@@
-53,15
+55,16
@@
public class OdkSubmissionServlet extends HttpServlet {
resp.setDateHeader("Date", System.currentTimeMillis());
resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
resp.setDateHeader("Date", System.currentTimeMillis());
resp.setIntHeader("X-OpenRosa-Accept-Content-Length", 1024 * 1024);
- Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+ RemoteAuthRequest request = new ServletHttpRequest(req);
+ Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), request);
try {
// Node submissions = JcrUtils.mkdirs(session,
// "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);
try {
// Node submissions = JcrUtils.mkdirs(session,
// "/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);
- CmsSession cmsSession =
ServletAuthUtils.getCmsSession(req
);
+ CmsSession cmsSession =
RemoteAuthUtils.getCmsSession(request
);
ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
ClassLoader currentContextCl = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(
Servlet
AuthUtils.class.getClassLoader());
+ Thread.currentThread().setContextClassLoader(
Remote
AuthUtils.class.getClassLoader());
Session adminSession = null;
try {
// TODO centralise at a deeper level
Session adminSession = null;
try {
// TODO centralise at a deeper level