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 736d3f055d04257f773d20f9785657275f1f38f6..98e36dabc5d37a768b3d480fa6de72dcc2c42061 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java @@ -192,16 +192,6 @@ public class DataController { @POST @PostMapping("/data/getData") -// @ApiOperation(value = "getData") -// @ApiImplicitParams({ -// @ApiImplicitParam( -// name = "inpuData", -// examples = @Example( -// value = { -// @ExampleProperty( -// value = "{'token': 'test'}", mediaType = "application/json") -// })) -// }) public ResponseEntity getData( @RequestBody InputParameters inputData, @RequestHeader(name = "Authorization", required=true) String token, @@ -209,26 +199,14 @@ public class DataController { { if (idpClientManager.isValid(token)) { - // log.info("Token is valid"); + UserDto userdto = idpClientManager.getUserFromToken(token); - // log.info("got the user : " + userdto.getSurname()); - // log.info("with email : " + userdto.getEmail()); - - // log.info("got the user: " + userdto.toString()); - - String subject = encryptionManager.encrypt(userdto.getEmail()); - - // log.info("with subject: " + subject); - - User user = userInterface.findBySubject(subject); - // log.info("got the userid: " + user.getUserid()); + User user = userInterface.findBySubject(userdto.getUuid()); inputData.setUserid(user.getUserid().intValue()); - // da rimuovere - //if (inputData.getFlowid() == null) inputData.setFlowid("8"); - //if (inputData.getCommunityid() == null) inputData.setCommunityid("8"); + }else { log.info("Warning: token is not valid"); } @@ -241,35 +219,35 @@ public class DataController { return new ResponseEntity<>(data, HttpStatus.OK); } - @POST - @PostMapping("/data/getDataOld") - public ResponseEntity getDataOld( - @ApiParam(name = "queryid", type = "String", value = "Identification code of the query", example = "1", required = true) @RequestParam(value = "queryid") String queryid, - @ApiParam(name = "queryParam", type = "Map", value = "Query Parameters", example = "startDate=2021-03-01 00:00:00&endDate=2021-03-06 23:59:59", required = false) @RequestParam(value = "queryParam", required = false) String queryParam, - @ApiParam(hidden = true) @RequestParam Map queryParams, - @RequestHeader(name = "Authorization", required=true) String token, - @RequestHeader(name = "Content-Language", required=false, defaultValue="it_IT") String language) - { - - System.out.println("Authorization: " + token); - System.out.println("Content-language: " + language); - - if (idpClientManager.isValid(token)) { - UserDto userdto = idpClientManager.getUserFromToken(token); - String subject = encryptionManager.encrypt(userdto.getEmail()); - User user = userInterface.findBySubject(subject); - queryParams.put("userid", user.getUserid().toString()); - - // da rimuovere - if (queryParams.containsKey("flowid")) queryParams.put("flowid", "8"); - if (queryParams.containsKey("communityid")) queryParams.put("communityid", "4"); - } - - ParametricQuery pq = pqueryInterface.findByQueryid(new Long(queryid)); - ResultWithMetadata data = pqm.executeQuery(pq, queryParams, language); - - return new ResponseEntity<>(data, HttpStatus.OK); - } +// @POST +// @PostMapping("/data/getDataOld") +// public ResponseEntity getDataOld( +// @ApiParam(name = "queryid", type = "String", value = "Identification code of the query", example = "1", required = true) @RequestParam(value = "queryid") String queryid, +// @ApiParam(name = "queryParam", type = "Map", value = "Query Parameters", example = "startDate=2021-03-01 00:00:00&endDate=2021-03-06 23:59:59", required = false) @RequestParam(value = "queryParam", required = false) String queryParam, +// @ApiParam(hidden = true) @RequestParam Map queryParams, +// @RequestHeader(name = "Authorization", required=true) String token, +// @RequestHeader(name = "Content-Language", required=false, defaultValue="it_IT") String language) +// { +// +// System.out.println("Authorization: " + token); +// System.out.println("Content-language: " + language); +// +// if (idpClientManager.isValid(token)) { +// UserDto userdto = idpClientManager.getUserFromToken(token); +// String subject = encryptionManager.encrypt(userdto.getEmail()); +// User user = userInterface.findBySubject(subject); +// queryParams.put("userid", user.getUserid().toString()); +// +// // da rimuovere +// if (queryParams.containsKey("flowid")) queryParams.put("flowid", "8"); +// if (queryParams.containsKey("communityid")) queryParams.put("communityid", "4"); +// } +// +// ParametricQuery pq = pqueryInterface.findByQueryid(new Long(queryid)); +// ResultWithMetadata data = pqm.executeQuery(pq, queryParams, language); +// +// return new ResponseEntity<>(data, HttpStatus.OK); +// } @POST @PostMapping("/data/getInstantConsumption") 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 0d57d3996f791a591b6f4faeac29c743f7e6cfed..be35fc477a12b32748e39e378e3e43a3d6449432 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java +++ b/src/main/java/it/enea/xlab/GECORegistration/controller/UserController.java @@ -76,7 +76,6 @@ import lombok.extern.log4j.Log4j2; @RestController @Api(value = "UserController") -//@EnableTransactionManagement @Transactional("userTransactionManagerIDP") @Log4j2 public class UserController { @@ -768,8 +767,14 @@ public class UserController { return new ResponseEntity(new LocalUserDTO(), HttpStatus.FORBIDDEN); } String subject = encryptionManager.encrypt(userdto.getEmail()); - User user = userInterface.findBySubject(subject); // getUserFromSubject(subject).getBody(); + log.info("UUID: " + userdto.getSubject()); + log.info("SUBJECT: " + subject); + User user = userInterface.findBySubject(userdto.getSubject()); if (user == null) { + /* + * Adesso dovrei creare l'utente ma come faccio? + * Perche' esiste nell'IDP ma non localmente. + */ log.info("User does not exist on local DB"); return new ResponseEntity(new LocalUserDTO(), HttpStatus.FORBIDDEN); } @@ -778,17 +783,11 @@ public class UserController { } user.merge(userdto); - - ObjectMapper mapper = new ObjectMapper(); LocalUserDTO lUserDTO = dTOManager.userDTO(user); - try { - log.info(mapper.writeValueAsString(lUserDTO)); - } catch (JsonProcessingException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - ResponseEntity response = null; + log.info(lUserDTO.toString()); + + ResponseEntity response = null; response = new ResponseEntity(lUserDTO, HttpStatus.OK); @@ -902,8 +901,8 @@ public class UserController { return new ResponseEntity(new LocalUserDTO(), HttpStatus.FORBIDDEN); } - String subject = encryptionManager.encrypt(userdto.getEmail()); - User user = getUserFromSubject(subject); + //String subject = encryptionManager.encrypt(userdto.getEmail()); + User user = getUserFromSubject(userdto.getUuid()); if (user == null) { log.info("User not found on local DB"); @@ -915,7 +914,6 @@ public class UserController { log.info(lUserDTO); - // return new ResponseEntity(user, HttpStatus.OK); return new ResponseEntity(lUserDTO, HttpStatus.OK); } @@ -947,7 +945,7 @@ public class UserController { return new ResponseEntity(0, HttpStatus.FORBIDDEN); } String subject = encryptionManager.encrypt(userdto.getEmail()); - User user = getUserFromSubject(subject); + User user = getUserFromSubject(userdto.getUuid()); if (user == null) { log.info("User not found on local DB"); @@ -1034,7 +1032,7 @@ public class UserController { return new ResponseEntity>(result, HttpStatus.FORBIDDEN); } String subject = encryptionManager.encrypt(userdto.getEmail()); - User user = getUserFromSubject(subject); + User user = getUserFromSubject(userdto.getUuid()); if (user == null) { log.info("User not found on local DB"); @@ -1168,7 +1166,7 @@ public class UserController { UserDto userdto = idpClientManager.getUserFromToken(token); String subject = encryptionManager.encrypt(userdto.getEmail()); - user = userInterface.findBySubject(subject); + user = userInterface.findBySubject(userdto.getUuid()); } return user; } diff --git a/src/main/java/it/enea/xlab/GECORegistration/model/user/User.java b/src/main/java/it/enea/xlab/GECORegistration/model/user/User.java index f846ccf4d1a9077f98ef2ec69bf10b3a5094d9cc..f08c9f1441a946cc5c662cf8b0ab028aa039c9cc 100644 --- a/src/main/java/it/enea/xlab/GECORegistration/model/user/User.java +++ b/src/main/java/it/enea/xlab/GECORegistration/model/user/User.java @@ -253,119 +253,9 @@ public class User { this.address = userdto.getAddress(); this.phone = userdto.getPhone(); this.email = userdto.getEmail(); + this.subject = userdto.getUuid(); } -// public Long getUserid() { -// return userid; -// } -// -// public void setUserid(Long userid) { -// this.userid = userid; -// } -// -// public String getSubject() { -// return subject; -// } -// -// public void setSubject(String subject) { -// this.subject = subject; -// } -// -// public String getName() { -// return name; -// } -// -// -// -// public void setName(String name) { -// this.name = name; -// } -// -// -// -// public String getSurname() { -// return surname; -// } -// -// -// -// public void setSurname(String surname) { -// this.surname = surname; -// } -// -// -// -// public String getPhone() { -// return phone; -// } -// -// -// -// public void setPhone(String phone) { -// this.phone = phone; -// } -// -// -// -// public String getAddress() { -// return address; -// } -// -// -// -// public void setAddress(String address) { -// this.address = address; -// } -// -// -// -// public String getOrganization() { -// return organization; -// } -// -// -// -// public void setOrganization(String organization) { -// this.organization = organization; -// } -// -// -// -// public List getRoles() { -// return roles; -// } -// -// -// -// public ArrayList getCommunities() { -// return communities; -// } -// -// public UserToken getToken() { -// return token; -// } -// -// public void setToken(UserToken token) { -// this.token = token; -// } - - // UserDto Trace - -// id integer($int64) -// email string -// password string -// passwordConfirm string -// name string -// surname string -// organization string -// phone string -// address string -// emailConfirmed boolean -// role string -// clients [...] -// registeredClient boolean -// blockchainId string - @PreRemove public void removeLinks() { /*