Also enable the storage of the oidc information of the myself contact during the edit case

Author: Steffengreiner

project-management/src/main/java/life/qbic/projectmanagement/application/authorization/QbicOidcUser.java

@@ -20,8 +20,11 @@ public class QbicOidcUser extends DefaultOidcUser {
   private final transient QbicUserInfo qbicUserInfo;
   private final String originalAuthName;
 
-  public record QbicUserInfo(String userId, String fullName, String email, boolean active) {
-
+  public QbicOidcUser(Collection<? extends GrantedAuthority> authorities, OidcIdToken idToken,
+      OidcUserInfo userInfo, QbicUserInfo qbicUserInfo) {
+    super(authorities, idToken, userInfo);
+    this.qbicUserInfo = requireNonNull(qbicUserInfo, "qbicUserInfo must not be null");
+    this.originalAuthName = super.getName();
   }
 
   @Override
@@ -46,13 +49,6 @@ public int hashCode() {
     return result;
   }
 
-  public QbicOidcUser(Collection<? extends GrantedAuthority> authorities, OidcIdToken idToken,
-      OidcUserInfo userInfo, QbicUserInfo qbicUserInfo) {
-    super(authorities, idToken, userInfo);
-    this.qbicUserInfo = requireNonNull(qbicUserInfo, "qbicUserInfo must not be null");
-    this.originalAuthName = super.getName();
-  }
-
   public String getQbicUserId() {
     return qbicUserInfo.userId();
   }
@@ -73,10 +69,19 @@ public String getName() {
   }
 
   public String getOidcId() {
-    return originalAuthName;
+    return Optional.ofNullable(originalAuthName).orElse(qbicUserInfo.oidc());
+  }
+
+  public String getOidcIssuer() {
+    return Optional.ofNullable(super.getIssuer().toString()).orElse(qbicUserInfo.oidcIssuer());
   }
 
   public boolean isActive() {
     return qbicUserInfo.active();
   }
+
+  public record QbicUserInfo(String userId, String fullName, String email, boolean active,
+                             String oidc, String oidcIssuer) {
+
+  }
 }

project-management/src/main/java/life/qbic/projectmanagement/application/authorization/QbicUserDetails.java

@@ -72,6 +72,14 @@ public String fullName() {
     return user.fullName();
   }
 
+  public String oidc() {
+    return user.oidc();
+  }
+
+  public String oidcIssuer() {
+    return user.oidcIssuer();
+  }
+
   @Override
   public boolean isAccountNonExpired() {
     return true;

project-management/src/main/java/life/qbic/projectmanagement/application/authorization/User.java

@@ -7,6 +7,6 @@
  */
 public record User(String id, String fullName, String platformUserName, String emailAddress,
                    String encryptedPassword,
-                   boolean isActive) {
+                   boolean isActive, String oidc, String oidcIssuer) {
 
 }

user-interface/src/main/java/life/qbic/datamanager/security/OidcUserDetailsService.java

@@ -45,7 +45,7 @@ public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2Authenticatio
       var authorities = userAuthorityProvider.getAuthoritiesByUserId(
           user.id());
       QbicUserInfo qbicUserInfo = new QbicUserInfo(user.id(), user.fullName(), user.emailAddress(),
-          user.isActive());
+          user.isActive(), user.oidcId(), user.oidcIssuer());
       return new QbicOidcUser(authorities, userRequest.getIdToken(),
           defaultOidcUser.getUserInfo(), qbicUserInfo);
     }

user-interface/src/main/java/life/qbic/datamanager/security/UserDetailsServiceImpl.java

@@ -48,7 +48,8 @@ public UserDetails loadUserByUsername(String mailAddress) throws UsernameNotFoun
         userInfo.id());
     var user = new User(userInfo.id(), userInfo.fullName(), userInfo.platformUserName(),
         userInfo.emailAddress(),
-        encryptedPassword.orElseGet(null), userInfo.isActive());
+        encryptedPassword.orElseGet(null), userInfo.isActive(), userInfo.oidcId(),
+        userInfo.oidcIssuer());
     return new QbicUserDetails(user, authorities);
   }
 }

user-interface/src/main/java/life/qbic/datamanager/views/general/contact/BoundContactField.java

