Merge branch 'main' into TogglzCleanup3

CHANGELOG.md

@@ -1,3 +1,26 @@
+## v2.47.1 - 2023-12-18
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.47.0...v2.47.1)
+
+- [#6951](https://github.com/ORCID/ORCID-Source/pull/6951): Remove old togglz from FTL
+
+## v2.47.0 - 2023-12-18
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.46.0...v2.47.0)
+
+- [#6949](https://github.com/ORCID/ORCID-Source/pull/6949): feature: Add encourage user to add works to email events log
+
+### Feature
+
+- Add log for sending `add works reminder` to `profile_event` table
+- Add encourage user to add works to email events log
+
+## v2.46.0 - 2023-12-14
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.45.7...v2.46.0)
+
+- [#6948](https://github.com/ORCID/ORCID-Source/pull/6948): Togglz cleanup
+
 ## v2.45.7 - 2023-12-14
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.45.6...v2.45.7)

orcid-core/src/main/java/org/orcid/core/manager/impl/NotificationManagerImpl.java

@@ -49,6 +49,7 @@
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.NotificationDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.jpa.entities.ActionableNotificationEntity;
 import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
 import org.orcid.persistence.jpa.entities.ClientRedirectUriEntity;
@@ -83,7 +84,7 @@ public class NotificationManagerImpl extends ManagerReadOnlyBaseImpl implements
     private EncryptionManager encryptionManager;
 
     @Resource
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @Resource
     private ProfileDao profileDao;
@@ -128,7 +129,7 @@ public void setEncryptionManager(EncryptionManager encryptionManager) {
         this.encryptionManager = encryptionManager;
     }
 
