Merge pull request IQSS#4297 from IQSS/orcid_v21

orcid v2.1 changes (mainly https for profile page link)
uit-no-old · Nov 21, 2017 · caf6371 · caf6371
2 parents c67a39f + d80b9d1
commit caf6371
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
@@ -268,7 +268,7 @@ public String generateXML() {
             if (author.getIdType() != null && author.getIdValue() != null && !author.getIdType().isEmpty() && !author.getIdValue().isEmpty() && author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) {
 
                 if (author.getIdType().equals("ORCID")) {
-                    creatorsElement.append("<nameIdentifier schemeURI=\"http://orcid.org/\" nameIdentifierScheme=\"ORCID\">" + author.getIdValue() + "</nameIdentifier>");
+                    creatorsElement.append("<nameIdentifier schemeURI=\"https://orcid.org/\" nameIdentifierScheme=\"ORCID\">" + author.getIdValue() + "</nameIdentifier>");
                 }
                 if (author.getIdType().equals("ISNI")) {
                     creatorsElement.append("<nameIdentifier schemeURI=\"http://isni.org/isni/\" nameIdentifierScheme=\"ISNI\">" + author.getIdValue() + "</nameIdentifier>");

diff --git a/...main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java b/...main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
@@ -263,7 +263,7 @@ public String getPersistentIdDescription() {
 
     @Override
     public String getPersistentIdUrlPrefix() {
-        return "http://orcid.org/";
+        return "https://orcid.org/";
     }
 
     @Override

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
@@ -196,7 +196,7 @@
                                                 ORCID is an open, non-profit, community-based effort to provide a registry of unique researcher identifiers
                                                 and a transparent method of linking research activities and outputs to these identifiers. ORCID is unique in
                                                 its ability to reach across disciplines, research sectors, and national boundaries and its cooperation with
-                                                other identifier systems. Find out more at <a href="http://orcid.org/about" target="_blank">orcid.org/about</a>.
+                                                other identifier systems. Find out more at <a href="https://orcid.org/about" target="_blank">orcid.org/about</a>.
 						</p>
 						<p class="help-block small" style="margin-top:1em;">
 						This repository uses your ORCID for authentication (so you don't need another username/password combination).