@@ -107,6 +107,8 @@ private static Binder<ContactContainer> createBinder(SerializablePredicate<Conta
         .bind(ContactContainer::getEmail, ContactContainer::setEmail);
     binder.forField(contactField.getFullNameTextField())
         .bind(ContactContainer::getFullName, ContactContainer::setFullName);
+    binder.forField(contactField.getOidcSelection())
+        .bind(ContactContainer::getOidcSelection, ContactContainer::setOidcSelection);
     return binder;
   }
 
@@ -182,5 +184,15 @@ public void setFullName(String fullName) {
       }
     }
 
+    public Contact getOidcSelection() {
+      return contact;
+    }
+
+    public void setOidcSelection(Contact oidcSelection) {
+      if (oidcSelection != null && contact != null) {
+        contact.setOidc(oidcSelection.oidc());
+        contact.setOidcIssuer(oidcSelection.oidcIssuer());
+      }
+    }
   }
 }

user-interface/src/main/java/life/qbic/datamanager/views/general/contact/ContactField.java

@@ -45,7 +45,6 @@ private ContactField(String label, PersonLookupService personLookupService) {
     add(layoutFields(setMyselfCheckBox, layoutFields(fullName, email)), orcidSelection);
     hideCheckbox(); // default is to hide the set myself checkbox
     setMyselfCheckBox.addValueChangeListener(listener -> {
-      orcidSelection.setValue(null);
       if (isChecked(listener.getSource())) {
         loadContact(this, myself);
       }
@@ -131,7 +130,8 @@ private ComboBox<Contact> createSelection(PersonLookupService personLookupServic
             .map(contact -> new Contact(contact.fullName(), contact.emailAddress(), contact.oidc(),
                 contact.oidcIssuer()
             )));
-    personSelection.addValueChangeListener(listener -> loadContact(this, listener.getValue()));
+    personSelection.addValueChangeListener(listener ->
+        loadContact(this, listener.getValue()));
     return personSelection;
   }
 
@@ -170,7 +170,10 @@ protected void setPresentationValue(Contact contact) {
     if (contact != null) {
       fullName.setValue(contact.fullName());
       email.setValue(contact.email());
-      orcidSelection.setValue(contact);
+      //If oidc information is within the contact we can set the field to the correct value
+      if (contact.isComplete()) {
+        orcidSelection.setValue(contact);
+      }
     }
   }
 
@@ -196,6 +199,10 @@ public TextField getFullNameTextField() {
     return fullName;
   }
 
+  public ComboBox<Contact> getOidcSelection() {
+    return orcidSelection;
+  }
+
   private void removeErrors() {
     email.setInvalid(false);
     fullName.setInvalid(false);

user-interface/src/main/java/life/qbic/datamanager/views/general/utils/Utility.java

@@ -4,7 +4,6 @@
 import com.vaadin.flow.component.textfield.TextField;
 import java.util.Optional;
 import life.qbic.datamanager.views.general.contact.Contact;
-import life.qbic.datamanager.views.general.oidc.OidcType;
 import life.qbic.projectmanagement.application.authorization.QbicOidcUser;
 import life.qbic.projectmanagement.application.authorization.QbicUserDetails;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -34,17 +33,21 @@ public static Optional<Contact> tryToLoadFromPrincipal() {
     var principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
     String fullName;
     String emailAddress;
-    String oidc = "";
+    String oidc;
+    String oidcIssuer;
     if (principal instanceof QbicUserDetails qbicUserDetails) {
       fullName = qbicUserDetails.fullName();
       emailAddress = qbicUserDetails.getEmailAddress();
+      oidc = qbicUserDetails.oidc();
+      oidcIssuer = qbicUserDetails.oidcIssuer();
     } else if (principal instanceof QbicOidcUser qbicOidcUser) {
       fullName = qbicOidcUser.getFullName();
       emailAddress = qbicOidcUser.getEmail();
       oidc = qbicOidcUser.getOidcId();
+      oidcIssuer = qbicOidcUser.getOidcIssuer();
     } else {
       return Optional.empty();
     }
-    return Optional.of(new Contact(fullName, emailAddress, oidc, OidcType.ORCID.getIssuer()));
+    return Optional.of(new Contact(fullName, emailAddress, oidc, oidcIssuer));
   }
 }