Removed notification capability, now it is enabled by default

cs3org · Feb 7, 2024 · 38925fa · 38925fa
1 parent ce0bd1e
commit 38925fa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/internal/http/services/owncloud/ocdav/ocdav.go b/internal/http/services/owncloud/ocdav/ocdav.go
@@ -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", c.Notifications, log),
+		notificationHelper: notificationhelper.New("ocdav", log),
 	}
 
 	// initialize handlers and set default cigs

diff --git a/internal/http/services/owncloud/ocs/config/config.go b/internal/http/services/owncloud/ocs/config/config.go
@@ -45,7 +45,6 @@ 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.

diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/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", c.Notifications, l)
+	h.notificationHelper = notificationhelper.New("ocs", l)
 	h.additionalInfoTemplate, _ = template.New("additionalInfo").Parse(c.AdditionalInfoAttribute)
 	h.resourceInfoCacheTTL = time.Second * time.Duration(c.ResourceInfoCacheTTL)
 

diff --git a/pkg/notification/notificationhelper/notificationhelper.go b/pkg/notification/notificationhelper/notificationhelper.go
@@ -57,7 +57,7 @@ func defaultConfig() *Config {
 }
 
 // New creates a new Notification Helper.
-func New(name string, m map[string]interface{}, log *zerolog.Logger) *NotificationHelper {
+func New(name string, log *zerolog.Logger) *NotificationHelper {
 	annotatedLogger := log.With().Str("service", name).Str("scope", "notifications").Logger()
 
 	conf := defaultConfig()
@@ -67,18 +67,8 @@ func New(name string, m map[string]interface{}, log *zerolog.Logger) *Notificati
 		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).Msgf("connecting to nats failed, notifications will be disabled")
+		log.Error().Err(err).Msg("connecting to nats failed, notifications will be disabled")
 		return nh
 	}