a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gateway/command: use ErrBadRequest when needed

This commit is contained in:
Simone Gotti 2019-04-08 12:08:31 +02:00
parent 56d903d4db
commit 03b5a53510
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/services/gateway/command/org.go
View File

@ -32,7 +32,7 @@ func (c *CommandHandler) CreateOrg(ctx context.Context, req *CreateOrgRequest) (
return nil, util.NewErrBadRequest(errors.Errorf("organization name required")) return nil, util.NewErrBadRequest(errors.Errorf("organization name required"))
} }
if !util.ValidateName(req.Name) { if !util.ValidateName(req.Name) {
return nil, errors.Errorf("invalid organization name %q", req.Name) return nil, util.NewErrBadRequest(errors.Errorf("invalid organization name %q", req.Name))
} }
org := &types.Organization{ org := &types.Organization{

2
internal/services/gateway/command/project.go
View File

@ -37,7 +37,7 @@ type CreateProjectRequest struct {
func (c *CommandHandler) CreateProject(ctx context.Context, req *CreateProjectRequest) (*types.Project, error) { func (c *CommandHandler) CreateProject(ctx context.Context, req *CreateProjectRequest) (*types.Project, error) {
if !util.ValidateName(req.Name) { if !util.ValidateName(req.Name) {
return nil, errors.Errorf("invalid project name %q", req.Name) return nil, util.NewErrBadRequest(errors.Errorf("invalid project name %q", req.Name))
} }
user, _, err := c.configstoreClient.GetUser(ctx, req.CurrentUserID) user, _, err := c.configstoreClient.GetUser(ctx, req.CurrentUserID)

2
internal/services/gateway/command/projectgroup.go
View File

@ -32,7 +32,7 @@ type CreateProjectGroupRequest struct {
func (c *CommandHandler) CreateProjectGroup(ctx context.Context, req *CreateProjectGroupRequest) (*types.ProjectGroup, error) { func (c *CommandHandler) CreateProjectGroup(ctx context.Context, req *CreateProjectGroupRequest) (*types.ProjectGroup, error) {
if !util.ValidateName(req.Name) { if !util.ValidateName(req.Name) {
return nil, errors.Errorf("invalid projectGroup name %q", req.Name) return nil, util.NewErrBadRequest(errors.Errorf("invalid projectGroup name %q", req.Name))
} }
user, _, err := c.configstoreClient.GetUser(ctx, req.CurrentUserID) user, _, err := c.configstoreClient.GetUser(ctx, req.CurrentUserID)

17
internal/services/gateway/command/user.go
View File

@ -17,6 +17,7 @@ package command
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"net/http"
gitsource "github.com/sorintlab/agola/internal/gitsources" gitsource "github.com/sorintlab/agola/internal/gitsources"
csapi "github.com/sorintlab/agola/internal/services/configstore/api" csapi "github.com/sorintlab/agola/internal/services/configstore/api"
@ -37,7 +38,7 @@ func (c *CommandHandler) CreateUser(ctx context.Context, req *CreateUserRequest)
return nil, util.NewErrBadRequest(errors.Errorf("user name required")) return nil, util.NewErrBadRequest(errors.Errorf("user name required"))
} }
if !util.ValidateName(req.UserName) { if !util.ValidateName(req.UserName) {
return nil, errors.Errorf("invalid user name %q", req.UserName) return nil, util.NewErrBadRequest(errors.Errorf("invalid user name %q", req.UserName))
} }
creq := &csapi.CreateUserRequest{ creq := &csapi.CreateUserRequest{
@ -73,8 +74,11 @@ func (c *CommandHandler) CreateUserToken(ctx context.Context, req *CreateUserTok
} }
userName := req.UserName userName := req.UserName
user, _, err := c.configstoreClient.GetUserByName(ctx, userName) user, resp, err := c.configstoreClient.GetUserByName(ctx, userName)
if err != nil { if err != nil {
if resp != nil && resp.StatusCode == http.StatusNotFound {
return "", util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userID))
}
return "", errors.Wrapf(err, "failed to get user %q", userID) return "", errors.Wrapf(err, "failed to get user %q", userID)
} }
@ -109,8 +113,11 @@ type CreateUserLARequest struct {
func (c *CommandHandler) CreateUserLA(ctx context.Context, req *CreateUserLARequest) (*types.LinkedAccount, error) { func (c *CommandHandler) CreateUserLA(ctx context.Context, req *CreateUserLARequest) (*types.LinkedAccount, error) {
userName := req.UserName userName := req.UserName
user, _, err := c.configstoreClient.GetUserByName(ctx, userName) user, resp, err := c.configstoreClient.GetUserByName(ctx, userName)
if err != nil { if err != nil {
if resp != nil && resp.StatusCode == http.StatusNotFound {
return nil, util.NewErrBadRequest(errors.Errorf("user %q doesn't exist", userName))
}
return nil, errors.Wrapf(err, "failed to get user %q", userName) return nil, errors.Wrapf(err, "failed to get user %q", userName)
} }
rs, _, err := c.configstoreClient.GetRemoteSourceByName(ctx, req.RemoteSourceName) rs, _, err := c.configstoreClient.GetRemoteSourceByName(ctx, req.RemoteSourceName)
@ -127,7 +134,7 @@ func (c *CommandHandler) CreateUserLA(ctx context.Context, req *CreateUserLARequ
} }
c.log.Infof("la: %s", util.Dump(la)) c.log.Infof("la: %s", util.Dump(la))
if la != nil { if la != nil {
return nil, errors.Errorf("user %q already have a linked account for remote source %q", userName, rs.Name) return nil, util.NewErrBadRequest(errors.Errorf("user %q already have a linked account for remote source %q", userName, rs.Name))
} }
accessToken, err := common.GetAccessToken(rs.AuthType, req.RemoteSourceUserAccessToken, req.RemoteSourceOauth2AccessToken) accessToken, err := common.GetAccessToken(rs.AuthType, req.RemoteSourceUserAccessToken, req.RemoteSourceOauth2AccessToken)
@ -179,7 +186,7 @@ func (c *CommandHandler) RegisterUser(ctx context.Context, req *RegisterUserRequ
return nil, util.NewErrBadRequest(errors.Errorf("user name required")) return nil, util.NewErrBadRequest(errors.Errorf("user name required"))
} }
if !util.ValidateName(req.UserName) { if !util.ValidateName(req.UserName) {
return nil, errors.Errorf("invalid user name %q", req.UserName) return nil, util.NewErrBadRequest(errors.Errorf("invalid user name %q", req.UserName))
} }
rs, _, err := c.configstoreClient.GetRemoteSourceByName(ctx, req.RemoteSourceName) rs, _, err := c.configstoreClient.GetRemoteSourceByName(ctx, req.RemoteSourceName)