feat: release v1.0.0

internal/middleware/auth.go

@@ -3,8 +3,10 @@ package middleware
 import (
 	"context"
 	"net/http"
-	db "server/internal/db/sqlc"
+	"server/internal/db"
+	"server/internal/db/sqlc"
 	"server/internal/pkg/cache"
+	"server/internal/pkg/cache/cachekey"
 	"server/internal/pkg/errs"
 	"server/internal/pkg/httputil"
 	"strings"
@@ -17,20 +19,21 @@ const (
 )
 
 type AuthMiddleware struct {
-	queries *db.Queries
-	cache   *cache.Caches
+	store *db.Store
+	cache *cache.Caches
 }
 
-func NewAuthMiddleware(queries *db.Queries, cache *cache.Caches) *AuthMiddleware {
+func NewAuthMiddleware(store *db.Store, cache *cache.Caches) *AuthMiddleware {
 	return &AuthMiddleware{
-		cache:   cache,
-		queries: queries,
+		cache: cache,
+		store: store,
 	}
 }
 
 func (m *AuthMiddleware) Middleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
+		var err error
 
 		claims, ok := GetClaims(ctx)
 		if !ok || claims.UserID == 0 {
@@ -47,7 +50,8 @@ func (m *AuthMiddleware) Middleware(next http.Handler) http.Handler {
 			return
 		}
 
-		hasPermission, err := userHasApiPermission(ctx, r, m.queries, claims.UserID, m.cache)
+		// 不是管理员 判断api权限
+		hasPermission, err := userHasApiPermission(ctx, r, m.store, claims.UserID, m.cache)
 		if err != nil {
 			httputil.Fail(w, err)
 			return
@@ -70,21 +74,20 @@ func userIsAdmin(uid int32) bool {
 	return false
 }
 
-func userHasApiPermission(ctx context.Context, r *http.Request, queries *db.Queries, uid int32, cache *cache.Caches) (bool, error) {
+func userHasApiPermission(ctx context.Context, r *http.Request, store *db.Store, uid int32, c *cache.Caches) (bool, error) {
 	var (
-		apis []db.GetSysUserApisRow
+		apis []sqlc.GetSysUserApisRow
 		err  error
 	)
 
-	apis, ok := cache.SysUserApisCache.GetIfPresent(uid)
+	// 先从缓存中获取api数据
+	k := cachekey.UserApiPermissions(uid)
+	apis, err = cache.GetOrSetJSON[[]sqlc.GetSysUserApisRow](ctx, c, k, 0, func() ([]sqlc.GetSysUserApisRow, error) {
+		return store.GetSysUserApis(ctx, uid)
+	})
 
-	if !ok {
-		apis, err = queries.GetSysUserApis(ctx, uid)
-
-		if err != nil {
-			return false, err
-		}
-		cache.SysUserApisCache.Set(uid, apis)
+	if err != nil {
+		return false, err
 	}
 
 	requestPath := chi.RouteContext(r.Context()).RoutePattern()

internal/middleware/jwt.go

@@ -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[:])
 }