versia-pub/versia-go
2
0
Fork 0
mirror of https://github.com/versia-pub/versia-go.git synced 2025-12-06 06:28:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: /api/users/:id shouldn't return remote users

Browse source
This commit is contained in:
DevMiner 2024-08-27 02:11:26 +02:00
parent 601ecd1124
commit 7d51385ad9
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/handlers/user_handler/app_user_get.go
View file

@ -14,7 +14,7 @@ func (i *Handler) GetUser(c *fiber.Ctx) error {
}) })
} }
u, err := i.userService.GetUserByID(c.UserContext(), parsedRequestedUserID) u, err := i.userService.GetLocalUserByID(c.UserContext(), parsedRequestedUserID)
if err != nil { if err != nil {
i.log.Error(err, "Failed to query user", "id", parsedRequestedUserID) i.log.Error(err, "Failed to query user", "id", parsedRequestedUserID)

2
internal/handlers/user_handler/lysand_user_get.go
View file

@ -14,7 +14,7 @@ func (i *Handler) GetLysandUser(c *fiber.Ctx) error {
}) })
} }
u, err := i.userService.GetUserByID(c.UserContext(), parsedRequestedUserID) u, err := i.userService.GetLocalUserByID(c.UserContext(), parsedRequestedUserID)
if err != nil { if err != nil {
i.log.Error(err, "Failed to query user", "id", parsedRequestedUserID) i.log.Error(err, "Failed to query user", "id", parsedRequestedUserID)

2
internal/service/service.go
View file

@ -19,7 +19,7 @@ type UserService interface {
NewUser(ctx context.Context, username, password string) (*entity.User, error) NewUser(ctx context.Context, username, password string) (*entity.User, error)
GetUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) GetLocalUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error)
GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error)

2
internal/service/svc_impls/note_service_impl.go
View file

@ -82,7 +82,7 @@ func (i NoteServiceImpl) CreateNote(ctx context.Context, req api_schema.CreateNo
} }
func (i NoteServiceImpl) GetNote(ctx context.Context, id uuid.UUID) (*entity.Note, error) { func (i NoteServiceImpl) GetNote(ctx context.Context, id uuid.UUID) (*entity.Note, error) {
s := i.telemetry.StartSpan(ctx, "function", "svc_impls/NoteServiceImpl.GetUserByID") s := i.telemetry.StartSpan(ctx, "function", "svc_impls/NoteServiceImpl.GetLocalUserByID")
defer s.End() defer s.End()
ctx = s.Context() ctx = s.Context()

6
internal/service/svc_impls/user_service_impl.go
View file

@ -72,12 +72,12 @@ func (i UserServiceImpl) NewUser(ctx context.Context, username, password string)
return user, nil return user, nil
} }
func (i UserServiceImpl) GetUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) { func (i UserServiceImpl) GetLocalUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) {
s := i.telemetry.StartSpan(ctx, "function", "svc_impls/UserServiceImpl.GetUserByID") s := i.telemetry.StartSpan(ctx, "function", "svc_impls/UserServiceImpl.GetLocalUserByID")
defer s.End() defer s.End()
ctx = s.Context() ctx = s.Context()
return i.repositories.Users().GetByID(ctx, id) return i.repositories.Users().GetLocalByID(ctx, id)
} }
func (i UserServiceImpl) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) { func (i UserServiceImpl) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) {