cmd call CreateToken instead of Create

streamnative · May 31, 2024 · cd82391 · cd82391
1 parent a7087a8
commit cd82391
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/pkg/cmdutils/token.go b/pkg/cmdutils/token.go
@@ -37,8 +37,8 @@ type Token interface {
 	CreateSecretKey(algorithm.Algorithm) ([]byte, error)
 
 	// Create creates a token object using the specified signature algorithm, private key,
-	// object and the expire time and header
-	Create(algorithm.Algorithm, interface{}, string, int64, map[string]interface{}) (string, error)
+	// object and the expire time
+	Create(algorithm.Algorithm, interface{}, string, int64) (string, error)
 
 	// CreateToken creates a token object using the specified signature algorithm, private key
 	// custom claim and header
@@ -74,7 +74,7 @@ func (t *token) CreateSecretKey(signatureAlgorithm algorithm.Algorithm) ([]byte,
 }
 
 func (t *token) Create(algorithm algorithm.Algorithm, signKey interface{}, subject string,
-	expireTime int64, headers map[string]interface{}) (string, error) {
+	expireTime int64) (string, error) {
 
 	var claims *jwt.MapClaims
 	if expireTime <= 0 {
@@ -88,7 +88,7 @@ func (t *token) Create(algorithm algorithm.Algorithm, signKey interface{}, subje
 		}
 	}
 
-	return t.CreateToken(algorithm, signKey, claims, headers)
+	return t.CreateToken(algorithm, signKey, claims, nil)
 }
 
 func (t *token) CreateToken(

diff --git a/pkg/cmdutils/token_test.go b/pkg/cmdutils/token_test.go
@@ -34,7 +34,7 @@ func TestCreateToken(t *testing.T) {
 	require.NoError(t, err)
 
 	subject := "test-role"
-	myToken, err := tokenProvider.Create(alg, key, subject, 0, nil)
+	myToken, err := tokenProvider.Create(alg, key, subject, 0)
 	require.NoError(t, err)
 
 	parsedSubject, exp, err := tokenProvider.Validate(alg, myToken, key)
@@ -52,7 +52,7 @@ func TestCreateTokenWithExp(t *testing.T) {
 
 	subject := "test-role"
 	exp := time.Now().Add(time.Hour).Unix()
-	myToken, err := tokenProvider.Create(alg, key, subject, exp, nil)
+	myToken, err := tokenProvider.Create(alg, key, subject, exp)
 	require.NoError(t, err)
 
 	parsedSubject, exp, err := tokenProvider.Validate(alg, myToken, key)

diff --git a/pkg/ctl/token/create.go b/pkg/ctl/token/create.go
@@ -27,6 +27,7 @@ import (
 	"github.com/streamnative/pulsarctl/pkg/pulsar/common/algorithm/algorithm"
 	"github.com/streamnative/pulsarctl/pkg/pulsar/common/algorithm/keypair"
 
+	"github.com/golang-jwt/jwt/v4"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -168,8 +169,19 @@ func doCreate(vc *cmdutils.VerbCmd, args *createCmdArgs) error {
 		return err
 	}
 
-	tokenString, err := token.Create(algorithm.Algorithm(args.signatureAlgorithm), signKey, args.subject, expireTime,
-		headers)
+	var claims *jwt.MapClaims
+	if expireTime <= 0 {
+		claims = &jwt.MapClaims{
+			"sub": args.subject,
+		}
+	} else {
+		claims = &jwt.MapClaims{
+			"sub": args.subject,
+			"exp": jwt.NewNumericDate(time.Unix(expireTime, 0)),
+		}
+	}
+
+	tokenString, err := token.CreateToken(algorithm.Algorithm(args.signatureAlgorithm), signKey, claims, headers)
 	if err != nil {
 		return err
 	}