feat: release v1.0.0
This commit is contained in:
@@ -2,7 +2,9 @@ package middleware
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"net/http"
|
||||
"server/internal/config"
|
||||
"server/internal/pkg/errs"
|
||||
@@ -71,46 +73,6 @@ func (m *JWTMiddleware) ParseToken(tokenStr string) (*Claims, error) {
|
||||
return claims, nil
|
||||
}
|
||||
|
||||
// ParseRefreshToken 解析RefreshToken
|
||||
func (m *JWTMiddleware) ParseRefreshToken(tokenStr string) (*RefreshClaims, error) {
|
||||
token, err := jwt.ParseWithClaims(
|
||||
tokenStr,
|
||||
&RefreshClaims{},
|
||||
func(token *jwt.Token) (interface{}, error) {
|
||||
return []byte(m.cfg.Secret), nil
|
||||
},
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
// Token 已过期
|
||||
if errors.Is(err, jwt.ErrTokenExpired) {
|
||||
return nil, errs.ErrExpiredRefreshToken
|
||||
}
|
||||
|
||||
// 签名错误、格式错误、非法 Token
|
||||
return nil, errs.ErrInvalidRefreshToken
|
||||
}
|
||||
|
||||
if !token.Valid {
|
||||
return nil, errs.ErrInvalidRefreshToken
|
||||
}
|
||||
|
||||
claims, ok := token.Claims.(*RefreshClaims)
|
||||
if !ok {
|
||||
return nil, errs.ErrInvalidRefreshToken
|
||||
}
|
||||
|
||||
if claims.UserID == 0 {
|
||||
return nil, errs.ErrInvalidRefreshToken
|
||||
}
|
||||
|
||||
if claims.Type != RefreshTokenType {
|
||||
return nil, errs.ErrInvalidRefreshToken
|
||||
}
|
||||
|
||||
return claims, nil
|
||||
}
|
||||
|
||||
func (m *JWTMiddleware) Middleware(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
auth := r.Header.Get("Authorization")
|
||||
@@ -161,24 +123,19 @@ func (m *JWTMiddleware) GenerateAccessToken(userID int32) (string, time.Time, er
|
||||
return token, expiresAt, nil
|
||||
}
|
||||
|
||||
func (m *JWTMiddleware) GenerateRefreshToken(userID int32) (string, time.Time, error) {
|
||||
now := time.Now()
|
||||
expiresAt := now.Add(m.cfg.RefreshExpire)
|
||||
func (m *JWTMiddleware) GenerateRefreshToken() (string, error) {
|
||||
b := make([]byte, 32)
|
||||
|
||||
refreshClaims := RefreshClaims{
|
||||
UserID: userID,
|
||||
Type: RefreshTokenType,
|
||||
RegisteredClaims: jwt.RegisteredClaims{
|
||||
ExpiresAt: jwt.NewNumericDate(expiresAt),
|
||||
IssuedAt: jwt.NewNumericDate(now),
|
||||
},
|
||||
}
|
||||
|
||||
refreshToken := jwt.NewWithClaims(jwt.SigningMethodHS256, refreshClaims)
|
||||
token, err := refreshToken.SignedString([]byte(m.cfg.Secret))
|
||||
_, err := rand.Read(b)
|
||||
if err != nil {
|
||||
return "", time.Time{}, err
|
||||
return "", err
|
||||
}
|
||||
|
||||
return token, expiresAt, nil
|
||||
return hex.EncodeToString(b), nil
|
||||
}
|
||||
|
||||
// HashRefreshToken 哈希token 存储至redis
|
||||
func (m *JWTMiddleware) HashRefreshToken(token string) string {
|
||||
hash := sha256.Sum256([]byte(token))
|
||||
return hex.EncodeToString(hash[:])
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user