add client id

config/config.go

@@ -40,6 +40,8 @@ type M2M struct {
 	CredentialPath string `mapstructure:"credentialPath"`
 	// verification method to be provided for the ld-proof
 	VerificationMethod string `mapstructure:"verificationMethod"`
+	// id of the verifier when retrieving tokens
+	ClientId string `mapstructure:"clientId"`
 }
 
 // logging config

tir/authorizationClient.go

@@ -28,6 +28,7 @@ type HttpGetClient interface {
 type AuthorizingHttpClient struct {
 	httpClient    HttpClient
 	tokenProvider TokenProvider
+	clientId      string
 }
 
 type NoAuthHttpClient struct {
@@ -159,6 +160,7 @@ func (ac AuthorizingHttpClient) postVpToken(tokenEndpoint string, vpToken string
 	formRequest.Add("vp_token", vpToken)
 	formRequest.Add("presentation_submission", presentationSubmission)
 	formRequest.Add("scope", scope)
+	formRequest.Add("client_id", ac.clientId)
 
 	logging.Log().Infof("Get token from %s.", tokenEndpoint)
 	tokenHttpRequest, err := http.NewRequest("POST", tokenEndpoint, strings.NewReader(formRequest.Encode()))

tir/tirClient.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/bxcodec/httpcache"
+	"github.com/fiware/VCVerifier/config"
 	"github.com/fiware/VCVerifier/logging"
 )
 
@@ -75,7 +76,7 @@ type Claim struct {
 	AllowedValues []interface{} `json:"allowedValues"`
 }
 
-func NewTirHttpClient(tokenProvider TokenProvider, enableAuth bool) (client TirClient, err error) {
+func NewTirHttpClient(tokenProvider TokenProvider, config *config.M2M) (client TirClient, err error) {
 
 	httpClient := &http.Client{}
 	_, err = httpcache.NewWithInmemoryCache(httpClient, true, time.Second*60)
@@ -84,9 +85,9 @@ func NewTirHttpClient(tokenProvider TokenProvider, enableAuth bool) (client TirC
 		return
 	}
 	var httpGetClient HttpGetClient
-	if enableAuth {
+	if config.AuthEnabled {
 		logging.Log().Infof("Provider is %v", tokenProvider)
-		httpGetClient = AuthorizingHttpClient{httpClient: httpClient, tokenProvider: tokenProvider}
+		httpGetClient = AuthorizingHttpClient{httpClient: httpClient, tokenProvider: tokenProvider, clientId: config.ClientId}
 	} else {
 		httpGetClient = NoAuthHttpClient{httpClient: httpClient}
 	}

verifier/verifier.go

@@ -225,7 +225,7 @@ func InitVerifier(config *configModel.Configuration, ssiKitClient ssikit.SSIKit)
 		logging.Log().Infof("Auth disabled.")
 	}
 
-	tirClient, err := tir.NewTirHttpClient(tokenProvider, (&config.M2M).AuthEnabled)
+	tirClient, err := tir.NewTirHttpClient(tokenProvider, &config.M2M)
 	if err != nil {
 		logging.Log().Errorf("Was not able to instantiate the trusted-issuers-registry client. Err: %v", err)
 		return err