chore: require both title and message

ssncferreira · ssncferreira · commit 681a29ff5c6d · 2025-09-11T10:29:01.000Z
diff --git a/coderd/notifications.go b/coderd/notifications.go
@@ -367,7 +367,7 @@ func (api *API) postCustomNotification(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	// Validate request: require `content` and at least one non-empty `title` or `message`.
+	// Validate request: require `content` and non-empty `title` and `message`
 	if err := req.Validate(); err != nil {
 		api.Logger.Error(ctx, "send custom notification: validation failed", slog.Error(err))
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
diff --git a/codersdk/notifications.go b/codersdk/notifications.go
@@ -302,18 +302,20 @@ func (c CustomNotificationRequest) Validate() error {
 	if c.Content == nil {
 		return xerrors.Errorf("content is required")
 	}
-	if strings.TrimSpace(c.Content.Title) == "" &&
-		strings.TrimSpace(c.Content.Message) == "" {
-		return xerrors.Errorf("provide a non-empty 'content.title' or 'content.message'")
-	}
+	return c.Content.Validate()
+}
 
-	if len(c.Content.Title) > maxCustomNotificationTitleLen {
+func (c CustomNotificationContent) Validate() error {
+	if strings.TrimSpace(c.Title) == "" ||
+		strings.TrimSpace(c.Message) == "" {
+		return xerrors.Errorf("provide a non-empty 'content.title' and 'content.message'")
+	}
+	if len(c.Title) > maxCustomNotificationTitleLen {
 		return xerrors.Errorf("'content.title' must be less than %d characters", maxCustomNotificationTitleLen)
 	}
-	if len(c.Content.Message) > maxCustomNotificationMessageLen {
+	if len(c.Message) > maxCustomNotificationMessageLen {
 		return xerrors.Errorf("'content.message' must be less than %d characters", maxCustomNotificationMessageLen)
 	}
-
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ func (api API) postCustomNotification(rw http.ResponseWriter, r http.Request)`
`367`	`367`	`return`
`368`	`368`	`}`
`369`	`369`
`370`		- // Validate request: require `content` and at least one non-empty `title` or `message`.
	`370`	+ // Validate request: require `content` and non-empty `title` and `message`
`371`	`371`	`if err := req.Validate(); err != nil {`
`372`	`372`	`api.Logger.Error(ctx, "send custom notification: validation failed", slog.Error(err))`
`373`	`373`	`httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{`