Fixes #561

Author: oharsta

server/src/main/java/invite/config/HashGenerator.java

@@ -23,7 +23,7 @@ public static String generateRandomHash() {
     }
 
     public static String generateToken() {
-        return RandomStringUtils.random(36, true, true);
+        return RandomStringUtils.secure().random(36, true, true);
     }
 
     public static String hashToken(String token) {

server/src/main/java/invite/cron/RoleExpirationNotifier.java

@@ -58,8 +58,8 @@ public List<String> doSweep() {
             List<GroupedProviders> groupedProviders = manage.getGroupedProviders(List.of(userRole.getRole()));
             GroupedProviders groupedProvider = groupedProviders.isEmpty() ? null : groupedProviders.get(0);
             Instant endDate = userRole.getEndDate();
-            long daysBetween = ChronoUnit.DAYS.between(endDate, instant);
-            String mail = mailBox.sendUserRoleExpirationNotificationMail(userRole, groupedProvider, roleExpirationNotificationDays);
+            long daysBetween = Math.min(ChronoUnit.DAYS.between(endDate, instant) - roleExpirationNotificationDays, roleExpirationNotificationDays) ;
+            String mail = mailBox.sendUserRoleExpirationNotificationMail(userRole, groupedProvider, (int) daysBetween);
             //https://stackoverflow.com/a/75121707
             userRoleRepository.updateExpiryNotifications(1, userRole.getId());
 

server/src/main/resources/templates/role_expiration_en.html

@@ -12,13 +12,13 @@
         </p>
         {{/environment}}
         <p class="title" style="font-weight: 600;font-size: 38px;line-height: 38px; margin: 0;margin-bottom: 10px;">Your
-            {{userRole.role.name}} role will expire in {{nbrOfDays}} days.</p>
+            {{userRole.role.name}} role will expire in {{nbrOfDays}} day(s).</p>
     </div>
     <div class="middle" style="padding: 20px 0 40px 60px;max-width: 600px;">
         <p>Hi, {{userRole.user.name}}</p>
         <p>Your {{authority}} role {{userRole.role.name}}{{#groupedProvider}} at the application
             {{groupedProvider.name}}{{/groupedProvider}} will expire in {{nbrOfDays}} days.
-            If you think this is a mistake you can reach out to your contactperson at your institution for
+            If you think this is a mistake, you can reach out to your contactperson at your institution for
             a renewal of your {{authority}} role.
             {{#groupedProvider}}
         <table>

server/src/test/java/invite/cron/RoleExpirationNotifierTest.java

@@ -23,7 +23,7 @@ class RoleExpirationNotifierTest extends AbstractMailTest {
     @Test
     void sweep() {
         UserRole userRole = userRoleRepository.findByRoleName("Mail").get(0);
-        userRole.setEndDate(Instant.now().minus(7, ChronoUnit.DAYS));
+        userRole.setEndDate(Instant.now().minus(1, ChronoUnit.DAYS));
         super.stubForManageProviderById(EntityType.OIDC10_RP, "5");
 
         userRoleRepository.save(userRole);
@@ -33,8 +33,9 @@ void sweep() {
         MimeMessageParser messageParser = super.mailMessage();
         String htmlContent = messageParser.getHtmlContent();
         //Due to HTML formatting, we can't be sure of the line breaks
-        Stream.of("Your Inviter role Mail at the application Calendar EN will expire in 5 days".split(" "))
+        Stream.of("Your Inviter role Mail at the application Calendar EN will expire".split(" "))
                 .forEach(s -> assertTrue(htmlContent.contains(s)));
+        assertTrue(htmlContent.contains("1 day(s)"));
 
         userRole = userRoleRepository.findByRoleName("Mail").get(0);
         assertEquals(1, userRole.getExpiryNotifications());