A continuation of HomeBox the inventory and organization system built for the Home User
cleanup user token access
Hayden682774c9ceaf
diff --git a/backend/app/api/middleware.go b/backend/app/api/middleware.goindex d10ab21e..f2121d45 100644--- a/backend/app/api/middleware.go+++ b/backend/app/api/middleware.go@@ -10,7 +10,6 @@ import ("github.com/go-chi/chi/v5/middleware""github.com/hay-kot/content/backend/internal/config""github.com/hay-kot/content/backend/internal/services"- "github.com/hay-kot/content/backend/pkgs/hasher""github.com/hay-kot/content/backend/pkgs/logger""github.com/hay-kot/content/backend/pkgs/server")@@ -49,17 +48,11 @@ func (a *app) mwAuthToken(next http.Handler) http.Handler {}requestToken = strings.TrimPrefix(requestToken, "Bearer ")-- hash := hasher.HashToken(requestToken)+ usr, err := a.services.User.GetSelf(r.Context(), requestToken)// Check the database for the token- usr, err := a.repos.AuthTokens.GetUserFromToken(r.Context(), hash)if err != nil {- a.logger.Error(err, logger.Props{- "token": requestToken,- "hash": fmt.Sprintf("%x", hash),- })server.RespondUnauthorized(w)return}diff --git a/backend/internal/services/contexts.go b/backend/internal/services/contexts.goindex 6411f5c0..bc18fcce 100644--- a/backend/internal/services/contexts.go+++ b/backend/internal/services/contexts.go@@ -3,7 +3,7 @@ package servicesimport ("context"- "github.com/hay-kot/content/backend/ent"+ "github.com/hay-kot/content/backend/internal/types")type contextKeys struct {@@ -17,16 +17,16 @@ var (// SetUserCtx is a helper function that sets the ContextUser and ContextUserToken// values within the context of a web request (or any context).-func SetUserCtx(ctx context.Context, user *ent.User, token string) context.Context {+func SetUserCtx(ctx context.Context, user *types.UserOut, token string) context.Context {ctx = context.WithValue(ctx, ContextUser, user)ctx = context.WithValue(ctx, ContextUserToken, token)return ctx}// UseUserCtx is a helper function that returns the user from the context.-func UseUserCtx(ctx context.Context) *ent.User {+func UseUserCtx(ctx context.Context) *types.UserOut {if val := ctx.Value(ContextUser); val != nil {- return val.(*ent.User)+ return val.(*types.UserOut)}return nil}diff --git a/backend/internal/services/contexts_test.go b/backend/internal/services/contexts_test.goindex 251baade..cf5a8625 100644--- a/backend/internal/services/contexts_test.go+++ b/backend/internal/services/contexts_test.go@@ -5,12 +5,12 @@ import ("testing""github.com/google/uuid"- "github.com/hay-kot/content/backend/ent"+ "github.com/hay-kot/content/backend/internal/types""github.com/stretchr/testify/assert")func Test_SetAuthContext(t *testing.T) {- user := &ent.User{+ user := &types.UserOut{ID: uuid.New(),}diff --git a/backend/internal/services/service_user.go b/backend/internal/services/service_user.goindex c2817dad..137ad7c1 100644--- a/backend/internal/services/service_user.go+++ b/backend/internal/services/service_user.go@@ -23,7 +23,7 @@ type UserService struct {repos *repo.AllRepos}-func (UserService) toOutUser(user *ent.User, err error) (*types.UserOut, error) {+func ToOutUser(user *ent.User, err error) (*types.UserOut, error) {if err != nil {return &types.UserOut{}, err}@@ -37,6 +37,10 @@ func (UserService) toOutUser(user *ent.User, err error) (*types.UserOut, error)}, nil}+func (UserService) toOutUser(user *ent.User, err error) (*types.UserOut, error) {+ return ToOutUser(user, err)+}+func (svc *UserService) RegisterUser(ctx context.Context, data types.UserRegistration) (*types.UserOut, error) {group, err := svc.repos.Groups.Create(ctx, data.GroupName)if err != nil {diff --git a/backend/internal/types/users_types.go b/backend/internal/types/users_types.goindex fef3ea4f..2f4053bc 100644--- a/backend/internal/types/users_types.go+++ b/backend/internal/types/users_types.go@@ -54,7 +54,7 @@ type UserOut struct {ID uuid.UUID `json:"id"`Name string `json:"name"`Email string `json:"email"`- IsSuperuser bool `json:"isSuper"`+ IsSuperuser bool `json:"isSuperuser"`GroupID uuid.UUID `json:"groupId"`GroupName string `json:"groupName"`}