From 09740e77ea352852ff90b738787f7f6aa657b604 Mon Sep 17 00:00:00 2001
From: Leonardo Vannucci <leonardo.vannucci@grupposistematica.it>
Date: Fri, 10 Aug 2018 09:49:15 +0200
Subject: [PATCH] Viene generato una url per il download generica che a seconda dell'abilitazione del captcha o meno redirige nell'url corretta
---
dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadPageController.java b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadController.java
similarity index 66%
rename from dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadPageController.java
rename to dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadController.java
index 8ce7a97..5ee6cc7 100644
--- a/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadPageController.java
+++ b/dg1cloud-core/src/main/java/it/digione/dg1cloud/controller/DownloadController.java
@@ -14,15 +14,17 @@
import it.digione.dg1cloud.recaptcha.DownloadFileCaptchaForm;
@Controller
-public class DownloadPageController {
+public class DownloadController {
- private static final Logger logger = LoggerFactory.getLogger(DownloadPageController.class);
+ private static final Logger logger = LoggerFactory.getLogger(DownloadController.class);
- @RequestMapping("/downloadPage")
- public ModelAndView downloadPage(@RequestParam String fileName, @RequestParam long id,
+ @Autowired CaptchaSettings captchaSettings;
+
+ @RequestMapping("/download")
+ public ModelAndView download(@RequestParam String fileName, @RequestParam long id,
@RequestParam(value = "secretKey", required = false) String secretKey) throws IOException {
- logger.debug("Preparazione pagina download file {} con id {}", fileName, id);
+ logger.debug("Preparazione download file {} con id {}", fileName, id);
DownloadFileCaptchaForm downloadParams = new DownloadFileCaptchaForm();
@@ -30,7 +32,14 @@
downloadParams.setId(id);
downloadParams.setSecretKey(secretKey);
- ModelAndView modelAndView = new ModelAndView("downloadFileCaptcha");
+ ModelAndView modelAndView;
+
+ if ( captchaSettings.isEnabled() == true ) {
+ modelAndView = new ModelAndView("downloadFileCaptcha");
+ } else {
+ modelAndView = new ModelAndView("forward:/downloadFile");
+ }
+
modelAndView.addObject("downloadFileCaptchaForm", downloadParams);
return modelAndView;
--
Gitblit v1.6.2