[jwt] minor fixes

Author: capcom6

internal/sms-gateway/jwt/errors.go

@@ -6,6 +6,7 @@ var (
 	ErrDisabled                = errors.New("jwt disabled")
 	ErrInitFailed              = errors.New("failed to initialize jwt")
 	ErrInvalidConfig           = errors.New("invalid config")
+	ErrInvalidToken            = errors.New("invalid token")
 	ErrTokenRevoked            = errors.New("token revoked")
 	ErrUnexpectedSigningMethod = errors.New("unexpected signing method")
 )

internal/sms-gateway/jwt/module.go

@@ -13,8 +13,8 @@ func Module() fx.Option {
 		fx.Provide(func(factory cache.Factory) (cache.Cache, error) {
 			return factory.New("jwt")
 		}, fx.Private),
-		fx.Provide(newRevokedStorage, fx.Private),
-		fx.Provide(func(config Config, revoked *revokedStorage) (Service, error) {
+		fx.Provide(NewRevokedStorage, fx.Private),
+		fx.Provide(func(config Config, revoked *RevokedStorage) (Service, error) {
 			if config.Secret == "" {
 				return newDisabled(), nil
 			}

internal/sms-gateway/jwt/revoked.go

@@ -9,17 +9,17 @@ import (
 	"github.com/android-sms-gateway/server/pkg/cache"
 )
 
-type revokedStorage struct {
+type RevokedStorage struct {
 	storage cache.Cache
 }
 
-func newRevokedStorage(storage cache.Cache) *revokedStorage {
-	return &revokedStorage{
+func NewRevokedStorage(storage cache.Cache) *RevokedStorage {
+	return &RevokedStorage{
 		storage: storage,
 	}
 }
 
-func (r *revokedStorage) IsRevoked(ctx context.Context, token string) (bool, error) {
+func (r *RevokedStorage) IsRevoked(ctx context.Context, token string) (bool, error) {
 	_, err := r.storage.Get(ctx, token)
 	if errors.Is(err, cache.ErrKeyNotFound) {
 		return false, nil
@@ -31,6 +31,6 @@ func (r *revokedStorage) IsRevoked(ctx context.Context, token string) (bool, err
 	return true, nil
 }
 
-func (r *revokedStorage) Revoke(ctx context.Context, token string, ttl time.Duration) error {
+func (r *RevokedStorage) Revoke(ctx context.Context, token string, ttl time.Duration) error {
 	return r.storage.Set(ctx, token, nil, cache.WithTTL(ttl))
 }

internal/sms-gateway/jwt/service.go

@@ -20,12 +20,12 @@ type Service interface {
 type service struct {
 	config Config
 
-	revoked *revokedStorage
+	revoked *RevokedStorage
 
 	idFactory func() string
 }
 
-func New(config Config, revoked *revokedStorage) (Service, error) {
+func New(config Config, revoked *RevokedStorage) (Service, error) {
 	if err := config.Validate(); err != nil {
 		return nil, err
 	}
@@ -49,6 +49,14 @@ func New(config Config, revoked *revokedStorage) (Service, error) {
 }
 
 func (s *service) GenerateToken(userID string, scopes []string, ttl time.Duration) (string, error) {
+	if userID == "" {
+		return "", fmt.Errorf("%w: user id is required", ErrInvalidConfig)
+	}
+
+	if len(scopes) == 0 {
+		return "", fmt.Errorf("%w: scopes are required", ErrInvalidConfig)
+	}
+
 	if ttl < 0 {
 		return "", fmt.Errorf("%w: ttl must be non-negative", ErrInvalidConfig)
 	}
@@ -97,7 +105,7 @@ func (s *service) ParseToken(ctx context.Context, token string) (*Claims, error)
 
 	claims, ok := parsedToken.Claims.(*Claims)
 	if !ok || !parsedToken.Valid {
-		return nil, fmt.Errorf("invalid token")
+		return nil, ErrInvalidToken
 	}
 
 	revoked, err := s.revoked.IsRevoked(ctx, claims.ID)