Fixes subpart of #549

Author: oharsta

server/src/main/java/invite/mail/MailBox.java

@@ -104,7 +104,7 @@ public void sendInviteMail(Provisionable provisionable, Invitation invitation,
         String url = intendedAuthority.equals(Authority.GUEST) ? welcomeUrl : clientUrl;
 
         variables.put("url", String.format("%s/invitation/accept?hash=%s", url, invitation.getHash()));
-        variables.put("useEduID", invitation.isEduIDOnly() && invitation.getIntendedAuthority().equals(Authority.GUEST));
+        variables.put("useEduID", invitation.isEduIDOnly());
 
         sendMail(String.format("invitation_%s", language.name()),
                 title,

server/src/test/java/invite/mail/MailBoxTest.java

@@ -23,7 +23,7 @@ class MailBoxTest extends AbstractMailTest {
 
     @Test
     void sendInviteMail() {
-        String htmlContent = doSendInviteMail(true, Authority.INVITER);
+        String htmlContent = doSendInviteMail(false, Authority.INVITER);
 
         assertTrue(htmlContent.contains("Wiki EN"));
         assertTrue(htmlContent.contains("You accept the role(s) by logging in with SURFconext."));
@@ -39,6 +39,15 @@ void sendInviteMailForEduIDOnly() {
         assertTrue(htmlContent.contains("You accept the role(s) by logging in with eduID"));
     }
 
+    @Test
+    void sendInviteMailForEduIDOnlyForNonGuests() {
+        String htmlContent = doSendInviteMail(true, Authority.MANAGER);
+
+        assertTrue(htmlContent.contains("Wiki EN"));
+        assertFalse(htmlContent.contains("You accept the role(s) by logging in with SURFconext"));
+        assertTrue(htmlContent.contains("You accept the role(s) by logging in with eduID"));
+    }
+
     private String doSendInviteMail(boolean eduIDOnly, Authority intendedAuthority) {
         User user = new User(false, "eppn", "sub", "example.com", "John", "Doe", "jdoe@example.com");
         Invitation invitation = new Invitation(intendedAuthority,