From c0852ae5d79e777478d197c56bd08a800dfef045 Mon Sep 17 00:00:00 2001 From: Gianluca d'Agosta Date: Mon, 6 Dec 2021 11:33:36 +0100 Subject: [PATCH] Error correction on management token un UserController --- .../GECORegistration/controller/DataController.java | 1 - .../GECORegistration/controller/UserController.java | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java index 50ad488..da39068 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java @@ -51,7 +51,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ResourceUtils; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java index 62be75b..b0071bd 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java @@ -2,20 +2,18 @@ package it.enea.xlab.GECORegistration.controller; import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; + import java.util.List; -import java.util.Set; + import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.mail.MessagingException; -import org.junit.platform.commons.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -24,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.util.StringUtils; import freemarker.template.TemplateException; import io.swagger.annotations.Api; @@ -710,8 +709,8 @@ public class UserController { @RequestHeader(name = "Authorization", required = false) String token, @ApiParam(name = "token", type = "String", value = "The user's token", example = "", required = false) @RequestParam (name = "token", required = false) String token2 ) { - token = StringUtils.isBlank(token) ? token2 : token; - if (StringUtils.isBlank(token)) { + token = StringUtils.hasText(token) ? token : token2; + if (!StringUtils.hasText(token)) { log.info("Token is empty"); return new ResponseEntity(false, HttpStatus.INTERNAL_SERVER_ERROR); } -- GitLab