sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

incorporate requested changes

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-09-22 13:13:30 +02:00
parent 7a8e1b8106
commit e96ab9f9c8
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/notifications/pkg/email/email.go
+5 -11
View File
@@ -16,23 +16,17 @@ var (
func RenderEmailTemplate(templateName string, templateVariables map[string]string, emailTemplatePath string) (string, error) {
var err error
var tpl *template.Template
templateHasBeenFound := false
if emailTemplatePath != "" {
// try to lookup the files in the filesystem
tpl, err = template.ParseFiles(filepath.Join(emailTemplatePath, templateName))
if err == nil {
templateHasBeenFound = true
}
}
if !templateHasBeenFound {
// try to lookup the files in the filesystem
tpl, err = template.ParseFiles(filepath.Join(emailTemplatePath, templateName))
if err != nil {
// template has not been found in the fs, or path has not been specified => use embed templates
tpl, err = template.ParseFS(templatesFS, filepath.Join("templates/", templateName))
if err != nil {
return "", err
}
}
writer := bytes.NewBufferString("")
err = tpl.Execute(writer, templateVariables)
var writer bytes.Buffer
err = tpl.Execute(&writer, templateVariables)
if err != nil {
return "", err
}
services/notifications/pkg/service/service.go
+5 -5
View File
@@ -86,7 +86,7 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
}
granteeUserResponse, err := s.gwClient.GetUser(context.Background(), &userv1beta1.GetUserRequest{
UserId: e.Creator,
UserId: e.GranteeUserID,
})
if err != nil || sharerUserResponse.Status.Code != rpcv1beta1.Code_CODE_OK {
s.logger.Error().
@@ -102,7 +102,7 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
ClientId: "userid:" + e.Executant.OpaqueId,
ClientSecret: s.machineAuthAPIKey,
})
if err != nil || authRes.GetStatus().GetCode() != rpcv1beta1.Code_CODE_OK {
if err != nil {
s.logger.Error().
Err(err).
Str("event", "SpaceCreated").
@@ -137,7 +137,7 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
//FieldMask: &fieldmaskpb.FieldMask{Paths: []string{"space.name"}},
})
if err != nil || md.Status.Code != rpcv1beta1.Code_CODE_OK {
if err != nil {
s.logger.Error().
Err(err).
Str("event", "ShareCreated").
@@ -225,7 +225,7 @@ func (s eventsNotifier) handleShareCreated(e events.ShareCreated) {
ClientId: "userid:" + e.Sharer.OpaqueId,
ClientSecret: s.machineAuthAPIKey,
})
if err != nil || authRes.GetStatus().GetCode() != rpcv1beta1.Code_CODE_OK {
if err != nil {
s.logger.Error().
Err(err).
Str("event", "ShareCreated").
@@ -250,7 +250,7 @@ func (s eventsNotifier) handleShareCreated(e events.ShareCreated) {
FieldMask: &fieldmaskpb.FieldMask{Paths: []string{"name"}},
})
if err != nil || md.Status.Code != rpcv1beta1.Code_CODE_OK {
if err != nil {
s.logger.Error().
Err(err).
Str("event", "ShareCreated").