Persist preferred language for user
Signed-off-by: Christian Richter <crichter@owncloud.com> Co-authored-by: Julian Koberg <jkoberg@owncloud.com> Co-authored-by: Michael Barz <mbarz@owncloud.com>
This commit is contained in:
co-authored by
Julian Koberg
Michael Barz
parent
a3f037a53e
commit
174097214f
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"reflect"
|
||||
@@ -22,10 +23,12 @@ import (
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/render"
|
||||
libregraph "github.com/owncloud/libre-graph-api-go"
|
||||
settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0"
|
||||
settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0"
|
||||
"github.com/owncloud/ocis/v2/services/graph/pkg/identity"
|
||||
"github.com/owncloud/ocis/v2/services/graph/pkg/service/v0/errorcode"
|
||||
settingssvc "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
|
||||
ocissettingssvc "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0"
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
||||
@@ -85,6 +88,16 @@ func (g Graph) GetMe(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
}
|
||||
|
||||
preferedLanguage, _, err := getUserLanguage(r.Context(), g.valueService)
|
||||
if err != nil {
|
||||
logger.Error().Err(err).Msg("could not get user language")
|
||||
render.Status(r, http.StatusInternalServerError)
|
||||
render.JSON(w, r, me)
|
||||
return
|
||||
}
|
||||
|
||||
me.PreferredLanguage = &preferedLanguage
|
||||
|
||||
render.Status(r, http.StatusOK)
|
||||
render.JSON(w, r, me)
|
||||
}
|
||||
@@ -319,10 +332,10 @@ func (g Graph) PostUser(w http.ResponseWriter, r *http.Request) {
|
||||
// to all new users for now, as create Account request does not have any role field
|
||||
if _, err = g.roleService.AssignRoleToUser(r.Context(), &settings.AssignRoleToUserRequest{
|
||||
AccountUuid: *u.Id,
|
||||
RoleId: settingssvc.BundleUUIDRoleUser,
|
||||
RoleId: ocissettingssvc.BundleUUIDRoleUser,
|
||||
}); err != nil {
|
||||
// log as error, admin eventually needs to do something
|
||||
logger.Error().Err(err).Str("id", *u.Id).Str("role", settingssvc.BundleUUIDRoleUser).Msg("could not create user: role assignment failed")
|
||||
logger.Error().Err(err).Str("id", *u.Id).Str("role", ocissettingssvc.BundleUUIDRoleUser).Msg("could not create user: role assignment failed")
|
||||
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "role assignment failed")
|
||||
return
|
||||
}
|
||||
@@ -475,10 +488,37 @@ func (g Graph) GetUser(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
}
|
||||
|
||||
preferedLanguage, _, err := getUserLanguage(r.Context(), g.valueService)
|
||||
if err != nil {
|
||||
logger.Error().Err(err).Msg("could not get user language")
|
||||
render.Status(r, http.StatusInternalServerError)
|
||||
render.JSON(w, r, user)
|
||||
return
|
||||
}
|
||||
|
||||
user.PreferredLanguage = &preferedLanguage
|
||||
|
||||
render.Status(r, http.StatusOK)
|
||||
render.JSON(w, r, user)
|
||||
}
|
||||
|
||||
// getUserLanguage returns the language of the user in the context.
|
||||
func getUserLanguage(ctx context.Context, valueService settingssvc.ValueService) (string, string, error) {
|
||||
gvr, err := valueService.GetValueByUniqueIdentifiers(ctx, &settingssvc.GetValueByUniqueIdentifiersRequest{
|
||||
AccountUuid: revactx.ContextMustGetUser(ctx).GetId().GetOpaqueId(),
|
||||
SettingId: defaults.SettingUUIDProfileLanguage,
|
||||
})
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
||||
langVal := gvr.GetValue().GetValue().GetListValue().GetValues()
|
||||
if len(langVal) > 0 && langVal[0] != nil {
|
||||
return langVal[0].GetStringValue(), gvr.GetValue().GetValue().GetId(), nil
|
||||
}
|
||||
return "", "", errors.New("no language value found")
|
||||
}
|
||||
|
||||
// DeleteUser implements the Service interface.
|
||||
func (g Graph) DeleteUser(w http.ResponseWriter, r *http.Request) {
|
||||
logger := g.logger.SubloggerWithRequestID(r.Context())
|
||||
@@ -599,11 +639,23 @@ func (g Graph) DeleteUser(w http.ResponseWriter, r *http.Request) {
|
||||
render.NoContent(w, r)
|
||||
}
|
||||
|
||||
// PatchMe implements the Service Interface. Updates the specified attributes of the
|
||||
func (g Graph) PatchMe(w http.ResponseWriter, r *http.Request) {
|
||||
logger := g.logger.SubloggerWithRequestID(r.Context())
|
||||
logger.Debug().Msg("calling patch me")
|
||||
userID := revactx.ContextMustGetUser(r.Context()).GetId().GetOpaqueId()
|
||||
if userID == "" {
|
||||
logger.Debug().Msg("could not update user: missing user id")
|
||||
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "missing user id")
|
||||
return
|
||||
}
|
||||
g.patchUser(w, r, userID)
|
||||
}
|
||||
|
||||
// PatchUser implements the Service Interface. Updates the specified attributes of an
|
||||
// ExistingUser
|
||||
func (g Graph) PatchUser(w http.ResponseWriter, r *http.Request) {
|
||||
logger := g.logger.SubloggerWithRequestID(r.Context())
|
||||
logger.Debug().Msg("calling patch user")
|
||||
nameOrID := chi.URLParam(r, "userID")
|
||||
nameOrID, err := url.PathUnescape(nameOrID)
|
||||
if err != nil {
|
||||
@@ -611,6 +663,12 @@ func (g Graph) PatchUser(w http.ResponseWriter, r *http.Request) {
|
||||
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "unescaping user id failed")
|
||||
return
|
||||
}
|
||||
g.patchUser(w, r, nameOrID)
|
||||
}
|
||||
|
||||
func (g Graph) patchUser(w http.ResponseWriter, r *http.Request, nameOrID string) {
|
||||
logger := g.logger.SubloggerWithRequestID(r.Context())
|
||||
logger.Debug().Msg("calling patch user")
|
||||
|
||||
sanitizedPath := strings.TrimPrefix(r.URL.Path, "/graph/v1.0/")
|
||||
|
||||
@@ -657,6 +715,42 @@ func (g Graph) PatchUser(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
}
|
||||
|
||||
preferredLanguage, ok := changes.GetPreferredLanguageOk()
|
||||
if ok {
|
||||
_, vID, err := getUserLanguage(r.Context(), g.valueService)
|
||||
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
|
||||
}
|
||||
_, err = g.valueService.SaveValue(r.Context(), &settings.SaveValueRequest{
|
||||
Value: &settingsmsg.Value{
|
||||
Id: vID,
|
||||
BundleId: defaults.BundleUUIDProfile,
|
||||
SettingId: defaults.SettingUUIDProfileLanguage,
|
||||
AccountUuid: nameOrID,
|
||||
Resource: &settingsmsg.Resource{
|
||||
Type: settingsmsg.Resource_TYPE_USER,
|
||||
},
|
||||
Value: &settingsmsg.Value_ListValue{
|
||||
ListValue: &settingsmsg.ListValue{Values: []*settingsmsg.ListOptionValue{
|
||||
{
|
||||
Option: &settingsmsg.ListOptionValue_StringValue{
|
||||
StringValue: *preferredLanguage,
|
||||
},
|
||||
},
|
||||
}},
|
||||
},
|
||||
},
|
||||
})
|
||||
if err != nil {
|
||||
logger.Error().Err(err).Msg("could not update user: error saving language setting")
|
||||
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "error saving language setting")
|
||||
return
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var features []events.UserFeature
|
||||
if mail, ok := changes.GetMailOk(); ok {
|
||||
if !isValidEmail(*mail) {
|
||||
@@ -715,6 +809,7 @@ func (g Graph) PatchUser(w http.ResponseWriter, r *http.Request) {
|
||||
errorcode.RenderError(w, r, err)
|
||||
return
|
||||
}
|
||||
u.PreferredLanguage = preferredLanguage
|
||||
|
||||
e := events.UserFeatureChanged{
|
||||
UserID: nameOrID,
|
||||
|
||||
Reference in New Issue
Block a user