Skip to content

[NAE 2112] Email plugin #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/7.0.0-rev4
Choose a base branch
from
Open

[NAE 2112] Email plugin #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 17 additions & 40 deletions ...com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ import com.netgrif.application.engine.export.service.interfaces.IExportService
import com.netgrif.application.engine.impersonation.service.interfaces.IImpersonationService
import com.netgrif.application.engine.importer.service.FieldFactory
import com.netgrif.application.engine.integration.modules.ModuleHolder
import com.netgrif.application.engine.mail.domain.MailDraft
import com.netgrif.application.engine.mail.interfaces.IMailAttemptService
import com.netgrif.application.engine.mail.interfaces.IMailService
import com.netgrif.application.engine.objects.auth.domain.Author
import com.netgrif.application.engine.objects.auth.domain.IUser
import com.netgrif.application.engine.objects.auth.domain.LoggedUser
Expand Down Expand Up @@ -124,9 +121,6 @@ class ActionDelegate {
@Autowired
IPdfGenerator pdfGenerator

@Autowired
IMailService mailService

@Autowired
GroupService groupService

Expand All @@ -136,9 +130,6 @@ class ActionDelegate {
@Autowired
IRegistrationService registrationService

@Autowired
IMailAttemptService mailAttemptService

@Autowired
UserDetailsServiceImpl userDetailsService

Expand Down Expand Up @@ -1227,20 +1218,6 @@ class ActionDelegate {
generatePdf(sourceTransitionId: transitionId, targetFileFieldId: fileFieldId, dateZoneId: dateZoneId, sourceCase: fromCase, targetCase: saveToCase)
}

void sendEmail(List<String> to, String subject, String body) {
MailDraft mailDraft = MailDraft.builder(mailFrom, to).subject(subject).body(body).build()
sendMail(mailDraft)
}

void sendEmail(List<String> to, String subject, String body, Map<String, File> attachments) {
MailDraft mailDraft = MailDraft.builder(mailFrom, to).subject(subject).body(body).attachments(attachments).build()
sendMail(mailDraft)
}

void sendMail(MailDraft mailDraft) {
mailService.sendMail(mailDraft)
}

def changeUserByEmail(String email) {
[email : { cl ->
changeUserByEmail(email, "email", cl)
Expand Down Expand Up @@ -1314,23 +1291,23 @@ class ActionDelegate {
userService.saveUser(user, null)
}

MessageResource inviteUser(String email) {
NewUserRequest newUserRequest = new NewUserRequest()
newUserRequest.email = email
newUserRequest.groups = new HashSet<>()
newUserRequest.processRoles = new HashSet<>()
return inviteUser(newUserRequest)
}

MessageResource inviteUser(NewUserRequest newUserRequest) {
IUser user = registrationService.createNewUser(newUserRequest)
if (user == null)
return MessageResource.successMessage("Done")
mailService.sendRegistrationEmail(user)

mailAttemptService.mailAttempt(newUserRequest.email)
return MessageResource.successMessage("Done")
}
// MessageResource inviteUser(String email) {
// NewUserRequest newUserRequest = new NewUserRequest()
// newUserRequest.email = email
// newUserRequest.groups = new HashSet<>()
// newUserRequest.processRoles = new HashSet<>()
// return inviteUser(newUserRequest)
// }
//
// MessageResource inviteUser(NewUserRequest newUserRequest) {
// IUser user = registrationService.createNewUser(newUserRequest)
// if (user == null)
// return MessageResource.successMessage("Done")
// mailService.sendRegistrationEmail(user)
//
// mailAttemptService.mailAttempt(newUserRequest.email)
// return MessageResource.successMessage("Done")
// }
Comment on lines +1294 to +1310
Copy link

@coderabbitai coderabbitai bot Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Remove commented-out code that references deleted services.

The commented-out inviteUser methods reference mailService and mailAttemptService that have been removed as part of the email functionality extraction. This dead code should be removed entirely rather than left commented out.

-//    MessageResource inviteUser(String email) {
-//        NewUserRequest newUserRequest = new NewUserRequest()
-//        newUserRequest.email = email
-//        newUserRequest.groups = new HashSet<>()
-//        newUserRequest.processRoles = new HashSet<>()
-//        return inviteUser(newUserRequest)
-//    }
-//
-//    MessageResource inviteUser(NewUserRequest newUserRequest) {
-//        IUser user = registrationService.createNewUser(newUserRequest)
-//        if (user == null)
-//            return MessageResource.successMessage("Done")
-//        mailService.sendRegistrationEmail(user)
-//
-//        mailAttemptService.mailAttempt(newUserRequest.email)
-//        return MessageResource.successMessage("Done")
-//    }

If invitation functionality is needed in the future with the email plugin, these methods should be reimplemented to work with the new plugin architecture rather than restored from commented code.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// MessageResource inviteUser(String email) {
// NewUserRequest newUserRequest = new NewUserRequest()
// newUserRequest.email = email
// newUserRequest.groups = new HashSet<>()
// newUserRequest.processRoles = new HashSet<>()
// return inviteUser(newUserRequest)
// }
//
// MessageResource inviteUser(NewUserRequest newUserRequest) {
// IUser user = registrationService.createNewUser(newUserRequest)
// if (user == null)
// return MessageResource.successMessage("Done")
// mailService.sendRegistrationEmail(user)
//
// mailAttemptService.mailAttempt(newUserRequest.email)
// return MessageResource.successMessage("Done")
// }
🤖 Prompt for AI Agents 
In
application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy
between lines 1294 and 1310, remove the entire block of commented-out inviteUser
methods that reference mailService and mailAttemptService, as these services
have been removed and the code is now dead. Delete this commented code
completely to clean up the file, and if invitation functionality is needed
later, reimplement it using the new email plugin architecture instead of
restoring this old code.


void deleteUser(String email) {
IUser user = userService.findByEmail(email, null)
Expand Down
55 changes: 0 additions & 55 deletions ...ngine/src/main/java/com/netgrif/application/engine/auth/web/AuthenticationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import com.netgrif.application.engine.auth.web.requestbodies.RegistrationRequest;
import com.netgrif.application.engine.auth.service.UserFactory;
import com.netgrif.application.engine.configuration.properties.ServerAuthProperties;
import com.netgrif.application.engine.mail.interfaces.IMailAttemptService;
import com.netgrif.application.engine.mail.interfaces.IMailService;
import com.netgrif.application.engine.security.service.ISecurityContextService;
import freemarker.template.TemplateException;
import io.swagger.v3.oas.annotations.Operation;
Expand Down Expand Up @@ -50,15 +48,9 @@ public class AuthenticationController {
@Autowired
private IRegistrationService registrationService;

@Autowired
private IMailService mailService;

@Autowired
private UserService userService;

@Autowired
private IMailAttemptService mailAttemptService;

@Autowired
private ServerAuthProperties serverAuthProperties;

Expand Down Expand Up @@ -88,32 +80,6 @@ public MessageResource signup(@RequestBody RegistrationRequest regRequest) {
}
}

@Operation(summary = "Send invitation to a new user", security = {@SecurityRequirement(name = "BasicAuth")})
@PostMapping(value = "/invite", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaTypes.HAL_JSON_VALUE)
public MessageResource invite(@RequestBody NewUserRequest newUserRequest, Authentication auth) {
try {
if (!serverAuthProperties.isOpenRegistration() && (auth == null || !((LoggedUser) auth.getPrincipal()).getSelfOrImpersonated().isAdmin())) {
return MessageResource.errorMessage("Only admin can invite new users!");
}

newUserRequest.email = URLDecoder.decode(newUserRequest.email, StandardCharsets.UTF_8.name());
if (mailAttemptService.isBlocked(newUserRequest.email)) {
return MessageResource.successMessage("Done");
}

RegisteredUser user = registrationService.createNewUser(newUserRequest);
if (user == null)
return MessageResource.successMessage("Done");
mailService.sendRegistrationEmail(user);

mailAttemptService.mailAttempt(newUserRequest.email);
return MessageResource.successMessage("Done");
} catch (IOException | TemplateException | MessagingException e) {
log.error(e.toString());
return MessageResource.errorMessage("Failed");
}
}

@Operation(summary = "Verify validity of a registration token", security = {@SecurityRequirement(name = "BasicAuth")})
@PostMapping(value = "/token/verify", consumes = MediaType.TEXT_PLAIN_VALUE, produces = MediaTypes.HAL_JSON_VALUE)
public MessageResource verifyToken(@RequestBody String token) {
Expand Down Expand Up @@ -150,27 +116,6 @@ public ResponseEntity<?> login(Authentication auth, Locale locale) {
return ResponseEntity.ok(userResponseFactory.getUser(userService.findById(loggedUser.getId(), null), locale));
}

@Operation(summary = "Reset password")
@PostMapping(value = "/reset", consumes = MediaType.TEXT_PLAIN_VALUE, produces = MediaTypes.HAL_JSON_VALUE)
public MessageResource resetPassword(@RequestBody String recoveryEmail) {
if (mailAttemptService.isBlocked(recoveryEmail)) {
return MessageResource.successMessage("Done");
}
try {
RegisteredUser user = registrationService.resetPassword(recoveryEmail);
if (user != null) {
mailService.sendPasswordResetEmail(user);
mailAttemptService.mailAttempt(user.getEmail());
return MessageResource.successMessage("Done");
} else {
return MessageResource.successMessage("Done");
}
} catch (MessagingException | IOException | TemplateException e) {
log.error(e.toString());
return MessageResource.errorMessage("Failed");
}
}

@Operation(summary = "Account recovery")
@PostMapping(value = "/recover", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaTypes.HAL_JSON_VALUE)
public MessageResource recoverAccount(@RequestBody RegistrationRequest request) {
Expand Down
75 changes: 0 additions & 75 deletions ...-engine/src/main/java/com/netgrif/application/engine/configuration/MailConfiguration.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...n/java/com/netgrif/application/engine/configuration/drools/RuleEngineGlobalsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//import com.netgrif.application.engine.configuration.drools.interfaces.IRuleEngineGlobalsProvider;
//import com.netgrif.application.engine.elastic.service.interfaces.IElasticCaseService;
//import com.netgrif.application.engine.elastic.service.interfaces.IElasticTaskService;
//import com.netgrif.application.engine.mail.interfaces.IMailService;
//import com.netgrif.application.engine.rules.domain.FactRepository;
//import com.netgrif.application.engine.rules.service.interfaces.IRuleEvaluationScheduleService;
//import com.netgrif.application.engine.workflow.service.interfaces.IDataService;
Expand Down
19 changes: 0 additions & 19 deletions application-engine/src/main/java/com/netgrif/application/engine/mail/EmailType.java
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions application-engine/src/main/java/com/netgrif/application/engine/mail/MailAttemptService.java
View file
Open in desktop

This file was deleted.

Loading
Loading