fix issue: it shall parse body for DELETE request also for the sake of csrf token; stack overflow issue with AppConfig.ajaxLoginUrl

greenlaw110 · greenlaw110 · commit ef4ab5e7c9db · 2016-09-04T18:11:10.000+10:00
diff --git a/src/main/java/act/app/ActionContext.java b/src/main/java/act/app/ActionContext.java
@@ -267,7 +267,7 @@ private Map<String, String[]> bodyParams() {
                 if (null == bodyParams) {
                     Map<String, String[]> map = C.newMap();
                     H.Method method = request.method();
-                    if (H.Method.POST == method || H.Method.PUT == method) {
+                    if (H.Method.POST == method || H.Method.PUT == method || H.Method.DELETE == method) {
                         RequestBodyParser parser = RequestBodyParser.get(request);
                         map = parser.parse(this);
                     }
diff --git a/src/main/java/act/conf/AppConfig.java b/src/main/java/act/conf/AppConfig.java
@@ -926,7 +926,13 @@ public String ajaxLoginUrl() {
         if (null == ajaxLoginUrl) {
             ajaxLoginUrl = get(AJAX_LOGIN_URL);
             if (null == ajaxLoginUrl) {
-                ajaxLoginUrl = loginUrl();
+                ajaxLoginUrl = loginUrl;
+            }
+            if (null == ajaxLoginUrl) {
+                ajaxLoginUrl = get(LOGIN_URL);
+            }
+            if (null == ajaxLoginUrl) {
+                ajaxLoginUrl = "/login";
             }
         }
         return ajaxLoginUrl;

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ private Map<String, String[]> bodyParams() {`
`267`	`267`	`if (null == bodyParams) {`
`268`	`268`	`Map<String, String[]> map = C.newMap();`
`269`	`269`	`H.Method method = request.method();`
`270`		`- if (H.Method.POST == method \|\| H.Method.PUT == method) {`
	`270`	`+ if (H.Method.POST == method \|\| H.Method.PUT == method \|\| H.Method.DELETE == method) {`
`271`	`271`	`RequestBodyParser parser = RequestBodyParser.get(request);`
`272`	`272`	`map = parser.parse(this);`
`273`	`273`	`}`