mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-15 08:41:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

groupware: remove unneeded messages.go that was a remainder from an earlier implementation attempt, which also fixes compilation issues due to changes in main

Browse Source
This commit is contained in:
Pascal Bleser
2025-07-01 10:29:35 +02:00
parent 2412e64cc5
commit 8df4ef67a2
2 changed files with 3 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/graph/pkg/service/v0/groupware/groupware.go
View File

@@ -215,7 +215,9 @@ func (g Groupware) GetMessages(w http.ResponseWriter, r *http.Request) {
}
inboxId := pickInbox(mailboxGetResponse.List)
// TODO handle not found
if inboxId == "" {
return nil, fmt.Errorf("failed to find an inbox folder")
}
logger = log.Logger{Logger: logger.With().Str(logFolderId, inboxId).Logger()}
emails, err := g.jmapClient.GetEmails(session, ctx, &logger, inboxId, offset, limit, true, g.maxBodyValueBytes)

83
services/graph/pkg/service/v0/messages.go
View File

@@ -1,83 +0,0 @@
package svc
import (
"net/http"
"slices"
"strings"
"github.com/CiscoM31/godata"
"github.com/go-chi/render"
"github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode"
"github.com/opencloud-eu/opencloud/services/graph/pkg/identity"
revactx "github.com/opencloud-eu/reva/v2/pkg/ctx"
libregraph "github.com/opencloud-eu/libre-graph-api-go"
)
// GetMessages implements the Service interface.
func (g Graph) GetMessages(w http.ResponseWriter, r *http.Request) {
logger := g.logger.SubloggerWithRequestID(r.Context())
logger.Debug().Msg("calling get messages in /me")
sanitizedPath := strings.TrimPrefix(r.URL.Path, "/graph/v1.0/")
odataReq, err := godata.ParseRequest(r.Context(), sanitizedPath, r.URL.Query())
if err != nil {
logger.Debug().Err(err).Interface("query", r.URL.Query()).Msg("could not get messages: query error")
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error())
return
}
u, ok := revactx.ContextGetUser(r.Context())
if !ok {
logger.Debug().Msg("could not get messages: user not in context")
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "user not in context")
return
}
exp, err := identity.GetExpandValues(odataReq.Query)
if err != nil {
logger.Debug().Err(err).Interface("query", r.URL.Query()).Msg("could not get messages: $expand error")
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, err.Error())
return
}
var me *libregraph.User
// We can just return the user from context unless we need to expand the group memberships
if !slices.Contains(exp, "memberOf") {
me = identity.CreateUserModelFromCS3(u)
} else {
var err error
logger.Debug().Msg("calling get user on backend")
me, err = g.identityBackend.GetUser(r.Context(), u.GetId().GetOpaqueId(), odataReq)
if err != nil {
logger.Debug().Err(err).Interface("user", u).Msg("could not get user from backend")
errorcode.RenderError(w, r, err)
return
}
if me.MemberOf == nil {
me.MemberOf = []libregraph.Group{}
}
}
// expand appRoleAssignments if requested
if slices.Contains(exp, appRoleAssignments) {
var err error
me.AppRoleAssignments, err = g.fetchAppRoleAssignments(r.Context(), me.GetId())
if err != nil {
logger.Debug().Err(err).Str("userid", me.GetId()).Msg("could not get appRoleAssignments for self")
errorcode.RenderError(w, r, err)
return
}
}
preferedLanguage, _, err := getUserLanguage(r.Context(), g.valueService, me.GetId())
if err != nil {
logger.Error().Err(err).Msg("could not get user language")
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not get user language")
return
}
me.PreferredLanguage = &preferedLanguage
render.Status(r, http.StatusOK)
render.JSON(w, r, me)
}