Skip to content

Fixed recover email #18

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

Merged
Wikijito7 merged 1 commit into from
May 18, 2024
Merged

Fixed recover email #18

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
22 changes: 15 additions & 7 deletions src/main/kotlin/es/wokis/services/EmailService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ class EmailService(

val session = Session.getDefaultInstance(properties)
val message = MimeMessage(session)
val title = when (user.lang) {
LANG_ES -> VERIFY_EMAIL_ES
else -> VERIFY_EMAIL_EN
}

if (sendMessage(message, user, body, session)) return null
if (sendMessage(title, message, user, body, session)) return null

return VerificationBO(
email = user.email,
Expand All @@ -41,7 +45,7 @@ class EmailService(
}
}

suspend fun sendRecoverPass(user: UserBO): RecoverBO? {
fun sendRecoverPass(user: UserBO): RecoverBO? {
val emailHtml = this::class.java.getResource("/emails/${user.lang}/recover-pass.html")
?: this::class.java.getResource("/emails/en/recover-pass.html") ?: throw IllegalAccessException()

Expand All @@ -51,8 +55,12 @@ class EmailService(

val session = Session.getDefaultInstance(properties)
val message = MimeMessage(session)
val title = when (user.lang) {
LANG_ES -> RECOVER_PASS_ES
else -> RECOVER_PASS_EN
}

if (sendMessage(message, user, body, session)) return null
if (sendMessage(title, message, user, body, session)) return null

return RecoverBO(
email = user.email,
Expand All @@ -61,6 +69,7 @@ class EmailService(
}

private fun EmailService.sendMessage(
title: String,
message: MimeMessage,
user: UserBO,
body: String,
Expand All @@ -70,10 +79,7 @@ class EmailService(
with(message) {
setFrom(InternetAddress(fromEmail))
addRecipients(Message.RecipientType.TO, user.email)
subject = when (user.lang) {
LANG_ES -> VERIFY_EMAIL_ES
else -> VERIFY_EMAIL_EN
}
subject = title
setContent(body, "text/html")
}

Expand Down Expand Up @@ -104,5 +110,7 @@ class EmailService(
companion object {
private const val VERIFY_EMAIL_EN = "Project Finance - Verify Email"
private const val VERIFY_EMAIL_ES = "Project Finance - Verificar Email"
private const val RECOVER_PASS_EN = "Project Finance - Recover Pass"
private const val RECOVER_PASS_ES = "Project Finance - Recuperar Contraseña"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/emails/es/recover-pass.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="es"><head><meta charset="UTF-8"></head><body><p>Recuperar tu contraseña</p><p>Usa el siguiente código en la app para recuperar tu contraseña: %%TOKEN</p><p>Si no has solicitado este código, ignora este mensaje.</p><p>¡Gracias!</p></body></html>
<!DOCTYPE html><html lang="es"><head><meta charset="UTF-8"></head><body><p>Recuperar tu contraseña</p><p>Usa el siguiente código en la app para recuperar tu contraseña: %%recover</p><p>Si no has solicitado este código, ignora este mensaje.</p><p>¡Gracias!</p></body></html>