Skip to content
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

Jump to bottom

FIX reset or forgot mails #44

Open
wants to merge 4 commits into
base: newdist
Choose a base branch
from
Open

FIX reset or forgot mails #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7707d8
Merge pull request #1 from MyCollab/newdist
tejeswar2020 Feb 13, 2019
b70038e
fix ResetUser
tejeswar2020 Feb 13, 2019
80af29d
update Log statements for TO and BCC
tejeswar2020 Feb 13, 2019
0b88b2f
fix for resendBtn error
tejeswar2020 Feb 13, 2019
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
9 changes: 4 additions & 5 deletions mycollab-esb/src/main/java/com/mycollab/module/user/esb/ResetUserPasswordCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import com.mycollab.module.user.accountsettings.localization.UserI18nEnum
import com.mycollab.module.user.service.UserService
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Component
import java.util.*

/**
* @author MyCollab Ltd
Expand Down Expand Up @@ -60,16 +61,14 @@ class ResetUserPasswordCommand(private val extMailService: ExtMailService,
contentGenerator.putVariable("urlRecoveryPassword", recoveryPasswordURL)
contentGenerator.putVariable("copyRight", LocalizationHelper.getMessage(locale, MailI18nEnum.Copyright,
DateTimeUtils.getCurrentYear()))
val recipient = MailRecipientField(user.email, user.username)
val recipientFields = listOf(recipient)


extMailService.sendHTMLMail(applicationConfiguration.notifyEmail, applicationConfiguration.siteName,
recipientFields,
Collections.singletonList(MailRecipientField(user.username, user.username)),
Copy link
Contributor

Choose a reason for hiding this comment

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

We should use listOf instead of Collections.singletonList. of course, both works but I prefer to use the existing Kotlin API in Kotlin source instead of Java library. We can write the code like listOf(MailRecipientField(user.username, user.username))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

LocalizationHelper.getMessage(locale, UserI18nEnum.MAIL_RECOVERY_PASSWORD_SUBJECT,
applicationConfiguration.siteName),
contentGenerator.parseFile("mailUserRecoveryPasswordNotifier.ftl", locale))
} else {
LOG.error("Can not reset the password of username $username because this user is not existed")
}
}
}
}
4 changes: 2 additions & 2 deletions mycollab-services/src/main/java/com/mycollab/module/mail/DefaultMailer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DefaultMailer(private val emailConf: EmailConfiguration) : IMailer {
toEmail.forEach {
when {
isValidate(it.email) && isValidate(it.name) -> email.addTo(it.email, it.name)
else -> LOG.error("Invalid cc email input: ${it.email}---${it.email}")
else -> LOG.error("Invalid to email input: ${it.email}---${it.email}")
}
}

Expand All @@ -59,7 +59,7 @@ class DefaultMailer(private val emailConf: EmailConfiguration) : IMailer {
bccEmail?.forEach {
when {
isValidate(it.email) && isValidate(it.name) -> email.addBcc(it.email, it.name)
else -> LOG.error("Invalid cc email input: ${it.email}---${it.email}")
else -> LOG.error("Invalid bcc email input: ${it.email}---${it.email}")
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...eb/src/main/java/com/mycollab/module/user/accountsettings/team/view/UserListViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ private Component generateMemberBlock(SimpleUser member) {

if (RegisterStatusConstants.NOT_LOG_IN_YET.equals(member.getRegisterstatus())) {
MButton resendBtn = new MButton(UserUIContext.getMessage(UserI18nEnum.ACTION_RESEND_INVITATION), clickEvent -> {
SendUserInvitationEvent invitationEvent = new SendUserInvitationEvent(member.getUsername(), "",
SendUserInvitationEvent invitationEvent = new SendUserInvitationEvent(member.getUsername(), member.getPassword(),
Copy link
Contributor

Choose a reason for hiding this comment

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

If you debug the password value, then you know this password is encrypted and we don't know the original one. So the password (if any) we send to the user in this case can not be used to log in the system.

If we resend the invitation, the user can get the password in the previous email. If they can't get this email, he can use the forgot password.

member.getInviteUser(), AppUI.getSubDomain(), AppUI.getAccountId());
AsyncEventBus asyncEventBus = AppContextUtil.getSpringBean(AsyncEventBus.class);
asyncEventBus.post(invitationEvent);
Expand Down