CSEC_PUBLIC/catalyst
1
0
Fork 0
mirror of https://github.com/SecurityBrewery/catalyst.git synced 2025-12-16 20:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Map userdata (#470)

Browse Source 
* Map userdata
Co-authored-by: Jonas Plum <git@jonasplum.de>
This commit is contained in:
Jonas Plum
2022-10-02 05:41:48 +02:00
committed by GitHub
parent 94ebcade12
commit 9915a10ca2
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
service/settings.go
View File

@@ -2,7 +2,6 @@ package service
import (
"context"
"errors"
maut "github.com/jonas-plum/maut/auth"
@@ -29,23 +28,15 @@ func (s *Service) SaveSettings(ctx context.Context, settings *model.Settings) (*
func (s *Service) settings(ctx context.Context, globalSettings *model.Settings) (*model.SettingsResponse, error) {
user, permissions, ok := maut.UserFromContext(ctx)
if !ok {
return nil, errors.New("no user in context")
if ok {
userData, _ := s.database.UserDataGet(ctx, user.ID)
if userData != nil && userData.Timeformat != nil {
globalSettings.Timeformat = *userData.Timeformat
}
}
userData, err := s.database.UserDataGet(ctx, user.ID)
if err != nil {
return nil, err
}
ticketTypeList, err := s.database.TicketTypeList(ctx)
if err != nil {
return nil, err
}
if userData.Timeformat != nil {
globalSettings.Timeformat = *userData.Timeformat
}
ticketTypeList, _ := s.database.TicketTypeList(ctx)
return &model.SettingsResponse{
Tier: model.SettingsResponseTierCommunity,