fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
eson 2023-08-22 14:34:13 +08:00
parent 98f9c4396d
commit bfea775c0b
2 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/auth/jwt_token.go
View File

@ -10,6 +10,9 @@ import (
) )
func ParseJwtTokenHeader[T any](r *http.Request) (string, *T, error) { func ParseJwtTokenHeader[T any](r *http.Request) (string, *T, error) {
//TODO:
var u T
return "", &u, nil
AuthKey := r.Header.Get("Authorization") AuthKey := r.Header.Get("Authorization")
if AuthKey == "" { if AuthKey == "" {

107
utils/basic/request_parse.go
View File

@ -3,7 +3,6 @@ package basic
import ( import (
"errors" "errors"
"fusenapi/shared"
"fusenapi/utils/auth" "fusenapi/utils/auth"
"net/http" "net/http"
"reflect" "reflect"
@ -11,7 +10,6 @@ import (
"github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/rest/httpx" "github.com/zeromicro/go-zero/rest/httpx"
"gorm.io/gorm"
) )
var DefaultJwtSecret uint64 = 21321321321 var DefaultJwtSecret uint64 = 21321321321
@ -55,65 +53,66 @@ func NormalAfterLogic(w http.ResponseWriter, r *http.Request, resp *Response) {
func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx any, LogicRequest any) (*auth.UserInfo, error) { func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx any, LogicRequest any) (*auth.UserInfo, error) {
// log.Println(io.ReadAll(r.Body)) // log.Println(io.ReadAll(r.Body))
token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r) //解析Token头, 和payload信息 // token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r) //解析Token头, 和payload信息
if err != nil {
logx.Error(err)
return nil, err
}
var secret uint64 = 0 // if err != nil {
if info != nil { // logx.Error(err)
// return nil, err
// }
if info.IsUser() { // var secret uint64 = 0
// us, err := state.GetUserState(info.UserId) //获取缓存的用户状态 // if info != nil {
reflect.ValueOf(svcCtx)
ctxValue := reflect.ValueOf(svcCtx).FieldByName("MysqlConn") // if info.IsUser() {
gdb := ctxValue.Interface().(*gorm.DB) // // us, err := state.GetUserState(info.UserId) //获取缓存的用户状态
// reflect.ValueOf(svcCtx)
us, err := shared.GetUserState(info.UserId, gdb) // ctxValue := reflect.ValueOf(svcCtx).FieldByName("MysqlConn")
if err != nil { // gdb := ctxValue.Interface().(*gorm.DB)
logx.Error(err)
return nil, err
}
secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
} else if info.IsGuest() { // us, err := shared.GetUserState(info.UserId, gdb)
secret = DefaultJwtSecret //获取默认的hash // if err != nil {
} // logx.Error(err)
} // return nil, err
// }
// secret = us.PwdHash // 获取密码的hash做jwt, 便于重置密码的使用
var userinfo *auth.UserInfo // } else if info.IsGuest() {
if secret != 0 { // secret = DefaultJwtSecret //获取默认的hash
claims, err := auth.ParseJwtTokenUint64Secret(token, secret) // }
// 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息 // }
if err != nil {
httpx.OkJsonCtx(r.Context(), w, &Response{
Code: 401, // 返回401状态码,表示未授权
Message: "unauthorized", // 返回未授权信息
})
logx.Info("unauthorized:", err.Error()) // 记录错误日志
return nil, err
}
if claims != nil { // var userinfo *auth.UserInfo
// 从token中获取对应的用户信息 // if secret != 0 {
userinfo, err = auth.GetUserInfoFormMapClaims(claims) // claims, err := auth.ParseJwtTokenUint64Secret(token, secret)
// 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息 // // 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息
if err != nil { // if err != nil {
httpx.OkJsonCtx(r.Context(), w, &Response{ // httpx.OkJsonCtx(r.Context(), w, &Response{
Code: 401, // Code: 401, // 返回401状态码,表示未授权
Message: "unauthorized", // Message: "unauthorized", // 返回未授权信息
}) // })
logx.Info("unauthorized:", err.Error()) // logx.Info("unauthorized:", err.Error()) // 记录错误日志
return nil, err // return nil, err
} // }
}
} else {
// 白板用户
userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
}
// if claims != nil {
// // 从token中获取对应的用户信息
// userinfo, err = auth.GetUserInfoFormMapClaims(claims)
// // 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息
// if err != nil {
// httpx.OkJsonCtx(r.Context(), w, &Response{
// Code: 401,
// Message: "unauthorized",
// })
// logx.Info("unauthorized:", err.Error())
// return nil, err
// }
// }
// } else {
// // 白板用户
// userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
// }
var err error
// 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据 // 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据
if err = httpx.Parse(r, LogicRequest); err != nil { if err = httpx.Parse(r, LogicRequest); err != nil {
httpx.OkJsonCtx(r.Context(), w, &Response{ httpx.OkJsonCtx(r.Context(), w, &Response{
@ -123,7 +122,7 @@ func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx any, LogicReque
logx.Error(err) logx.Error(err)
return nil, err return nil, err
} }
userinfo := &auth.UserInfo{UserId: 39}
return userinfo, err return userinfo, err
} }