Skip to content

Commit 3519973

Browse files
modify api authentication failed message
Signed-off-by: leon <leondevlifelog@gmail.com>
1 parent ec0c682 commit 3519973

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

models/auth/access_token.go

+17
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,23 @@ func (err ErrAccessTokenNotExist) Unwrap() error {
3838
return util.ErrNotExist
3939
}
4040

41+
// ErrBadAccessToken represents a "BadAccessToken" kind of error.
42+
type ErrBadAccessToken struct{}
43+
44+
// IsErrBadAccessToken checks if an error is a ErrBadAccessToken.
45+
func IsErrBadAccessToken(err error) bool {
46+
_, ok := err.(ErrBadAccessToken)
47+
return ok
48+
}
49+
50+
func (err ErrBadAccessToken) Error() string {
51+
return "Bad credentials or token"
52+
}
53+
54+
func (err ErrBadAccessToken) Unwrap() error {
55+
return util.ErrPermissionDenied
56+
}
57+
4158
// ErrAccessTokenEmpty represents a "AccessTokenEmpty" kind of error.
4259
type ErrAccessTokenEmpty struct{}
4360

routers/common/auth.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
package common
55

66
import (
7+
auth_model "code.gitea.io/gitea/models/auth"
78
user_model "code.gitea.io/gitea/models/user"
89
"code.gitea.io/gitea/modules/context"
10+
"code.gitea.io/gitea/modules/log"
911
"code.gitea.io/gitea/modules/web/middleware"
1012
auth_service "code.gitea.io/gitea/services/auth"
1113
)
@@ -18,7 +20,8 @@ type AuthResult struct {
1820
func AuthShared(ctx *context.Base, sessionStore auth_service.SessionStore, authMethod auth_service.Method) (ar AuthResult, err error) {
1921
ar.Doer, err = authMethod.Verify(ctx.Req, ctx.Resp, ctx, sessionStore)
2022
if err != nil {
21-
return ar, err
23+
log.Warn("authentication failed", err)
24+
return ar, auth_model.ErrBadAccessToken{}
2225
}
2326
if ar.Doer != nil {
2427
if ctx.Locale.Language() != ar.Doer.Language {

0 commit comments

Comments
 (0)