feat: pass wallet-cli context

mishasizov-SK · Feb 29, 2024 · 5dd548e · 5dd548e
1 parent 4212e96
commit 5dd548e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/component/wallet-cli/pkg/oidc4vci/oidc4vci_flow.go b/component/wallet-cli/pkg/oidc4vci/oidc4vci_flow.go
@@ -67,7 +67,12 @@ const (
 )
 
 type trustRegistry interface {
-	ValidateIssuer(issuerDID string, issuerDomain string, credentialOffers []trustregistry.CredentialOffer) error
+	ValidateIssuer(
+		ctx context.Context,
+		issuerDID string,
+		issuerDomain string,
+		credentialOffers []trustregistry.CredentialOffer,
+	) error
 }
 
 type Flow struct {
@@ -292,6 +297,7 @@ func (f *Flow) Run(ctx context.Context) (*verifiable.Credential, error) {
 
 		if err = f.trustRegistryClient.
 			ValidateIssuer(
+				ctx,
 				issuerDID,
 				"",
 				[]trustregistry.CredentialOffer{

diff --git a/component/wallet-cli/pkg/oidc4vp/oidc4vp_flow.go b/component/wallet-cli/pkg/oidc4vp/oidc4vp_flow.go
@@ -54,7 +54,12 @@ const (
 )
 
 type trustRegistry interface {
-	ValidateVerifier(verifierDID, verifierDomain string, credentials []*verifiable.Credential) error
+	ValidateVerifier(
+		ctx context.Context,
+		verifierDID,
+		verifierDomain string,
+		credentials []*verifiable.Credential,
+	) error
 }
 
 type Flow struct {
@@ -195,6 +200,7 @@ func (f *Flow) Run(ctx context.Context) error {
 
 		if err = f.trustRegistryClient.
 			ValidateVerifier(
+				ctx,
 				requestObject.ClientID,
 				"",
 				vp.Credentials(),

diff --git a/component/wallet-cli/pkg/trustregistry/trustregistry.go b/component/wallet-cli/pkg/trustregistry/trustregistry.go
@@ -36,11 +36,12 @@ func NewClient(httpClient *http.Client, policyURL string) *Client {
 }
 
 func (c *Client) ValidateIssuer(
+	ctx context.Context,
 	issuerDID string,
 	issuerDomain string,
 	credentialOffers []CredentialOffer,
 ) error {
-	logger.Debug("issuer validation begin")
+	logger.Debug("issuer validation begin", log.WithURL(c.policyURL))
 
 	req := &WalletIssuanceRequest{
 		IssuerDID:        issuerDID,
@@ -53,7 +54,7 @@ func (c *Client) ValidateIssuer(
 		return fmt.Errorf("marshal wallet issuance request: %w", err)
 	}
 
-	resp, err := c.doRequest(context.Background(), c.policyURL, body)
+	resp, err := c.doRequest(ctx, c.policyURL, body)
 	if err != nil {
 		return err
 	}
@@ -62,17 +63,18 @@ func (c *Client) ValidateIssuer(
 		return ErrInteractionRestricted
 	}
 
-	logger.Debug("issuer validation succeed")
+	logger.Debug("issuer validation succeed", log.WithURL(c.policyURL))
 
 	return nil
 }
 
 func (c *Client) ValidateVerifier(
+	ctx context.Context,
 	verifierDID,
 	verifierDomain string,
 	credentials []*verifiable.Credential,
 ) error {
-	logger.Debug("verifier validation begin")
+	logger.Debug("verifier validation begin", log.WithURL(c.policyURL))
 
 	req := &WalletPresentationRequest{
 		VerifierDID:        verifierDID,
@@ -91,7 +93,7 @@ func (c *Client) ValidateVerifier(
 		return fmt.Errorf("marshal wallet presentation request: %w", err)
 	}
 
-	resp, err := c.doRequest(context.Background(), c.policyURL, body)
+	resp, err := c.doRequest(ctx, c.policyURL, body)
 	if err != nil {
 		return err
 	}
@@ -100,7 +102,7 @@ func (c *Client) ValidateVerifier(
 		return ErrInteractionRestricted
 	}
 
-	logger.Debug("verifier validation succeed")
+	logger.Debug("verifier validation succeed", log.WithURL(c.policyURL))
 
 	return nil
 }