fix notifications config (#4574)

changelog/unreleased/fix-notifications.md

@@ -0,0 +1,3 @@
+Bugfix: Fix notifications
+
+https://github.com/cs3org/reva/pull/4574

internal/http/services/owncloud/ocdav/ocdav.go

@@ -120,7 +120,7 @@ type Config struct {
 	FavoriteStorageDrivers map[string]map[string]interface{} `mapstructure:"favorite_storage_drivers"`
 	PublicLinkDownload     *ConfigPublicLinkDownload         `mapstructure:"publiclink_download"`
 	DisabledOpenInAppPaths []string                          `mapstructure:"disabled_open_in_app_paths"`
-	Notifications          map[string]interface{}            `docs:"Settingsg for the Notification Helper" mapstructure:"notifications"`
+	Notifications          map[string]interface{}            `mapstructure:"notifications" docs:"Settings for the Notification Helper"`
 }
 
 func (c *Config) ApplyDefaults() {
@@ -175,7 +175,7 @@ func New(ctx context.Context, m map[string]interface{}) (global.Service, error)
 			httpclient.RoundTripper(tr),
 		),
 		favoritesManager:   fm,
-		notificationHelper: notificationhelper.New("ocdav", log),
+		notificationHelper: notificationhelper.New("ocdav", c.Notifications, log),
 	}
 
 	// initialize handlers and set default cigs

internal/http/services/owncloud/ocs/config/config.go

@@ -45,6 +45,7 @@ type Config struct {
 	AllowedLanguages         []string                          `mapstructure:"allowed_languages"`
 	OCMMountPoint            string                            `mapstructure:"ocm_mount_point"`
 	ListOCMShares            bool                              `mapstructure:"list_ocm_shares"`
+	Notifications            map[string]interface{}            `mapstructure:"notifications"`
 }
 
 // Init sets sane defaults.

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -117,7 +117,7 @@ func (h *Handler) Init(c *config.Config, l *zerolog.Logger) {
 	h.ocmMountPoint = c.OCMMountPoint
 	h.listOCMShares = c.ListOCMShares
 	h.Log = l
-	h.notificationHelper = notificationhelper.New("ocs", l)
+	h.notificationHelper = notificationhelper.New("ocs", c.Notifications, l)
 	h.additionalInfoTemplate, _ = template.New("additionalInfo").Parse(c.AdditionalInfoAttribute)
 	h.resourceInfoCacheTTL = time.Second * time.Duration(c.ResourceInfoCacheTTL)
 

pkg/notification/handler/emailhandler/emailhandler.go

@@ -43,11 +43,11 @@ type EmailHandler struct {
 }
 
 type config struct {
-	SMTPAddress    string `docs:";The hostname and port of the SMTP server."                                 mapstructure:"smtp_server"`
-	SenderLogin    string `docs:";The email to be used to send mails."                                       mapstructure:"sender_login"`
-	SenderPassword string `docs:";The sender's password."                                                    mapstructure:"sender_password"`
-	DisableAuth    bool   `docs:"false;Whether to disable SMTP auth."                                        mapstructure:"disable_auth"`
-	DefaultSender  string `docs:"no-reply@cernbox.cern.ch;Default sender when not specified in the trigger." mapstructure:"default_sender"`
+	SMTPAddress    string `mapstructure:"smtp_server" docs:";The hostname and port of the SMTP server."`
+	SenderLogin    string `mapstructure:"sender_login" docs:";The email to be used to send mails."`
+	SenderPassword string `mapstructure:"sender_password" docs:";The sender's password."`
+	DisableAuth    bool   `mapstructure:"disable_auth" docs:"false;Whether to disable SMTP auth."`
+	DefaultSender  string `mapstructure:"default_sender" docs:"no-reply@cernbox.cern.ch;Default sender when not specified in the trigger."`
 }
 
 func (c *config) ApplyDefaults() {

pkg/notification/notificationhelper/notificationhelper.go

@@ -44,10 +44,10 @@ type NotificationHelper struct {
 
 // Config contains the configuration for the Notification Helper.
 type Config struct {
-	NatsAddress string                 `docs:";The NATS server address."                          mapstructure:"nats_address"`
-	NatsToken   string                 `docs:";The token to authenticate against the NATS server" mapstructure:"nats_token"`
-	NatsStream  string                 `docs:"reva-notifications;The notifications NATS stream."  mapstructure:"nats_stream"`
-	Templates   map[string]interface{} `docs:";Notification templates for the service."           mapstructure:"templates"`
+	NatsAddress string                 `mapstructure:"nats_address" docs:";The NATS server address."`
+	NatsToken   string                 `mapstructure:"nats_token" docs:";The token to authenticate against the NATS server"`
+	NatsStream  string                 `mapstructure:"nats_stream" docs:"reva-notifications;The notifications NATS stream."`
+	Templates   map[string]interface{} `mapstructure:"templates" docs:";Notification templates for the service."`
 }
 
 func defaultConfig() *Config {
@@ -57,7 +57,7 @@ func defaultConfig() *Config {
 }
 
 // New creates a new Notification Helper.
-func New(name string, log *zerolog.Logger) *NotificationHelper {
+func New(name string, m map[string]interface{}, log *zerolog.Logger) *NotificationHelper {
 	annotatedLogger := log.With().Str("service", name).Str("scope", "notifications").Logger()
 
 	conf := defaultConfig()
@@ -67,8 +67,18 @@ func New(name string, log *zerolog.Logger) *NotificationHelper {
 		Log:  &annotatedLogger,
 	}
 
+	if len(m) == 0 {
+		log.Info().Msgf("no 'notifications' field in service config, notifications will be disabled")
+		return nh
+	}
+
+	if err := mapstructure.Decode(m, conf); err != nil {
+		log.Error().Err(err).Msgf("decoding config failed, notifications will be disabled")
+		return nh
+	}
+
 	if err := nh.connect(); err != nil {
-		log.Error().Err(err).Msg("connecting to nats failed, notifications will be disabled")
+		log.Error().Err(err).Msgf("connecting to nats failed, notifications will be disabled")
 		return nh
 	}
 
@@ -120,7 +130,7 @@ func (nh *NotificationHelper) Stop() {
 		return
 	}
 	if err := nh.nc.Drain(); err != nil {
-		nh.Log.Error().Err(err).Send()
+		nh.Log.Error().Err(err)
 	}
 }
 

pkg/notification/template/template.go

@@ -37,11 +37,11 @@ const validTemplateNameRegex = "[a-zA-Z0-9-]"
 
 // RegistrationRequest represents a Template registration request.
 type RegistrationRequest struct {
-	Name            string `json:"name"                  mapstructure:"name"`
-	Handler         string `json:"handler"               mapstructure:"handler"`
-	BodyTmplPath    string `json:"body_template_path"    mapstructure:"body_template_path"`
-	SubjectTmplPath string `json:"subject_template_path" mapstructure:"subject_template_path"`
-	Persistent      bool   `json:"persistent"            mapstructure:"persistent"`
+	Name            string `mapstructure:"name" json:"name"`
+	Handler         string `mapstructure:"handler" json:"handler"`
+	BodyTmplPath    string `mapstructure:"body_template_path" json:"body_template_path"`
+	SubjectTmplPath string `mapstructure:"subject_template_path" json:"subject_template_path"`
+	Persistent      bool   `mapstructure:"persistent" json:"persistent"`
 }
 
 // Template represents a notification template.