-    public void setProfileEventDao(GenericDao<ProfileEventEntity, Long> profileEventDao) {
+    public void setProfileEventDao(ProfileEventDao profileEventDao) {
         this.profileEventDao = profileEventDao;
     }
 

orcid-core/src/main/java/org/orcid/core/manager/impl/TwoFactorAuthenticationManagerImpl.java

@@ -13,8 +13,8 @@
 import org.orcid.core.manager.TwoFactorAuthenticationManager;
 import org.orcid.core.manager.read_only.EmailManagerReadOnly;
 import org.orcid.jaxb.model.record_v2.Email;
-import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.jpa.entities.ProfileEntity;
 import org.orcid.persistence.jpa.entities.ProfileEventEntity;
 import org.orcid.persistence.jpa.entities.ProfileEventType;
@@ -40,7 +40,7 @@ public class TwoFactorAuthenticationManagerImpl implements TwoFactorAuthenticati
     private BackupCodeManager backupCodeManager;
 
     @Resource
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @Resource
     private ProfileDao profileDao;

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

@@ -55,6 +55,7 @@
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.NotificationDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.jpa.entities.ActionableNotificationEntity;
 import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
 import org.orcid.persistence.jpa.entities.ClientRedirectUriEntity;
@@ -101,7 +102,7 @@ public class NotificationManagerImpl extends ManagerReadOnlyBaseImpl implements
     private EncryptionManager encryptionManager;
 
     @Resource
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @Resource
     private ProfileDao profileDao;
@@ -175,7 +176,7 @@ public void setEncryptionManager(EncryptionManager encryptionManager) {
         this.encryptionManager = encryptionManager;
     }
 
-    public void setProfileEventDao(GenericDao<ProfileEventEntity, Long> profileEventDao) {
+    public void setProfileEventDao(ProfileEventDao profileEventDao) {
         this.profileEventDao = profileEventDao;
     }
 

orcid-core/src/main/java/org/orcid/core/oauth/security/OrcidOauthRedirectResolver.java

@@ -91,6 +91,6 @@ private boolean isEqual(String str1, String str2) {
 
     @Override
     protected boolean hostMatches(String registered, String requested) {
-        return isEqual(registered, requested) || (requested != null && requested.endsWith("." + registered));        
+        return isEqual(registered, requested);
     }
 }

orcid-core/src/main/java/org/orcid/core/profileEvent/EmailFrequencyServiceAnnouncement2018.java

@@ -19,14 +19,15 @@
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
-import org.orcid.core.manager.NotificationManager;
 import org.orcid.core.manager.TemplateManager;
 import org.orcid.core.manager.impl.OrcidUrlManager;
 import org.orcid.core.manager.v3.RecordNameManager;
 import org.orcid.jaxb.model.notification_v2.NotificationType;
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.NotificationDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
+import org.orcid.persistence.dao.impl.ProfileEventDaoImpl;
 import org.orcid.persistence.jpa.entities.NotificationServiceAnnouncementEntity;
 import org.orcid.persistence.jpa.entities.ProfileEntity;
 import org.orcid.persistence.jpa.entities.ProfileEventEntity;
@@ -54,7 +55,7 @@ public class EmailFrequencyServiceAnnouncement2018 {
 
     private TemplateManager templateManager;
 
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;    
+    private ProfileEventDao profileEventDao;    
 
     private NotificationDao notificationDao;
 
@@ -100,7 +101,7 @@ private void init() {
         profileDaoReadOnly = (ProfileDao) context.getBean("profileDaoReadOnly");
         messages = (MessageSource) context.getBean("messageSource");
         templateManager = (TemplateManager) context.getBean("templateManager");
-        profileEventDao = (GenericDao) context.getBean("profileEventDao");
+        profileEventDao = (ProfileEventDao) context.getBean("profileEventDao");
         notificationDao = (NotificationDao) context.getBean("notificationDao");
         orcidUrlManager = (OrcidUrlManager) context.getBean("orcidUrlManager");
         recordNameManager = (RecordNameManager) context.getBean("recordNameManagerV3");

orcid-core/src/main/java/org/orcid/core/profileEvent/ProfileEventManager.java

@@ -15,8 +15,8 @@
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
-import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.jpa.entities.ProfileEventEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +37,7 @@ public class ProfileEventManager {
     private ProfileDao profileDao;
 
     @Resource
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @Resource
     private TransactionTemplate transactionTemplate;
@@ -136,11 +136,11 @@ public void setProfileDao(ProfileDao profileDao) {
         this.profileDao = profileDao;
     }
 
-    public GenericDao<ProfileEventEntity, Long> getProfileEventDao() {
+    public ProfileEventDao getProfileEventDao() {
         return profileEventDao;
     }
 
-    public void setProfileEventDao(GenericDao<ProfileEventEntity, Long> profileEventDao) {
+    public void setProfileEventDao(ProfileEventDao profileEventDao) {
         this.profileEventDao = profileEventDao;
     }
 

orcid-core/src/main/java/org/orcid/core/profileEvent/quarterlyNotifications/QuarterlyNotificationsManager.java

@@ -22,6 +22,7 @@
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.NotificationDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.jpa.entities.EmailFrequencyEntity;
 import org.orcid.persistence.jpa.entities.NotificationTipEntity;
 import org.orcid.persistence.jpa.entities.ProfileEntity;
@@ -41,7 +42,7 @@ public abstract class QuarterlyNotificationsManager {
 
     private static Logger LOG = LoggerFactory.getLogger(QuarterlyNotificationsManager.class);
 
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     private ProfileDao profileDaoReadOnly;
 
@@ -89,7 +90,7 @@ public QuarterlyNotificationsManager(ProfileEventType created, ProfileEventType
         notificationDao = (NotificationDao) context.getBean("notificationDao");        
         orcidUrlManager = (OrcidUrlManager) context.getBean("orcidUrlManager");
         emailFrequencyDao = (EmailFrequencyDao) context.getBean("emailFrequencyDao");
-        profileEventDao = (GenericDao) context.getBean("profileEventDao");
+        profileEventDao = (ProfileEventDao) context.getBean("profileEventDao");
         encryptionManager = (EncryptionManager) context.getBean("encryptionManager");
         messages = (MessageSource) context.getBean("messageSource");
         transactionTemplate = (TransactionTemplate) context.getBean("transactionTemplate");

orcid-core/src/test/java/org/orcid/core/manager/NotificationManagerTest.java

@@ -55,6 +55,7 @@
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.NotificationDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.dao.impl.NotificationDaoImpl;
 import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
 import org.orcid.persistence.jpa.entities.NotificationEntity;
@@ -80,7 +81,7 @@ public class NotificationManagerTest extends DBUnitTest {
 
 
     @Mock
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @Mock
     private SourceManager sourceManager;

orcid-core/src/test/java/org/orcid/core/manager/TwoFactorAuthenticationManagerTest.java

@@ -28,6 +28,7 @@
 import org.orcid.jaxb.model.record_v2.Email;
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.jpa.entities.ProfileEntity;
 import org.orcid.persistence.jpa.entities.ProfileEventEntity;
 
@@ -49,7 +50,7 @@ public class TwoFactorAuthenticationManagerTest {
     private ProfileDao profileDao;
 
     @Mock
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @InjectMocks
     private TwoFactorAuthenticationManagerImpl twoFactorAuthenticationManager;

orcid-core/src/test/java/org/orcid/core/manager/v3/NotificationManagerTest.java

@@ -64,6 +64,7 @@
 import org.orcid.persistence.dao.GenericDao;
 import org.orcid.persistence.dao.NotificationDao;
 import org.orcid.persistence.dao.ProfileDao;
+import org.orcid.persistence.dao.ProfileEventDao;
 import org.orcid.persistence.dao.impl.NotificationDaoImpl;
 import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
 import org.orcid.persistence.jpa.entities.EmailEventEntity;
@@ -90,7 +91,7 @@ public class NotificationManagerTest extends DBUnitTest {
             "/data/BiographyEntityData.xml");
 
     @Mock
-    private GenericDao<ProfileEventEntity, Long> profileEventDao;
+    private ProfileEventDao profileEventDao;
 
     @Mock
     private SourceManager mockSourceManager;

orcid-core/src/test/java/org/orcid/core/oauth/OrcidRefreshTokenTokenGranterTest.java

@@ -11,6 +11,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Random;
 import java.util.Set;
 
 import javax.annotation.Resource;
@@ -42,6 +43,8 @@ public class OrcidRefreshTokenTokenGranterTest extends DBUnitTest {
     private static final String CLIENT_ID_2 = "APP-5555555555555556";
     private static final String USER_ORCID = "0000-0000-0000-0001";
 
+    private Random random = new Random(System.currentTimeMillis());
+
     @Resource
     private OrcidOauth2TokenDetailService orcidOauth2TokenDetailService;
 
@@ -119,8 +122,8 @@ public void createRefreshTokenTest() {
         // should be equal
         long time = System.currentTimeMillis();
         String scope = "/activities/update";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = null;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -154,8 +157,8 @@ public void createRefreshTokenWithNarrowerScopesTest() {
         long time = System.currentTimeMillis();
         String parentScope = "/activities/update";
         String refreshScope = "/orcid-works/create";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -188,8 +191,8 @@ public void createRefreshTokenWithoutRevokeParent() {
         // should be enabled, refresh should be enabled
         long time = System.currentTimeMillis();
         String parentScope = "/activities/update /read-limited";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = false;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -228,8 +231,8 @@ public void createRefreshTokenWithoutRevokeParentAndWithNarrowerScopes() {
         long time = System.currentTimeMillis();
         String parentScope = "/person/read-limited";
         String refreshScope = "/orcid-bio/read-limited";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = false;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -262,8 +265,8 @@ public void createRefreshTokenWithExpirationOf10Secs() {
         long time = System.currentTimeMillis();
         String parentScope = "/person/read-limited";
         String refreshScope = "/orcid-bio/read-limited";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = false;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = 5L;
@@ -299,8 +302,8 @@ public void tryToCreateRefreshTokenWithInvalidScopesTest() {
         long time = System.currentTimeMillis();
         String parentScope = "/person/update";
         String refreshScope = "/orcid-works/read-limited";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -322,8 +325,8 @@ public void tryToCreateRefreshTokenWithThatExpireAfterParentTokenTest() {
         // token, fail
         long time = System.currentTimeMillis();
         String parentScope = "/person/update";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = time + (15000);
@@ -345,8 +348,8 @@ public void tryToCreateRefreshTokenWithInvalidClientTest() {
         // client # 2, fail
         long time = System.currentTimeMillis();
         String parentScope = "/person/update";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -367,8 +370,8 @@ public void tryToCreateRefreshTokenWithInvalidClientTest() {
     public void tryToRefreshAnExpiredTokenTest() {
         long time = System.currentTimeMillis();
         String parentScope = "/person/update";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time - 10000);
         Long expireIn = null;
@@ -390,8 +393,8 @@ public void tryToCreateRefreshTokenWithInvalidRefreshTokenTest() {
         // fail
         long time = System.currentTimeMillis();
         String parentScope = "/person/update";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time + 10000);
         Long expireIn = null;
@@ -415,8 +418,8 @@ public void tryToCreateRefreshTokenWithInvalidParentTokenValueTest() {
         // value, fail
         long time = System.currentTimeMillis();
         String parentScope = "/person/update";
-        String tokenValue = "parent-token-" + time;
-        String refreshTokenValue = "refresh-token-" + time;
+        String tokenValue = "parent-token-" + random.nextLong();
+        String refreshTokenValue = "refresh-token-" + random.nextLong();
         Boolean revokeOld = true;
         Date parentTokenExpiration = new Date(time + 15000);
         Long expireIn = null;
@@ -428,7 +431,7 @@ public void tryToCreateRefreshTokenWithInvalidParentTokenValueTest() {
         // We shouldn't care about the access token, it's not required and
         // shouldn't really be there. If the refresh token and client
         // credentials are good, we can generate the refresh token.
-        assertNotNull(refreshedToken);
+        assertNotNull(refreshedToken);                
     } 
 
 }