github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: email notifications are now sent only to verified email addresses (#5905) 

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.16.x

#### What this PR does / why we need it:
邮件通知功能现在只向经过验证的邮箱地址发送通知匿名用户除外

#### Which issue(s) this PR fixes:
Fixes #5722

#### Does this PR introduce a user-facing change?
```release-note
邮件通知功能现在只向经过验证的邮箱地址发送通知匿名用户除外
```
pull/5956/head
guqing 2024-05-20 17:22:42 +08:00 committed by GitHub
parent c5d63b1a8f
commit d2a9c804ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/java/run/halo/app/notification/DefaultSubscriberEmailResolver.java
View File

@ -30,6 +30,7 @@ public class DefaultSubscriberEmailResolver implements SubscriberEmailResolver {
return Mono.fromSupplier(() -> getEmail(subscriber)); return Mono.fromSupplier(() -> getEmail(subscriber));
} }
return client.fetch(User.class, subscriber.getName()) return client.fetch(User.class, subscriber.getName())
.filter(user -> user.getSpec().isEmailVerified())
.mapNotNull(user -> user.getSpec().getEmail()); .mapNotNull(user -> user.getSpec().getEmail());
} }

9
application/src/test/java/run/halo/app/notification/DefaultSubscriberEmailResolverTest.java
View File

@ -50,6 +50,15 @@ class DefaultSubscriberEmailResolverTest {
user.getMetadata().setName("fake-user"); user.getMetadata().setName("fake-user");
user.setSpec(new User.UserSpec()); user.setSpec(new User.UserSpec());
user.getSpec().setEmail("test@halo.run"); user.getSpec().setEmail("test@halo.run");
user.getSpec().setEmailVerified(false);
when(client.fetch(eq(User.class), eq("fake-user"))).thenReturn(Mono.just(user));
subscriber.setName("fake-user");
subscriberEmailResolver.resolve(subscriber)
.as(StepVerifier::create)
.verifyComplete();
user.getSpec().setEmailVerified(true);
when(client.fetch(eq(User.class), eq("fake-user"))).thenReturn(Mono.just(user)); when(client.fetch(eq(User.class), eq("fake-user"))).thenReturn(Mono.just(user));
subscriber.setName("fake-user"); subscriber.setName("fake-user");