diff --git a/orcid-core/src/main/java/org/orcid/core/togglz/Features.java b/orcid-core/src/main/java/org/orcid/core/togglz/Features.java index c3fceb46f17..b19a5bc6e3e 100644 --- a/orcid-core/src/main/java/org/orcid/core/togglz/Features.java +++ b/orcid-core/src/main/java/org/orcid/core/togglz/Features.java @@ -75,9 +75,6 @@ public enum Features implements Feature { @Label("Affiliation search") AFFILIATION_SEARCH, - @Label("Https for links to iDs") - HTTPS_IDS, - @Label("Arabic translation") LANG_AR, @@ -129,12 +126,6 @@ public enum Features implements Feature { @Label("Works failure debug") WORKS_FAILURE_DEBUG, - @Label("Disable the 2.0 release candidates") - V2_DISABLE_RELEASE_CANDIDATES, - - @Label("Disable the 3.0 release candidates") - V3_DISABLE_RELEASE_CANDIDATES, - @Label("ID token 24 hours lifespan") ID_TOKEN_24_HOURS_LIFESPAN, diff --git a/orcid-core/src/main/java/org/orcid/core/utils/v3/OrcidIdentifierUtils.java b/orcid-core/src/main/java/org/orcid/core/utils/v3/OrcidIdentifierUtils.java index 6794e40f45f..ce9ba0eaae0 100644 --- a/orcid-core/src/main/java/org/orcid/core/utils/v3/OrcidIdentifierUtils.java +++ b/orcid-core/src/main/java/org/orcid/core/utils/v3/OrcidIdentifierUtils.java @@ -3,7 +3,6 @@ import java.net.URI; import java.net.URISyntaxException; -import org.orcid.core.togglz.Features; import org.orcid.jaxb.model.v3.release.common.OrcidIdentifier; import org.springframework.beans.factory.annotation.Value; @@ -14,10 +13,7 @@ public class OrcidIdentifierUtils { public OrcidIdentifier buildOrcidIdentifier(String orcid) { OrcidIdentifier identifier = new OrcidIdentifier(); - String correctedBaseUri = baseUri; - if(!Features.HTTPS_IDS.isActive()) { - correctedBaseUri = correctedBaseUri.replace("https", "http"); - } + String correctedBaseUri = baseUri; try { URI uri = new URI(correctedBaseUri); identifier.setHost(uri.getHost()); diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/HomeController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/HomeController.java index 8f775ec968d..9ecb15454cb 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/HomeController.java +++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/HomeController.java @@ -287,12 +287,7 @@ public String getMaintenanceMessage() { } protected String getSearchBaseUrl() { - String pubBaseUri = orcidUrlManager.getPubBaseUrl(); - if(Features.HTTPS_IDS.isActive()) { - return pubBaseUri + "/v3.0/search/"; - } else { - return pubBaseUri + "/v1.2/search/orcid-bio/"; - } + return orcidUrlManager.getPubBaseUrl() + "/v3.0/search/"; } class ConfigDetails { diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java index a3e86e1fce9..56b8006d90a 100644 --- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java +++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java @@ -516,18 +516,7 @@ public ModelAndView verifyEmail(HttpServletRequest request, HttpServletResponse } return new ModelAndView(redirect); - } - - private Search findPotentialDuplicatesByFirstNameLastName(String firstName, String lastName) { - LOGGER.debug("About to search for potential duplicates during registration for first name={}, last name={}", firstName, lastName); - SearchOrcidSolrCriteria queryForm = new SearchOrcidSolrCriteria(); - queryForm.setGivenName(firstName); - queryForm.setFamilyName(lastName); - Search visibleProfiles = orcidSearchManager.findOrcidsByQuery(queryForm.deriveQueryString(), DUP_SEARCH_START, DUP_SEARCH_ROWS); - LOGGER.debug("Found {} potential duplicates during registration for first name={}, last name={}", - new Object[] { visibleProfiles.getNumFound(), firstName, lastName }); - return visibleProfiles; - } + } private void createMinimalRegistrationAndLogUserIn(HttpServletRequest request, HttpServletResponse response, Registration registration, boolean usedCaptchaVerification, Locale locale, String ip) {