-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3208 from Kehrlann/dgarnier/javaconfig
Move `login-ui` Service classes to Javaconfig
- Loading branch information
Showing
11 changed files
with
188 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 123 additions & 6 deletions
129
server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/LoginServerConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,138 @@ | ||
| package org.cloudfoundry.identity.uaa.impl.config; | ||
|
|
||
| import org.cloudfoundry.identity.uaa.message.EmailService; | ||
| import org.cloudfoundry.identity.uaa.message.LocalUaaRestTemplate; | ||
| import org.cloudfoundry.identity.uaa.message.MessageService; | ||
| import org.cloudfoundry.identity.uaa.message.MessageType; | ||
| import org.cloudfoundry.identity.uaa.message.NotificationsService; | ||
| import org.cloudfoundry.identity.uaa.message.util.FakeJavaMailSender; | ||
| import org.cloudfoundry.identity.uaa.zone.beans.IdentityZoneManager; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| import org.springframework.boot.context.properties.EnableConfigurationProperties; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.core.env.Environment; | ||
| import org.springframework.context.annotation.Lazy; | ||
| import org.springframework.context.annotation.Primary; | ||
| import org.springframework.mail.javamail.JavaMailSender; | ||
| import org.springframework.mail.javamail.JavaMailSenderImpl; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
|
|
||
| /** | ||
| * Configuration for sending e-mails or HTTP-based notifications, e.g. on account creation. | ||
| * <p> | ||
| * If a {@code notifications.url} property is defined, it uses HTTP-based notifications. | ||
| * Otherwise, if {@code smtp.*} properties are defined, it will send e-mails. If none of | ||
| * these properties are configured, it uses a {@link FakeJavaMailSender} mailer. | ||
| * <p> | ||
| * All beans are marked lazy except {@link NotificationConfiguration#notificationMessageService}, | ||
| * as they are all "fallback" options and do not need to be created when {@code notifications.url} | ||
| * is defined. | ||
| */ | ||
| @Lazy | ||
| @Configuration | ||
| @EnableConfigurationProperties(SmtpProperties.class) | ||
| public class LoginServerConfig { | ||
|
|
||
| /** | ||
| * Fallback bean for when there is no "notifications.url". | ||
| * TODO: dgarnier annotate with @Fallback in Boot 3.4 | ||
| * | ||
| * @return - | ||
| */ | ||
| @Bean | ||
| public MessageService messageService(EmailService emailService, NotificationsService notificationsService, Environment environment) { | ||
| if (environment.getProperty("notifications.url") != null && !"".equals(environment.getProperty("notifications.url"))) { | ||
| return notificationsService; | ||
| } else { | ||
| return emailService; | ||
| public MessageService emailMessageService( | ||
| // dgarnier: use DEFAULT_UAA_URL | ||
| @Value("${login.url:http://localhost:8080/uaa}") String loginUrl, | ||
| JavaMailSender mailSender, | ||
| SmtpProperties smtpProperties, | ||
| IdentityZoneManager identityZoneManager) { | ||
| return new EmailService( | ||
| mailSender, | ||
| loginUrl, | ||
| smtpProperties.fromAddress(), | ||
| identityZoneManager | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Fallback for SMTP mail sender, when no real mail sender is used. This is mostly used in tests. | ||
| * TODO: dgarnier annotate with @Fallback in Boot 3.4 | ||
| * | ||
| * @return - | ||
| */ | ||
| @Bean | ||
| JavaMailSender fakeJavaMailSender() { | ||
| return new FakeJavaMailSender(); | ||
| } | ||
|
|
||
| @Bean | ||
| @Primary | ||
| @ConditionalOnProperty(value = "smtp.host", matchIfMissing = false) | ||
| JavaMailSender smtpMailSender(SmtpProperties smtpProperties) { | ||
| var mailSender = new JavaMailSenderImpl(); | ||
| mailSender.setHost(smtpProperties.host()); | ||
| mailSender.setPort(smtpProperties.port()); | ||
| mailSender.setPassword(smtpProperties.password()); | ||
| mailSender.setUsername(smtpProperties.user()); | ||
|
|
||
| var javaMailProperties = new Properties(); | ||
| javaMailProperties.put("mail.smtp.auth", smtpProperties.auth()); | ||
| javaMailProperties.put("mail.smtp.starttls.enable", smtpProperties.starttls()); | ||
| javaMailProperties.put("mail.smtp.ssl.protocols", smtpProperties.sslprotocols()); | ||
| mailSender.setJavaMailProperties(javaMailProperties); | ||
| return mailSender; | ||
| } | ||
|
|
||
| @Configuration | ||
| @ConditionalOnProperty(value = "notifications.url", matchIfMissing = false) | ||
| @EnableConfigurationProperties(NotificationsProperties.class) | ||
| static class NotificationConfiguration { | ||
|
|
||
| /** | ||
| * HTTP-based {@link MessageService}. Takes precedence over any email-basedO | ||
| * configuration. | ||
| * | ||
| * @param notificationsTemplate - | ||
| * @param notificationsProperties - | ||
| * @return - | ||
| */ | ||
| @Bean | ||
| @Primary | ||
| public MessageService notificationMessageService( | ||
| LocalUaaRestTemplate notificationsTemplate, | ||
| NotificationsProperties notificationsProperties | ||
| ) { | ||
| return new NotificationsService( | ||
| notificationsTemplate, | ||
| notificationsProperties.url(), | ||
| notifications(), | ||
| notificationsProperties.sendInDefaultZone() | ||
| ); | ||
| } | ||
|
|
||
| private static Map<MessageType, HashMap<String, Object>> notifications() { | ||
| return Map.of( | ||
| MessageType.CREATE_ACCOUNT_CONFIRMATION, notification("Send activation code", "f7a85fdc-d920-41f0-b3a4-55db08e408ce"), | ||
| MessageType.PASSWORD_RESET, notification("Reset Password", "141200f6-93bd-4761-a721-941ab511ba2c"), | ||
| MessageType.CHANGE_EMAIL, notification("Change Email", "712de257-a7fa-44cb-b1ac-8a6588d1be23"), | ||
| MessageType.INVITATION, notification("Invitation", "e6722687-3f0f-4e7a-9925-839a04712cea") | ||
| ); | ||
| } | ||
|
|
||
| private static HashMap<String, Object> notification(String description, String id) { | ||
| return new HashMap<>( | ||
| Map.of( | ||
| "description", description, | ||
| "id", id, | ||
| "critical", true | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
11 changes: 11 additions & 0 deletions
11
server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/NotificationsProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.cloudfoundry.identity.uaa.impl.config; | ||
|
|
||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| import org.springframework.boot.context.properties.bind.DefaultValue; | ||
|
|
||
| @ConfigurationProperties(prefix = "notifications") | ||
| record NotificationsProperties( | ||
| String url, | ||
| @DefaultValue("true") boolean sendInDefaultZone | ||
| ) { | ||
| } |
17 changes: 17 additions & 0 deletions
17
server/src/main/java/org/cloudfoundry/identity/uaa/impl/config/SmtpProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package org.cloudfoundry.identity.uaa.impl.config; | ||
|
|
||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| import org.springframework.boot.context.properties.bind.DefaultValue; | ||
|
|
||
| @ConfigurationProperties(prefix = "smtp") | ||
| public record SmtpProperties( | ||
| @DefaultValue("localhost") String host, | ||
| @DefaultValue("25") int port, | ||
| @DefaultValue("") String user, | ||
| @DefaultValue("") String password, | ||
| @DefaultValue("false") boolean auth, | ||
| @DefaultValue("false") boolean starttls, | ||
| @DefaultValue("TLSv1.2") String sslprotocols, | ||
| @DefaultValue("") String fromAddress | ||
| ) { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.