Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
d9dc5be2
Commit
d9dc5be2
authored
Feb 08, 2026
by
Johnny
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: replace echo.NewHTTPError with status.Errorf
parent
c4176b4e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
12 deletions
+10
-12
memo_relation_service.go
server/router/api/v1/memo_relation_service.go
+4
-4
memo_service.go
server/router/api/v1/memo_service.go
+1
-1
shortcut_service.go
server/router/api/v1/shortcut_service.go
+3
-3
user_service.go
server/router/api/v1/user_service.go
+2
-4
No files found.
server/router/api/v1/memo_relation_service.go
View file @
d9dc5be2
...
...
@@ -100,7 +100,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.List
MemoFilter
:
&
memoFilter
,
})
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to list memo relations: %v"
,
err
)
}
for
_
,
raw
:=
range
tempList
{
relation
,
err
:=
s
.
convertMemoRelationFromStore
(
ctx
,
raw
)
...
...
@@ -114,7 +114,7 @@ func (s *APIV1Service) ListMemoRelations(ctx context.Context, request *v1pb.List
MemoFilter
:
&
memoFilter
,
})
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to list related memo relations: %v"
,
err
)
}
for
_
,
raw
:=
range
tempList
{
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
)
{
memo
,
err
:=
s
.
Store
.
GetMemo
(
ctx
,
&
store
.
FindMemo
{
ID
:
&
memoRelation
.
MemoID
})
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get memo: %v"
,
err
)
}
memoSnippet
,
err
:=
s
.
getMemoContentSnippet
(
memo
.
Content
)
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
})
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
)
if
err
!=
nil
{
...
...
server/router/api/v1/memo_service.go
View file @
d9dc5be2
...
...
@@ -345,7 +345,7 @@ func (s *APIV1Service) UpdateMemo(ctx context.Context, request *v1pb.UpdateMemoR
memo
,
err
:=
s
.
Store
.
GetMemo
(
ctx
,
&
store
.
FindMemo
{
UID
:
&
memoUID
})
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get memo: %v"
,
err
)
}
if
memo
==
nil
{
return
nil
,
status
.
Errorf
(
codes
.
NotFound
,
"memo not found"
)
...
...
server/router/api/v1/shortcut_service.go
View file @
d9dc5be2
...
...
@@ -62,7 +62,7 @@ func (s *APIV1Service) ListShortcuts(ctx context.Context, request *v1pb.ListShor
Key
:
storepb
.
UserSetting_SHORTCUTS
,
})
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get user setting: %v"
,
err
)
}
if
userSetting
==
nil
{
return
&
v1pb
.
ListShortcutsResponse
{
...
...
@@ -186,7 +186,7 @@ func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateS
_
,
err
=
s
.
Store
.
UpsertUserSetting
(
ctx
,
userSetting
)
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to upsert user setting: %v"
,
err
)
}
return
&
v1pb
.
Shortcut
{
...
...
@@ -313,7 +313,7 @@ func (s *APIV1Service) DeleteShortcut(ctx context.Context, request *v1pb.DeleteS
}
_
,
err
=
s
.
Store
.
UpsertUserSetting
(
ctx
,
userSetting
)
if
err
!=
nil
{
return
nil
,
err
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to upsert user setting: %v"
,
err
)
}
return
&
emptypb
.
Empty
{},
nil
...
...
server/router/api/v1/user_service.go
View file @
d9dc5be2
...
...
@@ -5,7 +5,6 @@ import (
"crypto/rand"
"encoding/hex"
"fmt"
"net/http"
"regexp"
"strconv"
"strings"
...
...
@@ -13,7 +12,6 @@ import (
"github.com/google/cel-go/cel"
"github.com/google/cel-go/common/ast"
"github.com/labstack/echo/v4"
"github.com/pkg/errors"
"golang.org/x/crypto/bcrypt"
"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
)
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
{
...
...
@@ -272,7 +270,7 @@ func (s *APIV1Service) UpdateUser(ctx context.Context, request *v1pb.UpdateUserR
case
"password"
:
passwordHash
,
err
:=
bcrypt
.
GenerateFromPassword
([]
byte
(
request
.
User
.
Password
),
bcrypt
.
DefaultCost
)
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
)
update
.
PasswordHash
=
&
passwordHashStr
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment