Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 开放ErrUnauthorized错误供外界使用 #23

Merged
merged 1 commit into from
Apr 5, 2024
Merged

fix: 开放ErrUnauthorized错误供外界使用 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ package ginx
import "github.com/ecodeclub/ginx/internal/errs"

var ErrNoResponse = errs.ErrNoResponse
var ErrUnauthorized = errs.ErrUnauthorized
9 changes: 4 additions & 5 deletions wrapper_func.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"log/slog"
"net/http"

"github.com/ecodeclub/ginx/internal/errs"
"github.com/ecodeclub/ginx/session"
"github.com/gin-gonic/gin"
)
Expand All @@ -31,7 +30,7 @@ func W(fn func(ctx *Context) (Result, error)) gin.HandlerFunc {
slog.Debug("不需要响应", slog.Any("err", err))
return
}
if errors.Is(err, errs.ErrUnauthorized) {
if errors.Is(err, ErrUnauthorized) {
slog.Debug("未授权", slog.Any("err", err))
ctx.AbortWithStatus(http.StatusUnauthorized)
return
Expand All @@ -57,7 +56,7 @@ func B[Req any](fn func(ctx *Context, req Req) (Result, error)) gin.HandlerFunc
slog.Debug("不需要响应", slog.Any("err", err))
return
}
if errors.Is(err, errs.ErrUnauthorized) {
if errors.Is(err, ErrUnauthorized) {
slog.Debug("未授权", slog.Any("err", err))
ctx.AbortWithStatus(http.StatusUnauthorized)
return
Expand Down Expand Up @@ -93,7 +92,7 @@ func BS[Req any](fn func(ctx *Context, req Req, sess session.Session) (Result, e
return
}
// 如果里面有权限校验，那么会返回 401 错误（目前来看，主要是登录态校验）
if errors.Is(err, errs.ErrUnauthorized) {
if errors.Is(err, ErrUnauthorized) {
slog.Debug("未授权", slog.Any("err", err))
ctx.AbortWithStatus(http.StatusUnauthorized)
return
Expand Down Expand Up @@ -123,7 +122,7 @@ func S(fn func(ctx *Context, sess session.Session) (Result, error)) gin.HandlerF
return
}
// 如果里面有权限校验，那么会返回 401 错误（目前来看，主要是登录态校验）
if errors.Is(err, errs.ErrUnauthorized) {
if errors.Is(err, ErrUnauthorized) {
slog.Debug("未授权", slog.Any("err", err))
ctx.AbortWithStatus(http.StatusUnauthorized)
return
Expand Down
Loading