Merge branch 'ui-495-implement-the-page-for-confirm-receipt-of-request' into 'master'

Added api endpoint for confirming receipt of request

See merge request genesys-pgr/genesys-server!448

src/main/java/org/genesys2/server/api/v1/RequestsController.java

@@ -37,7 +37,9 @@ import org.genesys2.server.service.TokenVerificationService;
 import org.genesys2.server.service.filter.MaterialRequestFilter;
 import org.genesys2.server.service.filter.MaterialSubRequestFilter;
 import org.genesys2.server.service.impl.EasySMTAException;
+import org.genesys2.util.ReCaptchaUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -55,6 +57,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.annotations.Api;
 
+import javax.servlet.http.HttpServletRequest;
+
 @RestController("requestsApi1")
 @PreAuthorize("isAuthenticated()")
 @RequestMapping(value = { RequestsController.CONTROLLER_URL })
@@ -67,6 +71,10 @@ public class RequestsController extends ApiBaseController {
 	public static final String PARAM_KEY = "key";
 	public static final String PARAM_TOKENUUID = "tokenUuid";
 	
+	
+	@Value("${captcha.privateKey}")
+	private String captchaPrivateKey;
+
 	private final ObjectMapper objectMapper = new ObjectMapper();
 
 	@Autowired
@@ -184,6 +192,33 @@ public class RequestsController extends ApiBaseController {
 			throw new InvalidApiUsageException(e.getMessage(), e);
 		}
     }
+    
+    /**
+	 * Confirm receipt of request
+	 *
+	 * @return
+	 * @throws InvalidApiUsageException
+	 */
+	@PostMapping(value = "/r/confirm", produces = { MediaType.APPLICATION_JSON_VALUE })
+	public MaterialSubRequest confirmRequest(
+			@RequestParam(value = "g-recaptcha-response") final String captchaResponse,
+			@RequestParam(PARAM_TOKENUUID) String tokenUuid,
+			@RequestParam(PARAM_KEY) String key,
+			final HttpServletRequest request) throws IOException {
+		
+		// Validate the reCAPTCHA
+		if (!ReCaptchaUtil.isValid(captchaResponse, request.getRemoteAddr(), captchaPrivateKey)) {
+			LOG.warn("Invalid captcha.");
+			throw new InvalidApiUsageException("Captcha check failed.");
+		}
+
+		LOG.info("Validating request tokenUuid={}, key={}", tokenUuid, key);
+		try {
+			return requestService.validateReceipt(tokenUuid, key);
+		} catch (TokenVerificationService.NoSuchVerificationTokenException | TokenVerificationService.TokenExpiredException e) {
+			throw new InvalidApiUsageException(e.getMessage(), e);
+		}
+	}
 	/**
 	 * Reload PID data
 	 *

src/main/java/org/genesys2/server/service/impl/RequestServiceImpl.java

@@ -442,6 +442,7 @@ public class RequestServiceImpl implements RequestService {
 	}
 
 	@Override
+	@Transactional
 	public MaterialSubRequest validateReceipt(String tokenUuid, String key) throws NoSuchVerificationTokenException, TokenExpiredException {
 		final VerificationToken consumedToken = tokenVerificationService.consumeToken(RECEIPT_TOKENTYPE, tokenUuid, key);