Split Entities for remove nullable variables
This commit is contained in:
@@ -4,8 +4,8 @@ import com.sendgrid.helpers.mail.Mail
|
||||
import com.sendgrid.helpers.mail.objects.Content
|
||||
import com.sendgrid.helpers.mail.objects.Email
|
||||
import fr.dcproject.JwtConfig
|
||||
import fr.dcproject.entity.CitizenBasicI
|
||||
import io.ktor.http.URLBuilder
|
||||
import fr.dcproject.entity.Citizen as CitizenEntity
|
||||
import fr.dcproject.repository.Citizen as CitizenRepository
|
||||
|
||||
class SsoManager(
|
||||
@@ -15,11 +15,15 @@ class SsoManager(
|
||||
) {
|
||||
fun sendMail(email: String, url: String) {
|
||||
val citizen = citizenRepo.findByEmail(email) ?: noEmail(email)
|
||||
sendMail(citizen, url)
|
||||
}
|
||||
|
||||
fun sendMail(citizen: CitizenBasicI, url: String) {
|
||||
mailer.sendEmail {
|
||||
Mail(
|
||||
Email("sso@$domain"),
|
||||
"Connection",
|
||||
Email(email),
|
||||
Email(citizen.email),
|
||||
Content("text/plain", generateContent(citizen, url))
|
||||
).apply {
|
||||
addContent(Content("text/html", generateHtmlContent(citizen, url)))
|
||||
@@ -27,15 +31,15 @@ class SsoManager(
|
||||
}
|
||||
}
|
||||
|
||||
private fun generateHtmlContent(citizen: CitizenEntity, url: String): String? {
|
||||
private fun generateHtmlContent(citizen: CitizenBasicI, url: String): String? {
|
||||
val urlObject = URLBuilder(url)
|
||||
urlObject.parameters.append("token", JwtConfig.makeToken(citizen.user ?: error("Citizen must have User")))
|
||||
urlObject.parameters.append("token", JwtConfig.makeToken(citizen.user))
|
||||
return "Click <a href=\"${urlObject.buildString()}\">here</a> for connect to $domain"
|
||||
}
|
||||
|
||||
private fun generateContent(citizen: CitizenEntity, url: String): String {
|
||||
private fun generateContent(citizen: CitizenBasicI, url: String): String {
|
||||
val urlObject = URLBuilder(url)
|
||||
urlObject.parameters.append("token", JwtConfig.makeToken(citizen.user ?: error("Citizen must have User")))
|
||||
urlObject.parameters.append("token", JwtConfig.makeToken(citizen.user))
|
||||
return "Copy this link into your browser for connect to $domain: \n${urlObject.buildString()}"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user