Refactor authentication for requests to CommCare

src/main/java/org/commcare/formplayer/application/DebuggerController.java

@@ -63,8 +63,7 @@ public class DebuggerController extends AbstractBaseController {
     @UserRestore
     @ConfigureStorageFromSession
     public DebuggerFormattedQuestionsResponseBean getFormattedQuesitons(
-            @RequestBody SessionRequestBean debuggerRequest,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken) throws Exception {
+            @RequestBody SessionRequestBean debuggerRequest) throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(debuggerRequest.getSessionId());
         SerializableMenuSession serializableMenuSession = menuSessionService.getSessionById(serializableFormSession.getMenuSessionId());
         FormSession formSession = formSessionFactory.getFormSession(serializableFormSession);
@@ -92,7 +91,6 @@ public DebuggerFormattedQuestionsResponseBean getFormattedQuesitons(
     @AppInstall
     public MenuDebuggerContentResponseBean menuDebuggerContent(
             @RequestBody SessionNavigationBean debuggerMenuRequest,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken,
             HttpServletRequest request) throws Exception {
 
         MenuSession menuSession = menuSessionFactory.getMenuSessionFromBean(debuggerMenuRequest);
@@ -114,7 +112,6 @@ public MenuDebuggerContentResponseBean menuDebuggerContent(
     @UserRestore
     @AppInstall
     public EvaluateXPathResponseBean menuEvaluateXpath(@RequestBody EvaluateXPathMenuRequestBean evaluateXPathRequestBean,
-                                                       @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken,
                                                        HttpServletRequest request) throws Exception {
         MenuSession menuSession = menuSessionFactory.getMenuSessionFromBean(evaluateXPathRequestBean);
         BaseResponseBean responseBean = runnerService.advanceSessionWithSelections(
@@ -144,8 +141,8 @@ public EvaluateXPathResponseBean menuEvaluateXpath(@RequestBody EvaluateXPathMen
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public EvaluateXPathResponseBean evaluateXpath(@RequestBody EvaluateXPathRequestBean evaluateXPathRequestBean,
-                                                   @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken) throws Exception {
+    public EvaluateXPathResponseBean evaluateXpath(@RequestBody EvaluateXPathRequestBean evaluateXPathRequestBean)
+            throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(evaluateXPathRequestBean.getSessionId());
         FormSession formEntrySession = formSessionFactory.getFormSession(serializableFormSession);
         EvaluateXPathResponseBean evaluateXPathResponseBean = new EvaluateXPathResponseBean(

src/main/java/org/commcare/formplayer/application/FormController.java

@@ -122,8 +122,7 @@ public static HashMap<String, ErrorBean> validateAnswers(FormEntryController for
     @RequestMapping(value = Constants.URL_NEW_SESSION, method = RequestMethod.POST)
     @UserLock
     @UserRestore
-    public NewFormResponse newFormResponse(@RequestBody NewSessionRequestBean newSessionBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public NewFormResponse newFormResponse(@RequestBody NewSessionRequestBean newSessionBean)
             throws Exception {
         String postUrl = host + newSessionBean.getPostUrl();
         return newFormResponseFactory.getResponse(newSessionBean, postUrl);
@@ -133,8 +132,7 @@ public NewFormResponse newFormResponse(@RequestBody NewSessionRequestBean newSes
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryResponseBean changeLocale(@RequestBody ChangeLocaleRequestBean changeLocaleBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryResponseBean changeLocale(@RequestBody ChangeLocaleRequestBean changeLocaleBean)
             throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 changeLocaleBean.getSessionId());
@@ -150,8 +148,7 @@ public FormEntryResponseBean changeLocale(@RequestBody ChangeLocaleRequestBean c
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryResponseBean answerQuestion(@RequestBody AnswerQuestionRequestBean answerQuestionBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryResponseBean answerQuestion(@RequestBody AnswerQuestionRequestBean answerQuestionBean)
             throws Exception {
         return saveAnswer(answerQuestionBean, null, false);
     }
@@ -166,7 +163,6 @@ public FormEntryResponseBean answerQuestion(@RequestBody AnswerQuestionRequestBe
     @ConfigureStorageFromSession
     public FormEntryResponseBean answerMediaQuestion(
             @RequestPart(PART_ANSWER) AnswerQuestionRequestBean answerQuestionBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken,
             @RequestPart(PART_FILE) MultipartFile file)
             throws Exception {
         return saveAnswer(answerQuestionBean, file, false);
@@ -176,9 +172,7 @@ public FormEntryResponseBean answerMediaQuestion(
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryResponseBean clearAnswer(
-            @RequestBody AnswerQuestionRequestBean answerQuestionBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryResponseBean clearAnswer(@RequestBody AnswerQuestionRequestBean answerQuestionBean)
             throws Exception{
         return saveAnswer(answerQuestionBean, null, true);
     }
@@ -255,8 +249,8 @@ private FormEntryResponseBean saveAnswer(AnswerQuestionRequestBean answerQuestio
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryResponseBean newRepeat(@RequestBody RepeatRequestBean newRepeatRequestBean,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken) throws Exception {
+    public FormEntryResponseBean newRepeat(@RequestBody RepeatRequestBean newRepeatRequestBean)
+            throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 newRepeatRequestBean.getSessionId());
         FormSession formEntrySession = formSessionFactory.getFormSession(serializableFormSession);
@@ -267,6 +261,7 @@ public FormEntryResponseBean newRepeat(@RequestBody RepeatRequestBean newRepeatR
         FormEntryResponseBean responseBean = mapper.readValue(response.toString(), FormEntryResponseBean.class);
         responseBean.setTitle(serializableFormSession.getTitle());
         responseBean.setInstanceXml(new InstanceXmlBean(serializableFormSession.getInstanceXml()));
+        responseBean.setSessionId(serializableFormSession.getId());
         log.info("New response: " + responseBean);
         return responseBean;
     }
@@ -275,8 +270,7 @@ public FormEntryResponseBean newRepeat(@RequestBody RepeatRequestBean newRepeatR
     @ResponseBody
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryResponseBean deleteRepeat(@RequestBody RepeatRequestBean deleteRepeatRequestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryResponseBean deleteRepeat(@RequestBody RepeatRequestBean deleteRepeatRequestBean)
             throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 deleteRepeatRequestBean.getSessionId());
@@ -288,6 +282,7 @@ public FormEntryResponseBean deleteRepeat(@RequestBody RepeatRequestBean deleteR
         FormEntryResponseBean responseBean = mapper.readValue(response.toString(), FormEntryResponseBean.class);
         responseBean.setTitle(serializableFormSession.getTitle());
         responseBean.setInstanceXml(new InstanceXmlBean(serializableFormSession.getInstanceXml()));
+        responseBean.setSessionId(serializableFormSession.getId());
         return responseBean;
     }
 
@@ -296,8 +291,7 @@ public FormEntryResponseBean deleteRepeat(@RequestBody RepeatRequestBean deleteR
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryNavigationResponseBean getNext(@RequestBody SessionRequestBean requestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryNavigationResponseBean getNext(@RequestBody SessionRequestBean requestBean)
             throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 requestBean.getSessionId());
@@ -313,8 +307,7 @@ public FormEntryNavigationResponseBean getNext(@RequestBody SessionRequestBean r
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryNavigationResponseBean getNextSms(@RequestBody SessionRequestBean requestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryNavigationResponseBean getNextSms(@RequestBody SessionRequestBean requestBean)
             throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 requestBean.getSessionId());
@@ -329,8 +322,7 @@ public FormEntryNavigationResponseBean getNextSms(@RequestBody SessionRequestBea
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryNavigationResponseBean getPrevious(@RequestBody SessionRequestBean requestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryNavigationResponseBean getPrevious(@RequestBody SessionRequestBean requestBean)
             throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 requestBean.getSessionId());
@@ -350,8 +342,7 @@ public FormEntryNavigationResponseBean getPrevious(@RequestBody SessionRequestBe
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public GetInstanceResponseBean getRawInstance(@RequestBody SessionRequestBean requestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public GetInstanceResponseBean getRawInstance(@RequestBody SessionRequestBean requestBean)
             throws Exception {
         SerializableFormSession serializableFormSession = formSessionService.getSessionById(
                 requestBean.getSessionId());
@@ -365,8 +356,7 @@ public GetInstanceResponseBean getRawInstance(@RequestBody SessionRequestBean re
     @UserLock
     @UserRestore
     @ConfigureStorageFromSession
-    public FormEntryNavigationResponseBean getCurrent(@RequestBody SessionRequestBean requestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken)
+    public FormEntryNavigationResponseBean getCurrent(@RequestBody SessionRequestBean requestBean)
             throws Exception {
         org.commcare.formplayer.objects.SerializableFormSession serializableFormSession =
                 formSessionService.getSessionById(requestBean.getSessionId());

src/main/java/org/commcare/formplayer/application/FormSubmissionController.java

@@ -34,7 +34,6 @@ public class FormSubmissionController extends AbstractBaseController {
     @UserRestore
     @ConfigureStorageFromSession
     public SubmitResponseBean submitForm(@RequestBody SubmitRequestBean submitRequestBean,
-            @CookieValue(name = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken,
             HttpServletRequest request) throws Exception {
         return formSubmissionHelper.processAndSubmitForm(request, submitRequestBean.getSessionId(), submitRequestBean.getDomain(),
                 submitRequestBean.isPrevalidated(), submitRequestBean.getAnswers());

src/main/java/org/commcare/formplayer/application/IncompleteSessionController.java

@@ -37,17 +37,16 @@ public class IncompleteSessionController extends AbstractBaseController {
     @RequestMapping(value = Constants.URL_INCOMPLETE_SESSION, method = RequestMethod.POST)
     @UserLock
     @UserRestore
-    public NewFormResponse openIncompleteForm(@RequestBody SessionRequestBean incompleteSessionRequestBean,
-                                              @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken) throws Exception {
+    public NewFormResponse openIncompleteForm(@RequestBody SessionRequestBean incompleteSessionRequestBean)
+            throws Exception {
         SerializableFormSession session = formSessionService.getSessionById(incompleteSessionRequestBean.getSessionId());
         storageFactory.configure(session);
         return newFormResponseFactory.getResponse(session, commCareSessionFactory.getCommCareSession(session.getMenuSessionId()));
     }
 
     @RequestMapping(value = Constants.URL_GET_SESSIONS, method = RequestMethod.POST)
     @UserRestore
-    public GetSessionsResponse getSessions(@RequestBody FormsSessionsRequestBean getSessionRequest,
-                                           @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken) throws Exception {
+    public GetSessionsResponse getSessions(@RequestBody FormsSessionsRequestBean getSessionRequest) throws Exception {
         String scrubbedUsername = TableBuilder.scrubName(getSessionRequest.getUsername());
 
         List<FormSessionListView> formplayerSessions = formSessionService.getSessionsForUser(scrubbedUsername, getSessionRequest);
@@ -67,8 +66,7 @@ public GetSessionsResponse getSessions(@RequestBody FormsSessionsRequestBean get
 
     @RequestMapping(value = Constants.URL_DELETE_INCOMPLETE_SESSION, method = RequestMethod.POST)
     public NotificationMessage deleteIncompleteForm(
-            @RequestBody SessionRequestBean incompleteSessionRequestBean,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken) throws Exception {
+            @RequestBody SessionRequestBean incompleteSessionRequestBean) throws Exception {
         deleteSession(incompleteSessionRequestBean.getSessionId());
         return new NotificationMessage("Successfully deleted incomplete form.", false, NotificationMessage.Tag.incomplete_form);
     }

src/main/java/org/commcare/formplayer/application/MenuController.java

@@ -68,7 +68,6 @@ public class MenuController extends AbstractBaseController {
     @UserRestore
     @AppInstall
     public EntityDetailListResponse getDetails(@RequestBody SessionNavigationBean sessionNavigationBean,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken,
             HttpServletRequest request) throws Exception {
         MenuSession menuSession = menuSessionFactory.getMenuSessionFromBean(sessionNavigationBean);
         boolean isFuzzySearch = storageFactory.getPropertyManager().isFuzzySearchEnabled();
@@ -165,7 +164,6 @@ public EntityDetailListResponse getDetails(@RequestBody SessionNavigationBean se
     @UserRestore
     @AppInstall
     public BaseResponseBean navigateSessionWithAuth(@RequestBody SessionNavigationBean sessionNavigationBean,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken,
             HttpServletRequest request) throws Exception {
         String[] selections = sessionNavigationBean.getSelections();
         MenuSession menuSession;
@@ -230,7 +228,6 @@ private static <T extends LocationRelevantResponseBean> T setLocationNeeds(T res
     @UserRestore
     @AppInstall
     public BaseResponseBean navigateToEndpoint(@RequestBody SessionNavigationBean sessionNavigationBean,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken,
             HttpServletRequest request) throws Exception {
         // Apps using aggressive syncs are likely to hit a sync whenever using endpoint-based navigation,
         // since they use it to jump between different sandboxes. Turn it off.

src/main/java/org/commcare/formplayer/application/UtilController.java

@@ -79,8 +79,7 @@ public class UtilController {
     @RequestMapping(value = Constants.URL_SYNC_DB, method = RequestMethod.POST)
     @UserLock
     @UserRestore
-    public SyncDbResponseBean syncUserDb(@RequestBody SyncDbRequestBean syncRequest,
-                                         @CookieValue(value = Constants.POSTGRES_DJANGO_SESSION_ID, required = false) String authToken) throws Exception {
+    public SyncDbResponseBean syncUserDb(@RequestBody SyncDbRequestBean syncRequest) throws Exception {
         restoreFactory.performTimedSync();
         return new SyncDbResponseBean();
     }
@@ -90,7 +89,6 @@ public SyncDbResponseBean syncUserDb(@RequestBody SyncDbRequestBean syncRequest,
     @UserRestore
     @AppInstall
     public SyncDbResponseBean scheduleSync(@RequestBody SessionNavigationBean sessionNavigationBean,
-            @CookieValue(Constants.POSTGRES_DJANGO_SESSION_ID) String authToken,
             HttpServletRequest request) throws Exception {
         SyncDbResponseBean response = new SyncDbResponseBean();
         if (restoreFactory.isRestoreXmlExpired()) {