Merge pull request #458 from BBMRI-ERIC/fix/updates-userinfo-from-per…

…unaccess-token

fix: updates person if user info of perun token changed

src/main/java/eu/bbmri_eric/negotiator/common/configuration/security/oauth2/CustomJWTAuthConverter.java

@@ -66,7 +66,9 @@ private NegotiatorJwtAuthenticationToken parseJWTAsUserToken(Jwt jwt) {
     Person person =
         personRepository
             .findBySubjectId(subjectIdentifier)
+            .map(existingPerson -> updatePersonIfNecessary(existingPerson, userInfo))
             .orElseGet(() -> saveNewUserAsPerson(userInfo));
+
     return new NegotiatorJwtAuthenticationToken(person, jwt, parseUserAuthorities(userInfo));
   }
 
@@ -193,6 +195,26 @@ private Person saveNewUserAsPerson(Map<String, Object> userInfo) {
     return person;
   }
 
+  private Person updatePersonIfNecessary(Person person, Map<String, Object> userInfo) {
+    boolean isUpdated = false;
+
+    if (!person.getName().equals(userInfo.get("name").toString())) {
+      person.setName(userInfo.get("name").toString());
+      isUpdated = true;
+    }
+    if (!person.getEmail().equals(userInfo.get("email").toString())) {
+      person.setEmail(userInfo.get("email").toString());
+      isUpdated = true;
+    }
+
+    if (isUpdated) {
+      personRepository.save(person);
+      log.info(String.format("User with sub: %s updated in the database", person.getSubjectId()));
+    }
+
+    return person;
+  }
+
   static void cleanCache() {
     log.debug("Clearing userInfo cache.");
     userInfoCache.clear();