Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

Fix the error handler of getting perm for stream API #252

Merged
merged 2 commits into from
Nov 23, 2021
Merged

Fix the error handler of getting perm for stream API #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1dc501
Fix handling error of getting perm
Nov 23, 2021
1ed27b0
Fix error handling
Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions internal/server/api/v1/stream/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/gitploy-io/gitploy/ent"
"github.com/gitploy-io/gitploy/ent/event"
gb "github.com/gitploy-io/gitploy/internal/server/global"
"github.com/gitploy-io/gitploy/pkg/e"
)

// GetEvents streams events of deployment, or review.
Expand All @@ -42,12 +43,12 @@ func (s *Stream) GetEvents(c *gin.Context) {
return
}

if ok, err := s.hasPermForEvent(ctx, u, e); !ok {
s.log.Debug("Skip the event. The user has not the perm.")
return
} else if err != nil {
if ok, err := s.hasPermForEvent(ctx, u, e); err != nil {
s.log.Error("It has failed to check the perm.", zap.Error(err))
return
} else if !ok {
s.log.Debug("Skip the event. The user has not the perm.")
return
}

events <- e
Expand Down Expand Up @@ -93,14 +94,14 @@ L:
}

// hasPermForEvent checks the user has permission for the event.
func (s *Stream) hasPermForEvent(ctx context.Context, u *ent.User, e *ent.Event) (bool, error) {
if e.Kind == event.KindDeployment {
d, err := s.i.FindDeploymentByID(ctx, e.DeploymentID)
func (s *Stream) hasPermForEvent(ctx context.Context, u *ent.User, evt *ent.Event) (bool, error) {
if evt.Kind == event.KindDeployment {
d, err := s.i.FindDeploymentByID(ctx, evt.DeploymentID)
if err != nil {
return false, err
}

if _, err = s.i.FindPermOfRepo(ctx, d.Edges.Repo, u); ent.IsNotFound(err) {
if _, err = s.i.FindPermOfRepo(ctx, d.Edges.Repo, u); e.HasErrorCode(err, e.ErrorCodeEntityNotFound) {
return false, nil
} else if err != nil {
return false, err
Expand All @@ -109,8 +110,8 @@ func (s *Stream) hasPermForEvent(ctx context.Context, u *ent.User, e *ent.Event)
return true, nil
}

if e.Kind == event.KindReview {
rv, err := s.i.FindReviewByID(ctx, e.ReviewID)
if evt.Kind == event.KindReview {
rv, err := s.i.FindReviewByID(ctx, evt.ReviewID)
if err != nil {
return false, err
}
Expand All @@ -120,7 +121,7 @@ func (s *Stream) hasPermForEvent(ctx context.Context, u *ent.User, e *ent.Event)
return false, err
}

if _, err = s.i.FindPermOfRepo(ctx, d.Edges.Repo, u); ent.IsNotFound(err) {
if _, err = s.i.FindPermOfRepo(ctx, d.Edges.Repo, u); e.HasErrorCode(err, e.ErrorCodeEntityNotFound) {
return false, nil
} else if err != nil {
return false, err
Expand Down