Merge branch 'main' into TrimOrgData

cryptalith · web-flow · commit 58e1d97bd00b · 2023-08-18T15:47:55.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v2.38.5 - 2023-08-18
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.38.4...v2.38.5)
+
+- [#6873](https://github.com/ORCID/ORCID-Source/pull/6873): send-deactivate-account.json should be a POST action, since we are as…
+
 ## v2.38.4 - 2023-08-17
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.38.3...v2.38.4)
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java
@@ -515,7 +515,7 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht
         return new Errors();
     }
 
-    @RequestMapping(value = "/send-deactivate-account.json", method = RequestMethod.GET)
+    @RequestMapping(value = "/send-deactivate-account.json", method = RequestMethod.POST)
     public @ResponseBody String startDeactivateOrcidAccount(HttpServletRequest request) {
         String currentUserOrcid = getCurrentUserOrcid();
         recordEmailSender.sendOrcidDeactivateEmail(currentUserOrcid);

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht`
`515`	`515`	`return new Errors();`
`516`	`516`	`}`
`517`	`517`
`518`		`- @RequestMapping(value = "/send-deactivate-account.json", method = RequestMethod.GET)`
	`518`	`+ @RequestMapping(value = "/send-deactivate-account.json", method = RequestMethod.POST)`
`519`	`519`	`public @ResponseBody String startDeactivateOrcidAccount(HttpServletRequest request) {`
`520`	`520`	`String currentUserOrcid = getCurrentUserOrcid();`
`521`	`521`	`recordEmailSender.sendOrcidDeactivateEmail(currentUserOrcid);`