Merge branch 'main' into OAuthMigration

Author: amontenegro

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v2.70.15 - 2025-01-31
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.70.14...v2.70.15)
+
+## v2.70.14 - 2025-01-30
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.70.13...v2.70.14)
+
 ## v2.70.13 - 2025-01-30
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.70.12...v2.70.13)

orcid-core/src/main/java/org/orcid/core/manager/v3/impl/EmailManagerImpl.java

@@ -266,8 +266,11 @@ public void reactivatePrimaryEmail(String orcid, String email) {
             entity.setEmail(emailKeys.get(FILTERED_EMAIL));
         }
         entity.setPrimary(true);
-        entity.setVerified(true);        
-        emailDao.merge(entity);  
+        entity.setVerified(true);
+        if (entity.getDateVerified() == null) {
+            entity.setDateVerified(new Date());
+        }
+        emailDao.merge(entity);
         emailDao.flush();
     }
 

orcid-core/src/main/java/org/orcid/core/manager/v3/impl/ProfileEntityManagerImpl.java

@@ -19,23 +19,7 @@
 import org.orcid.core.manager.EncryptionManager;
 import org.orcid.core.manager.ProfileEntityCacheManager;
 import org.orcid.core.manager.impl.OrcidUrlManager;
-import org.orcid.core.manager.v3.AddressManager;
-import org.orcid.core.manager.v3.AffiliationsManager;
-import org.orcid.core.manager.v3.BiographyManager;
-import org.orcid.core.manager.v3.EmailManager;
-import org.orcid.core.manager.v3.ExternalIdentifierManager;
-import org.orcid.core.manager.v3.GivenPermissionToManager;
-import org.orcid.core.manager.v3.NotificationManager;
-import org.orcid.core.manager.v3.OtherNameManager;
-import org.orcid.core.manager.v3.PeerReviewManager;
-import org.orcid.core.manager.v3.ProfileEntityManager;
-import org.orcid.core.manager.v3.ProfileFundingManager;
-import org.orcid.core.manager.v3.ProfileHistoryEventManager;
-import org.orcid.core.manager.v3.ProfileKeywordManager;
-import org.orcid.core.manager.v3.RecordNameManager;
-import org.orcid.core.manager.v3.ResearchResourceManager;
-import org.orcid.core.manager.v3.ResearcherUrlManager;
-import org.orcid.core.manager.v3.WorkManager;
+import org.orcid.core.manager.v3.*;
 import org.orcid.core.manager.v3.read_only.RecordNameManagerReadOnly;
 import org.orcid.core.manager.v3.read_only.impl.ProfileEntityManagerReadOnlyImpl;
 import org.orcid.core.oauth.OrcidOauth2TokenDetailService;
@@ -176,6 +160,9 @@ public class ProfileEntityManagerImpl extends ProfileEntityManagerReadOnlyImpl i
     @Resource
     private ProfileLastModifiedDao profileLastModifiedDao;
 
+    @Resource
+    private ProfileEmailDomainManager profileEmailDomainManager;
+
     @Override
     public boolean orcidExists(String orcid) {
         return profileDao.orcidExists(orcid);
@@ -492,6 +479,7 @@ public Boolean doInTransaction(TransactionStatus status) {
                 // Populate primary email
                 String primaryEmailTrim = primaryEmail.trim();
                 emailManager.reactivatePrimaryEmail(orcid, primaryEmailTrim);
+                profileEmailDomainManager.processDomain(orcid, primaryEmailTrim);
                 if (reactivation == null) {
                     // Delete any non primary email
                     emailManager.clearEmailsAfterReactivation(orcid);

orcid-web/src/main/java/org/orcid/frontend/web/controllers/ErrorController.java

@@ -27,15 +27,7 @@ public ModelAndView error500Page(ModelAndView mav) {
 
     @RequestMapping(value = "/not-found")
     public ModelAndView error404Page(ModelAndView mav) {
-        String orcid = getCurrentUserOrcid();
-        if (orcid != null) {
-            return new ModelAndView("redirect:" + calculateRedirectUrl("/my-orcid"));
-        } else {
-            mav.setViewName("error-404");
-        }
-
-        mav.addObject("noIndex", true);
-        return mav;
+        return new ModelAndView("redirect:" + calculateRedirectUrl("/404"));
     }
 
     @RequestMapping(value = "/oauth/error/redirect-uri-mismatch")