chore: Additional events on failures (trustbloc#1499)

Signed-off-by: Bob Stasyszyn <[email protected]>

pkg/restapi/resterr/error.go

@@ -41,6 +41,7 @@ const (
 	PresentationDefinitionMismatch  ErrorCode = "presentation-definition-mismatch"
 	ClaimsNotReceived               ErrorCode = "claims-not-received"
 	ClaimsNotFound                  ErrorCode = "claims-not-found"
+	ClaimsValidationErr             ErrorCode = "invalid-claims"
 	DataNotFound                    ErrorCode = "data-not-found"
 	OpStateKeyDuplication           ErrorCode = "op-state-key duplication"
 	CredentialTemplateNotConfigured ErrorCode = "credential-template-not-configured"
@@ -52,6 +53,7 @@ const (
 	CredentialFormatNotSupported    ErrorCode = "credential-format-not-supported"
 	VCOptionsNotConfigured          ErrorCode = "vc-options-not-configured"
 	InvalidIssuerURL                ErrorCode = "invalid-issuer-url"
+	InvalidStateTransition          ErrorCode = "invalid-state-transition"
 )
 
 type Component = string

pkg/restapi/v1/issuer/controller.go

@@ -736,7 +736,7 @@ func (c *Controller) PrepareCredential(e echo.Context) error {
 	}
 
 	if err = c.validateClaims(result.Credential, result.CredentialTemplate, result.EnforceStrictValidation); err != nil {
-		return fmt.Errorf("validate claims: %w", err)
+		return resterr.NewCustomError(resterr.ClaimsValidationErr, err)
 	}
 
 	signedCredential, err := c.signCredential(

pkg/restapi/v1/issuer/controller_test.go

@@ -1542,7 +1542,7 @@ func TestController_PrepareCredential(t *testing.T) {
 
 		req := `{"tx_id":"123","type":"UniversityDegreeCredential","format":"ldp_vc"}`
 		ctx := echoContext(withRequestBody([]byte(req)))
-		assert.EqualError(t, c.PrepareCredential(ctx), "validate claims: validation error")
+		assert.EqualError(t, c.PrepareCredential(ctx), "invalid-claims: validation error")
 	})
 }
 

pkg/service/oidc4ci/oidc4ci_service.go

@@ -261,8 +261,11 @@ func (s *Service) PrepareClaimDataAuthorizationRequest(
 	}
 
 	if err = s.store.Update(ctx, tx); err != nil {
-		s.sendFailedTransactionEvent(ctx, tx, err)
-		return nil, err
+		e := resterr.NewSystemError(resterr.TransactionStoreComponent, "Update", err)
+
+		s.sendFailedTransactionEvent(ctx, tx, e)
+
+		return nil, e
 	}
 
 	if err = s.sendIssuanceAuthRequestPreparedTxEvent(ctx, tx); err != nil {
@@ -361,7 +364,7 @@ func (s *Service) updateAuthorizationDetails(ctx context.Context, ad *Authorizat
 	tx.AuthorizationDetails = ad
 
 	if err := s.store.Update(ctx, tx); err != nil {
-		return fmt.Errorf("update tx: %w", err)
+		return resterr.NewSystemError(resterr.TransactionStoreComponent, "Update", err)
 	}
 
 	return nil
@@ -454,13 +457,21 @@ func (s *Service) PrepareCredential(
 	expectedAudience := fmt.Sprintf("%s/oidc/idp/%s/%s", s.issuerVCSPublicHost, tx.ProfileID, tx.ProfileVersion)
 
 	if req.AudienceClaim == "" || req.AudienceClaim != expectedAudience {
-		return nil, resterr.NewValidationError(resterr.InvalidOrMissingProofOIDCErr, req.AudienceClaim,
+		e := resterr.NewValidationError(resterr.InvalidOrMissingProofOIDCErr, req.AudienceClaim,
 			errors.New("invalid aud"))
+
+		s.sendFailedTransactionEvent(ctx, tx, e)
+
+		return nil, e
 	}
 
 	claimData, err := s.getClaimsData(ctx, tx)
 	if err != nil {
-		return nil, fmt.Errorf("get claims data: %w", err)
+		e := fmt.Errorf("get claims data: %w", err)
+
+		s.sendFailedTransactionEvent(ctx, tx, e)
+
+		return nil, e
 	}
 
 	contexts := tx.CredentialTemplate.Contexts

pkg/service/oidc4ci/oidc4ci_service_exchange_code_test.go

@@ -280,7 +280,7 @@ func TestExchangeCodeInvalidState(t *testing.T) {
 
 	resp, err := svc.ExchangeAuthorizationCode(context.TODO(), "sadsadas")
 	assert.Empty(t, resp)
-	assert.ErrorContains(t, err, "unexpected transaction from 5 to 4")
+	assert.ErrorContains(t, err, "unexpected transition from 5 to 4")
 }
 
 func TestExchangeCodePublishError(t *testing.T) {

pkg/service/oidc4ci/oidc4ci_service_state.go

@@ -6,7 +6,11 @@ SPDX-License-Identifier: Apache-2.0
 
 package oidc4ci
 
-import "fmt"
+import (
+	"fmt"
+
+	"github.com/trustbloc/vcs/pkg/restapi/resterr"
+)
 
 func (s *Service) validateStateTransition(
 	oldState TransactionState,
@@ -37,5 +41,6 @@ func (s *Service) validateStateTransition(
 		return nil
 	}
 
-	return fmt.Errorf("unexpected transaction from %v to %v", oldState, newState)
+	return resterr.NewCustomError(resterr.InvalidStateTransition,
+		fmt.Errorf("unexpected transition from %v to %v", oldState, newState))
 }

pkg/service/oidc4ci/oidc4ci_service_state_test.go

@@ -55,5 +55,5 @@ func TestInvalidTransition(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.ErrorContains(t, s.validateStateTransition(TransactionStateUnknown, TransactionStateIssuanceInitiated),
-		"unexpected transaction from 0 to 1")
+		"unexpected transition from 0 to 1")
 }