#312 - Renamed the struct to be in line with interface , added initia…

…lization in components
singnet · May 21, 2020 · 2e52f98 · 2e52f98
1 parent 512082f
commit 2e52f98
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/snetd/cmd/components.go b/snetd/cmd/components.go
@@ -9,6 +9,7 @@ import (
 	"github.com/singnet/snet-daemon/configuration_service"
 	"github.com/singnet/snet-daemon/metrics"
 	"github.com/singnet/snet-daemon/pricing"
+	"github.com/singnet/snet-daemon/token"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -50,6 +51,7 @@ type Components struct {
 	freeCallUserService        escrow.FreeCallUserService
 	freeCallUserStorage        *escrow.FreeCallUserStorage
 	freeCallLockerStorage      *escrow.PrefixedAtomicStorage
+	tokenService               token.Service
 }
 
 func InitComponents(cmd *cobra.Command) (components *Components) {
@@ -505,3 +507,13 @@ func (components *Components) ConfigurationService() *configuration_service.Conf
 
 	return components.configurationService
 }
+
+func (components *Components) TokenService() token.Service {
+	if components.tokenService != nil {
+		return components.tokenService
+	}
+
+	components.tokenService = token.NewJWTTokenService(*components.OrganizationMetaData())
+
+	return components.tokenService
+}
diff --git a/token/jwttoken.go b/token/jwttoken.go
@@ -3,16 +3,26 @@ package token
 import (
 	"fmt"
 	"github.com/dgrijalva/jwt-go"
+	"github.com/singnet/snet-daemon/blockchain"
 	"github.com/singnet/snet-daemon/config"
 	"strings"
 	"time"
 )
 
-type customJWTokenClaimsImpl struct {
+type customJWTokenServiceImpl struct {
 	getGroupId func() string
 }
 
-func (service customJWTokenClaimsImpl) CreateToken(payLoad PayLoad) (CustomToken, error) {
+//This will be used in components as a service to Create and Validate tokens
+func NewJWTTokenService(data blockchain.OrganizationMetaData) Service {
+	return &customJWTokenServiceImpl{
+		getGroupId: func() string {
+			return data.GetGroupIdString()
+		},
+	}
+}
+
+func (service customJWTokenServiceImpl) CreateToken(payLoad PayLoad) (CustomToken, error) {
 	atClaims := jwt.MapClaims{}
 	atClaims["payload"] = fmt.Sprintf("%v", payLoad)
 	atClaims["orgId"] = config.GetString(config.OrganizationId)
@@ -24,7 +34,7 @@ func (service customJWTokenClaimsImpl) CreateToken(payLoad PayLoad) (CustomToken
 	return jwtToken.SignedString([]byte(config.GetString(config.TokenSecretKey)))
 }
 
-func (service customJWTokenClaimsImpl) VerifyToken(receivedToken CustomToken, payLoad PayLoad) (err error) {
+func (service customJWTokenServiceImpl) VerifyToken(receivedToken CustomToken, payLoad PayLoad) (err error) {
 	tokenString := fmt.Sprintf("%v", receivedToken)
 	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
@@ -44,7 +54,7 @@ func (service customJWTokenClaimsImpl) VerifyToken(receivedToken CustomToken, pa
 	return nil
 }
 
-func (service customJWTokenClaimsImpl) checkJwtTokenClaims(claims jwt.MapClaims, payload PayLoad) (err error) {
+func (service customJWTokenServiceImpl) checkJwtTokenClaims(claims jwt.MapClaims, payload PayLoad) (err error) {
 	if strings.Compare(fmt.Sprintf("%v", claims["payload"]), fmt.Sprintf("%v", payload)) != 0 {
 		return fmt.Errorf("payload %v used to generate the Token doesnt match expected values", claims["payload"])
 	}

diff --git a/token/jwttoken_test.go b/token/jwttoken_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func Test_customJWTokenClaimsImpl_CreateToken(t *testing.T) {
-	tokenImpl := &customJWTokenClaimsImpl{
+	tokenImpl := &customJWTokenServiceImpl{
 		getGroupId: func() string {
 			return "GroupID"
 		},
@@ -28,7 +28,7 @@ func Test_customJWTokenClaimsImpl_CreateToken(t *testing.T) {
 }
 
 func Test_customJWTokenClaimsImpl_checkJwtTokenClaims(t *testing.T) {
-	tokenImpl := &customJWTokenClaimsImpl{
+	tokenImpl := &customJWTokenServiceImpl{
 		getGroupId: func() string {
 			return "GroupID"
 		},
@@ -41,7 +41,7 @@ func Test_customJWTokenClaimsImpl_checkJwtTokenClaims(t *testing.T) {
 	err = tokenImpl.VerifyToken(token, "any struct")
 	assert.Equal(t, "organization ExampleOrganizationId is not associated with this Daemon", err.Error())
 	config.Vip().Set(config.OrganizationId, "ExampleOrganizationId")
-	tokenImpl2 := &customJWTokenClaimsImpl{
+	tokenImpl2 := &customJWTokenServiceImpl{
 		getGroupId: func() string {
 			return "GroupID2"
 		},