Merge pull request #7426 from TheThingsNetwork/fix/support-access-req…

…uested-changes Filter email receivers by user state
TheThingsNetwork · Dec 6, 2024 · b8f6e79 · b8f6e79
2 parents 5dfb513 + da33718
commit b8f6e79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/identityserver/email.go b/pkg/identityserver/email.go
@@ -109,6 +109,11 @@ func (is *IdentityServer) SendNotificationEmailToUsers(ctx context.Context, noti
 			continue
 		}
 
+		// Skips over non approved users.
+		if receiver.State != ttnpb.State_STATE_APPROVED {
+			continue
+		}
+
 		wg.Go(func() error {
 			templateData, err := emailNotification.DataBuilder(
 				ctx,
@@ -147,7 +152,7 @@ func (is *IdentityServer) SendTemplateEmailToUserIDs(
 	return is.SendTemplateEmailToUsers(ctx, templateName, dataBuilder, receivers...)
 }
 
-var notificationEmailUserFields = store.FieldMask{"ids", "name", "primary_email_address", "admin"}
+var notificationEmailUserFields = store.FieldMask{"ids", "name", "primary_email_address", "admin", "state"}
 
 // SendNotificationEmailToUserIDs looks up the users and sends them a notification email.
 func (is *IdentityServer) SendNotificationEmailToUserIDs(ctx context.Context, notification *ttnpb.Notification, receiverIDs ...*ttnpb.UserIdentifiers) error {

diff --git a/pkg/identityserver/notification_registry.go b/pkg/identityserver/notification_registry.go
@@ -350,6 +350,11 @@ func (is *IdentityServer) notifyAdminsInternal(ctx context.Context, req *ttnpb.C
 		if receiver.Ids.IDString() == ttnpb.SupportUserID {
 			continue
 		}
+
+		// Skips over non approved administrators.
+		if receiver.State != ttnpb.State_STATE_APPROVED {
+			continue
+		}
 		receiverUserIDs[i] = receiver.Ids
 	}