feat: credential issuance history: remove profile version from URL

Signed-off-by: Mykhailo Sizov <[email protected]>
mishasizov-SK · Oct 16, 2023 · 93cdd39 · 93cdd39
1 parent 398b8a9
commit 93cdd39
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 177 deletions.
diff --git a/api/spec/openapi.gen.go b/api/spec/openapi.gen.go
diff --git a/component/wallet-cli/cmd/oidc4vci_cmd.go b/component/wallet-cli/cmd/oidc4vci_cmd.go
@@ -14,11 +14,9 @@ import (
 	"log/slog"
 	"net/http"
 	"net/http/cookiejar"
-	"strings"
 
 	"github.com/henvic/httpretty"
 	"github.com/piprate/json-gold/ld"
-	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 	vdrapi "github.com/trustbloc/did-go/vdr/api"
 	storageapi "github.com/trustbloc/kms-go/spi/storage"
@@ -294,7 +292,6 @@ func NewOIDC4VCICommand() *cobra.Command {
 
 			slog.Info("credential added to wallet",
 				"credential_id", vc.Contents().ID,
-				"credential_type", strings.Join(lo.Filter(vc.Contents().Types, func(item string, i int) bool { return !strings.EqualFold(item, "VerifiableCredential") }), ","),
 				"issuer_id", vc.Contents().Issuer.ID,
 			)
 

diff --git a/docs/v1/openapi.yaml b/docs/v1/openapi.yaml
@@ -81,20 +81,14 @@ paths:
       description: Returns openid-config.
       tags:
         - issuer
-  '/issuer/profiles/{profileID}/{profileVersion}/issued-credentials':
+  '/issuer/profiles/{profileID}/issued-credentials':
     parameters:
       - schema:
           type: string
         name: profileID
         in: path
         required: true
         description: Profile ID
-      - schema:
-          type: string
-        name: profileVersion
-        in: path
-        required: true
-        description: Profile Version
     get:
       summary: Request Credential Issuance history.
       responses:

diff --git a/pkg/restapi/v1/issuer/controller.go b/pkg/restapi/v1/issuer/controller.go
@@ -80,7 +80,6 @@ type credentialIssuanceHistoryStore interface {
 	GetIssuedCredentialsMetadata(
 		ctx context.Context,
 		profileID string,
-		profileVersion string,
 	) ([]*credentialstatus.CredentialMetadata, error)
 }
 
@@ -690,10 +689,10 @@ func (c *Controller) PrepareCredential(e echo.Context) error {
 }
 
 // CredentialIssuanceHistory returns Credential Issuance history.
-// GET /issuer/profiles/{profileID}/{profileVersion}/issued-credentials.
-func (c *Controller) CredentialIssuanceHistory(e echo.Context, profileID string, profileVersion string) error {
+// GET /issuer/profiles/{profileID}/issued-credentials.
+func (c *Controller) CredentialIssuanceHistory(e echo.Context, profileID string) error {
 	credentialMetadata, err := c.credentialIssuanceHistoryStore.
-		GetIssuedCredentialsMetadata(e.Request().Context(), profileID, profileVersion)
+		GetIssuedCredentialsMetadata(e.Request().Context(), profileID)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/restapi/v1/issuer/controller_test.go b/pkg/restapi/v1/issuer/controller_test.go
@@ -1634,7 +1634,7 @@ func TestCredentialIssuanceHistory(t *testing.T) {
 		}
 
 		credentialIssuanceStore.EXPECT().
-			GetIssuedCredentialsMetadata(gomock.Any(), profileID, profileVersion).
+			GetIssuedCredentialsMetadata(gomock.Any(), profileID).
 			Times(1).
 			Return([]*credentialstatus.CredentialMetadata{credentialMetadata}, nil)
 
@@ -1646,7 +1646,7 @@ func TestCredentialIssuanceHistory(t *testing.T) {
 
 		echoCtx := echoContext(withRecorder(recorder))
 
-		err := c.CredentialIssuanceHistory(echoCtx, profileID, profileVersion)
+		err := c.CredentialIssuanceHistory(echoCtx, profileID)
 		assert.NoError(t, err)
 
 		var gotResponse []CredentialIssuanceHistoryData
@@ -1669,7 +1669,7 @@ func TestCredentialIssuanceHistory(t *testing.T) {
 
 	t.Run("credentialIssuanceHistoryStore error", func(t *testing.T) {
 		credentialIssuanceStore.EXPECT().
-			GetIssuedCredentialsMetadata(gomock.Any(), profileID, profileVersion).
+			GetIssuedCredentialsMetadata(gomock.Any(), profileID).
 			Times(1).
 			Return(nil, errors.New("some error"))
 
@@ -1681,7 +1681,7 @@ func TestCredentialIssuanceHistory(t *testing.T) {
 
 		echoCtx := echoContext(withRecorder(recorder))
 
-		err := c.CredentialIssuanceHistory(echoCtx, profileID, profileVersion)
+		err := c.CredentialIssuanceHistory(echoCtx, profileID)
 		assert.Error(t, err)
 	})
 }