cleanup user token access

This commit is contained in:
Hayden 2022-08-30 18:11:23 -08:00
parent 1107904f47
commit 682774c9ce
5 changed files with 13 additions and 16 deletions

View file

@ -3,7 +3,7 @@ package services
import (
"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
}