mirror of
https://github.com/SecurityBrewery/catalyst.git
synced 2025-12-06 15:22:47 +01:00
Map userdata (#470)
* Map userdata Co-authored-by: Jonas Plum <git@jonasplum.de>
This commit is contained in:
10
auth.go
10
auth.go
@@ -39,6 +39,16 @@ func (c *catalystResolver) UserCreateIfNotExists(ctx context.Context, user *maut
|
||||
Password: &password,
|
||||
Roles: user.Roles,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = c.database.UserDataCreate(ctx, user.ID, &model.UserData{
|
||||
Email: user.Email,
|
||||
Image: nil,
|
||||
Name: user.Name,
|
||||
Timeformat: nil,
|
||||
})
|
||||
}
|
||||
|
||||
return err
|
||||
|
||||
@@ -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)
|
||||
|
||||
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 {
|
||||
if userData != nil && userData.Timeformat != nil {
|
||||
globalSettings.Timeformat = *userData.Timeformat
|
||||
}
|
||||
}
|
||||
|
||||
ticketTypeList, _ := s.database.TicketTypeList(ctx)
|
||||
|
||||
return &model.SettingsResponse{
|
||||
Tier: model.SettingsResponseTierCommunity,
|
||||
|
||||
Reference in New Issue
Block a user