smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '24-emailconfigurationservice-does-not-validate-and-or-fetch-the-correct-properties' into 'dev'

Browse source 
Resolve "EmailConfigurationService does not validate and/or fetch the correct properties"

Closes #24

See merge request sa4-2020/the-sanmarinoes/backend!28
This commit is contained in:
Claudio Maggioni 2020-03-09 17:07:31 +01:00
commit 4fa55e364c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/config/EmailConfigurationService.java
View file

@ -4,6 +4,7 @@ import javax.validation.constraints.NotNull;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
/** /**
* Class to interface with `email.*` properties in application.properties. This properties are used * Class to interface with `email.*` properties in application.properties. This properties are used
@ -12,6 +13,7 @@ import org.springframework.stereotype.Component;
* @see ch.usi.inf.sa4.sanmarinoes.smarthut.controller.UserAccountController * @see ch.usi.inf.sa4.sanmarinoes.smarthut.controller.UserAccountController
*/ */
@Component @Component
@Validated
@EnableConfigurationProperties @EnableConfigurationProperties
@ConfigurationProperties(prefix = "email") @ConfigurationProperties(prefix = "email")
public class EmailConfigurationService { public class EmailConfigurationService {

8
src/main/resources/application.properties
View file

@ -24,10 +24,10 @@ spring.mail.properties.mail.smtp.connectiontimeout=5000
spring.mail.properties.mail.smtp.timeout=5000 spring.mail.properties.mail.smtp.timeout=5000
spring.mail.properties.mail.smtp.writetimeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000
email.registrationsubject=Complete your SmartHut.sm registration email.registrationSubject=Complete your SmartHut.sm registration
email.registration=To confirm your registration, please click here: email.registration=To confirm your registration, please click here:
email.registraionpath=http://localhost:8080/register/confirm-account?token= email.registrationPath=http://localhost:8080/register/confirm-account?token=
email.resetpasswordsubject=SmartHut.sm password reset email.resetpasswordSubject=SmartHut.sm password reset
email.resetpassword=To reset your password, please click here: email.resetpassword=To reset your password, please click here:
email.resetpasswordpath=http://localhost:3000/password-reset?token= email.resetpasswordPath=http://localhost:3000/password-reset?token=