Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions server/src/main/java/org/eclipse/openvsx/mail/MailService.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

import org.eclipse.openvsx.entities.UserData;
import org.jobrunr.scheduling.JobRequestScheduler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mail.javamail.JavaMailSender;
Expand All @@ -20,6 +22,7 @@

@Component
public class MailService {
private final Logger logger = LoggerFactory.getLogger(MailService.class);

private final boolean disabled;
private final JobRequestScheduler scheduler;
Expand All @@ -36,11 +39,18 @@ public MailService(@Autowired(required = false) JavaMailSender sender, JobReques
}

public void scheduleRevokedAccessTokensMail(UserData user) {
if(disabled) {
if (disabled) {
return;
}

var variables = Map.<String, Object>of("name", user.getFullName());
if (user.getEmail() == null) {
logger.info("Could not schedule mail to user '{}' due to revoked access tokens: email not known", user.getLoginName());
return;
}

// the fullName might be null
var name = user.getFullName() == null ? user.getLoginName() : user.getFullName();
var variables = Map.<String, Object>of("name", name);
var jobRequest = new SendMailJobRequest(
user.getEmail(),
revokedAccessTokensSubject,
Expand Down