pre-populate ORCID ID on dataset create page #3944

IQSS · Jun 27, 2017 · ca33857 · ca33857
1 parent ba61257
commit ca33857
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1369,6 +1369,7 @@ private void resetVersionUI() {
                     }
                 }
 
+                String creatorOrcidId = au.getOrcidId();
                 if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.author) && dsf.isEmpty()) {
                     for (DatasetFieldCompoundValue authorValue : dsf.getDatasetFieldCompoundValues()) {
                         for (DatasetField subField : authorValue.getChildDatasetFields()) {
@@ -1378,6 +1379,11 @@ private void resetVersionUI() {
                             if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorAffiliation)) {
                                 subField.getDatasetFieldValues().get(0).setValue(au.getAffiliation());
                             }
+                            if (creatorOrcidId != null) {
+                                if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.authorIdValue)) {
+                                    subField.getDatasetFieldValues().get(0).setValue(creatorOrcidId);
+                                }
+                            }
                         }
                     }
                 }

diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java
@@ -5,6 +5,7 @@
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserLookup;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinAuthenticationProvider;
+import edu.harvard.iq.dataverse.authorization.providers.oauth2.impl.OrcidOAuth2AP;
 import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty;
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -261,5 +262,13 @@ public String toString() {
     public String getSortByString() {
         return this.getLastName() + " " + this.getFirstName() + " " + this.getUserIdentifier();
     }
-
+
+    public String getOrcidId() {
+        String authProviderId = getAuthenticatedUserLookup().getAuthenticationProviderId();
+        if (OrcidOAuth2AP.PROVIDER_ID_PRODUCTION.equals(authProviderId)) {
+            return getAuthenticatedUserLookup().getPersistentUserId();
+        }
+        return null;
+    }
+
 }