@@ -53,7 +53,7 @@ func NewEventsNotifier(
|
||||
logger log.Logger,
|
||||
gatewaySelector pool.Selectable[gateway.GatewayAPIClient],
|
||||
valueService settingssvc.ValueService,
|
||||
serviceAccountID, serviceAccountSecret, emailTemplatePath, defaultLanguage, ocisURL, translationPath, emailSender string,
|
||||
serviceAccountID, serviceAccountSecret, emailTemplatePath, defaultLanguage, openCloudURL, translationPath, emailSender string,
|
||||
store store.Store,
|
||||
historyClient ehsvc.EventHistoryService,
|
||||
registeredEvents map[string]events.Unmarshaller) Service {
|
||||
@@ -70,7 +70,7 @@ func NewEventsNotifier(
|
||||
emailTemplatePath: emailTemplatePath,
|
||||
defaultLanguage: defaultLanguage,
|
||||
defaultEmailSender: emailSender,
|
||||
ocisURL: ocisURL,
|
||||
openCloudURL: openCloudURL,
|
||||
translationPath: translationPath,
|
||||
filter: newNotificationFilter(logger, valueService),
|
||||
splitter: newIntervalSplitter(logger, valueService),
|
||||
@@ -90,7 +90,7 @@ type eventsNotifier struct {
|
||||
translationPath string
|
||||
defaultLanguage string
|
||||
defaultEmailSender string
|
||||
ocisURL string
|
||||
openCloudURL string
|
||||
serviceAccountID string
|
||||
serviceAccountSecret string
|
||||
filter *notificationFilter
|
||||
|
||||
@@ -2,6 +2,7 @@ package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
|
||||
"github.com/cs3org/reva/v2/pkg/events"
|
||||
"github.com/cs3org/reva/v2/pkg/utils"
|
||||
@@ -70,7 +71,7 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar
|
||||
}
|
||||
shareFolder = resourceInfo.Name
|
||||
|
||||
shareLink, err = urlJoinPath(s.ocisURL, "files/shares/with-me")
|
||||
shareLink, err = urlJoinPath(s.openCloudURL, "files/shares/with-me")
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
|
||||
@@ -2,6 +2,7 @@ package service
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
|
||||
"github.com/cs3org/reva/v2/pkg/events"
|
||||
"github.com/cs3org/reva/v2/pkg/storagespace"
|
||||
@@ -85,7 +86,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space
|
||||
}
|
||||
spaceName = resourceInfo.GetSpace().GetName()
|
||||
|
||||
shareLink, err = urlJoinPath(s.ocisURL, "f", e.ID.OpaqueId)
|
||||
shareLink, err = urlJoinPath(s.openCloudURL, "f", e.ID.OpaqueId)
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
@@ -170,7 +171,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa
|
||||
}
|
||||
spaceName = resourceInfo.GetSpace().GetName()
|
||||
|
||||
shareLink, err = urlJoinPath(s.ocisURL, "f", e.ID.OpaqueId)
|
||||
shareLink, err = urlJoinPath(s.openCloudURL, "f", e.ID.OpaqueId)
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
|
||||
Reference in New Issue
Block a user