From 5cf1263e4ef86d78c7f96be643ef05ede1473f2d Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 14 Jul 2016 11:55:25 +0200
Subject: [PATCH] bugfix agreeNDA
---
.../org/hbp/mip/configuration/SecurityConfiguration.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
index e057c3570..79b437fed 100644
--- a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
@@ -174,7 +174,11 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
*/
public synchronized User getUser() {
User user = new User(getUserInfos());
- user.setAgreeNDA(user.getAgreeNDA());
+ User foundUser = userRepository.findOne(user.getUsername());
+ if(foundUser != null)
+ {
+ user.setAgreeNDA(foundUser.getAgreeNDA());
+ }
userRepository.save(user);
return user;
}
@@ -197,8 +201,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@RequestMapping(path = "/user", method = RequestMethod.POST)
public ResponseEntity<Void> postUser(@ApiParam(value = "Has the user agreed on the NDA") @RequestParam(value = "agreeNDA", required = true) Boolean agreeNDA) {
- String username = getUser().getUsername();
- User user = userRepository.findOne(username);
+ User user = getUser();
if (user != null) {
user.setAgreeNDA(agreeNDA);
userRepository.save(user);
--
GitLab