Added username claim

go.mod

@@ -1,4 +1,4 @@
-module github.com/mysteriumnetwork/token
+module github.com/mysteriumnetwork/token/v2
 
 go 1.18
 

issuer.go

@@ -34,7 +34,7 @@ const (
 )
 
 // Issue will issue a new JWT token setting given parameters inside the claims.
-func (j *IssuerJWT) Issue(sub string, aud []string, issuertype string, ttl time.Duration, attr string) (string, error) {
+func (j *IssuerJWT) Issue(sub string, aud []string, issuertype string, ttl time.Duration, attr string, username string) (string, error) {
 	if sub == "" || len(aud) < 1 || issuertype == "" {
 		return "", errors.New("'sub', 'aud', 'issuertype' claims must be set")
 	}
@@ -55,6 +55,7 @@ func (j *IssuerJWT) Issue(sub string, aud []string, issuertype string, ttl time.
 		"sub":                 sub,
 		"attr":                attr,
 		"jti":                 id.String(),
+		"username":            username,
 		CustomClaimIssuerType: issuertype,
 	}
 

jwt.go

@@ -25,4 +25,5 @@ type ClaimData struct {
 	ExpiresAt  float64
 	Attributes string
 	ID         string
+	Username   string
 }

jwt_test.go

@@ -47,7 +47,7 @@ func Test_JWT(t *testing.T) {
 		aud := []string{"pool1"}
 		typ := "password"
 		sub := uuid.New().String()
-		token, err := jwt.Issue(sub, aud, typ, time.Hour, "")
+		token, err := jwt.Issue(sub, aud, typ, time.Hour, "", "username1")
 		assert.NoError(t, err)
 
 		err = jwt.Validate(token)
@@ -58,7 +58,7 @@ func Test_JWT(t *testing.T) {
 		aud := []string{"pool1", "pool2"}
 		typ := "password"
 		sub := uuid.New().String()
-		token, err := jwt.Issue(sub, aud, typ, time.Hour, "")
+		token, err := jwt.Issue(sub, aud, typ, time.Hour, "", "username1")
 		assert.NoError(t, err)
 
 		err = jwt.ValidateForAudience(token, "pool1")
@@ -73,7 +73,7 @@ func Test_JWT(t *testing.T) {
 		aud := []string{"pool1"}
 		typ := "password"
 		sub := uuid.New().String()
-		token, err := jwt.Issue(sub, aud, typ, time.Hour, "")
+		token, err := jwt.Issue(sub, aud, typ, time.Hour, "", "username1")
 		assert.NoError(t, err)
 
 		d, err := jwt.ValidateExtract(token)
@@ -82,6 +82,7 @@ func Test_JWT(t *testing.T) {
 		assert.Equal(t, sub, d.Subject)
 		assert.Equal(t, IssuerName, d.Issuer)
 		assert.Equal(t, typ, d.IssuerType)
+		assert.Equal(t, "username1", d.Username)
 		_, err = jwt.ValidateForAudienceExtract(token, "pool2")
 		assert.Error(t, err)
 		d, err = jwt.ValidateForAudienceExtract(token, aud[0])
@@ -100,7 +101,7 @@ func Test_JWT(t *testing.T) {
 		aud := []string{"pool1"}
 		typ := "password"
 		sub := uuid.New().String()
-		token, err := jwt.Issue(sub, aud, typ, time.Millisecond, "")
+		token, err := jwt.Issue(sub, aud, typ, time.Millisecond, "", "username1")
 		assert.NoError(t, err)
 
 		time.Sleep(10 * time.Millisecond)

validator.go

@@ -108,6 +108,7 @@ func (j *ValidatorJWT) validate(token string, aud *string) (*ClaimData, error) {
 	exp, _ := claims["exp"].(float64)
 	iat, _ := claims["iat"].(float64)
 	jti, _ := claims["jti"].(string)
+	username, _ := claims["username"].(string)
 	isst, _ := claims[CustomClaimIssuerType].(string)
 
 	return &ClaimData{
@@ -119,6 +120,7 @@ func (j *ValidatorJWT) validate(token string, aud *string) (*ClaimData, error) {
 		Attributes: attr,
 		ID:         jti,
 		IssuedAt:   iat,
+		Username:   username,
 	}, nil
 }