From 9915a10ca2f1da090035bb76ac5b162450217646 Mon Sep 17 00:00:00 2001
From: Jonas Plum <cugu@users.noreply.github.com>
Date: Sun, 2 Oct 2022 05:41:48 +0200
Subject: [PATCH] Map userdata (#470)

* Map userdata
Co-authored-by: Jonas Plum <git@jonasplum.de>
---
 auth.go             | 10 ++++++++++
 service/settings.go | 23 +++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/auth.go b/auth.go
index 99f4b53..344bccb 100644
--- a/auth.go
+++ b/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
diff --git a/service/settings.go b/service/settings.go
index e401525..1223b10 100644
--- a/service/settings.go
+++ b/service/settings.go
@@ -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,