fix: replace echo.NewHTTPError with status.Errorf
This commit is contained in:
parent
c4176b4ef1
commit
d9dc5be200
4 changed files with 10 additions and 12 deletions
|
|
@ -100,7 +100,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.List
|
||||||
MemoFilter: &memoFilter,
|
MemoFilter: &memoFilter,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to list memo relations: %v", err)
|
||||||
}
|
}
|
||||||
for _, raw := range tempList {
|
for _, raw := range tempList {
|
||||||
relation, err := s.convertMemoRelationFromStore(ctx, raw)
|
relation, err := s.convertMemoRelationFromStore(ctx, raw)
|
||||||
|
|
@ -114,7 +114,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.List
|
||||||
MemoFilter: &memoFilter,
|
MemoFilter: &memoFilter,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to list related memo relations: %v", err)
|
||||||
}
|
}
|
||||||
for _, raw := range tempList {
|
for _, raw := range tempList {
|
||||||
relation, err := s.convertMemoRelationFromStore(ctx, raw)
|
relation, err := s.convertMemoRelationFromStore(ctx, raw)
|
||||||
|
|
@ -133,7 +133,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.List
|
||||||
func (s *APIV1Service) convertMemoRelationFromStore(ctx context.Context, memoRelation *store.MemoRelation) (*v1pb.MemoRelation, error) {
|
func (s *APIV1Service) convertMemoRelationFromStore(ctx context.Context, memoRelation *store.MemoRelation) (*v1pb.MemoRelation, error) {
|
||||||
memo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelation.MemoID})
|
memo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelation.MemoID})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to get memo: %v", err)
|
||||||
}
|
}
|
||||||
memoSnippet, err := s.getMemoContentSnippet(memo.Content)
|
memoSnippet, err := s.getMemoContentSnippet(memo.Content)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -141,7 +141,7 @@ func (s *APIV1Service) convertMemoRelationFromStore(ctx context.Context, memoRel
|
||||||
}
|
}
|
||||||
relatedMemo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelation.RelatedMemoID})
|
relatedMemo, err := s.Store.GetMemo(ctx, &store.FindMemo{ID: &memoRelation.RelatedMemoID})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to get related memo: %v", err)
|
||||||
}
|
}
|
||||||
relatedMemoSnippet, err := s.getMemoContentSnippet(relatedMemo.Content)
|
relatedMemoSnippet, err := s.getMemoContentSnippet(relatedMemo.Content)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -345,7 +345,7 @@ func (s *APIV1Service) UpdateMemo(ctx context.Context, request *v1pb.UpdateMemoR
|
||||||
|
|
||||||
memo, err := s.Store.GetMemo(ctx, &store.FindMemo{UID: &memoUID})
|
memo, err := s.Store.GetMemo(ctx, &store.FindMemo{UID: &memoUID})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to get memo: %v", err)
|
||||||
}
|
}
|
||||||
if memo == nil {
|
if memo == nil {
|
||||||
return nil, status.Errorf(codes.NotFound, "memo not found")
|
return nil, status.Errorf(codes.NotFound, "memo not found")
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func (s *APIV1Service) ListShortcuts(ctx context.Context, request *v1pb.ListShor
|
||||||
Key: storepb.UserSetting_SHORTCUTS,
|
Key: storepb.UserSetting_SHORTCUTS,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to get user setting: %v", err)
|
||||||
}
|
}
|
||||||
if userSetting == nil {
|
if userSetting == nil {
|
||||||
return &v1pb.ListShortcutsResponse{
|
return &v1pb.ListShortcutsResponse{
|
||||||
|
|
@ -186,7 +186,7 @@ func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateS
|
||||||
|
|
||||||
_, err = s.Store.UpsertUserSetting(ctx, userSetting)
|
_, err = s.Store.UpsertUserSetting(ctx, userSetting)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &v1pb.Shortcut{
|
return &v1pb.Shortcut{
|
||||||
|
|
@ -313,7 +313,7 @@ func (s *APIV1Service) DeleteShortcut(ctx context.Context, request *v1pb.DeleteS
|
||||||
}
|
}
|
||||||
_, err = s.Store.UpsertUserSetting(ctx, userSetting)
|
_, err = s.Store.UpsertUserSetting(ctx, userSetting)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, status.Errorf(codes.Internal, "failed to upsert user setting: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &emptypb.Empty{}, nil
|
return &emptypb.Empty{}, nil
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
@ -13,7 +12,6 @@ import (
|
||||||
|
|
||||||
"github.com/google/cel-go/cel"
|
"github.com/google/cel-go/cel"
|
||||||
"github.com/google/cel-go/common/ast"
|
"github.com/google/cel-go/common/ast"
|
||||||
"github.com/labstack/echo/v4"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
|
|
@ -163,7 +161,7 @@ func (s *APIV1Service) CreateUser(ctx context.Context, request *v1pb.CreateUserR
|
||||||
|
|
||||||
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
|
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, echo.NewHTTPError(http.StatusInternalServerError, "failed to generate password hash").SetInternal(err)
|
return nil, status.Errorf(codes.Internal, "failed to generate password hash: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err := s.Store.CreateUser(ctx, &store.User{
|
user, err := s.Store.CreateUser(ctx, &store.User{
|
||||||
|
|
@ -272,7 +270,7 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserR
|
||||||
case "password":
|
case "password":
|
||||||
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
|
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, echo.NewHTTPError(http.StatusInternalServerError, "failed to generate password hash").SetInternal(err)
|
return nil, status.Errorf(codes.Internal, "failed to generate password hash: %v", err)
|
||||||
}
|
}
|
||||||
passwordHashStr := string(passwordHash)
|
passwordHashStr := string(passwordHash)
|
||||||
update.PasswordHash = &passwordHashStr
|
update.PasswordHash = &passwordHashStr
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue