diff --git a/pkg/restapi/vc/operation/models.go b/pkg/restapi/vc/operation/models.go index 39a710f56..26b4da180 100644 --- a/pkg/restapi/vc/operation/models.go +++ b/pkg/restapi/vc/operation/models.go @@ -36,7 +36,7 @@ type ProfileResponse struct { URI string `json:"uri"` SignatureType string `json:"signatureType"` Creator string `json:"creator"` - IssueDate *time.Time `json:"issueDate"` + Created *time.Time `json:"created"` } // VerifyCredentialResponse describes verify credential response diff --git a/pkg/restapi/vc/operation/operations.go b/pkg/restapi/vc/operation/operations.go index f83a9dd61..739fde4d4 100644 --- a/pkg/restapi/vc/operation/operations.go +++ b/pkg/restapi/vc/operation/operations.go @@ -230,7 +230,10 @@ func createCredential(profile *ProfileResponse, data *CreateCredential) (*verifi credential.Context = []string{credentialContext} credential.Subject = data.Subject credential.Types = data.Type - credential.Issuer = data.Issuer + credential.Issuer = verifiable.Issuer{ + ID: profile.DID, + Name: profile.Name, + } credential.Issued = &issueDate credential.ID = profile.URI + "/" + uuid.New().String() @@ -252,11 +255,11 @@ func (c *Operation) createProfile(pr *ProfileRequest) (*ProfileResponse, error) return nil, err } - issueDate := time.Now().UTC() + created := time.Now().UTC() profileResponse := &ProfileResponse{ Name: pr.Name, URI: pr.URI, - IssueDate: &issueDate, + Created: &created, DID: pr.DID, SignatureType: pr.SignatureType, Creator: pr.Creator, diff --git a/pkg/restapi/vc/operation/operations_test.go b/pkg/restapi/vc/operation/operations_test.go index bb74a378f..af2b791a2 100644 --- a/pkg/restapi/vc/operation/operations_test.go +++ b/pkg/restapi/vc/operation/operations_test.go @@ -37,11 +37,7 @@ const testCreateCredentialRequest = `{ "name": "Jayden Doe", "spouse": "did:example:c276e12ec21ebfeb1f712ebc6f1" }, - "profile": "issuer", - "issuer": { - "id": "did:example:76e12ec712ebc6f1c221ebfeb1f", - "name": "Example University" - } + "profile": "test" }` const testInvalidProfileForCreateCredential = `{ @@ -58,11 +54,7 @@ const testIncorrectCredential = `{ "name": "Jayden Doe", "spouse": "did:example:c276e12ec21ebfeb1f712ebc6f1" }, - "profile": "test", - "issuer": { - "id": "did:example:76e12ec712ebc6f1c221ebfeb1f", - "name": "Example University" - } + "profile": "test" }` const testIssuerProfile = `{ @@ -124,8 +116,8 @@ func TestCreateCredentialHandler(t *testing.T) { require.NoError(t, err) require.Equal(t, http.StatusCreated, rr.Code) - require.Equal(t, "did:example:76e12ec712ebc6f1c221ebfeb1f", vc.Issuer.ID) - require.Equal(t, "Example University", vc.Issuer.Name) + require.Equal(t, getTestProfile().DID, vc.Issuer.ID) + require.Equal(t, getTestProfile().Name, vc.Issuer.Name) }) t.Run("create credential error by passing invalid request", func(t *testing.T) { req, err := http.NewRequest(http.MethodPost, createCredentialEndpoint, bytes.NewBuffer([]byte(""))) @@ -400,7 +392,7 @@ func TestCreate(t *testing.T) { log.SetOutput(&logContents) op.createCredentialHandler(b, req) - require.Contains(t, logContents.String(), "Unable to send error response, response writer failed") + require.Contains(t, logContents.String(), "Unable to send error message, response writer failed") } func TestOperation_validateProfileRequest(t *testing.T) { diff --git a/pkg/restapi/vc/operation/profile_test.go b/pkg/restapi/vc/operation/profile_test.go index 2f8e065e0..25dec6576 100644 --- a/pkg/restapi/vc/operation/profile_test.go +++ b/pkg/restapi/vc/operation/profile_test.go @@ -21,11 +21,11 @@ func TestCredentialRecord_SaveProfile(t *testing.T) { record := NewProfile(store) require.NotNil(t, record) - issueDate := time.Now().UTC() + created := time.Now().UTC() value := &ProfileResponse{ - Name: "issuer", - URI: "https://example.com/credentials/1872", - IssueDate: &issueDate, + Name: "issuer", + URI: "https://example.com/credentials/1872", + Created: &created, } err := record.SaveProfile(value) @@ -45,11 +45,11 @@ func TestCredentialRecord_GetProfile(t *testing.T) { record := NewProfile(store) require.NotNil(t, record) - issueDate := time.Now().UTC() + created := time.Now().UTC() valueStored := &ProfileResponse{ - Name: "issuer", - URI: "https://example.com/credentials", - IssueDate: &issueDate, + Name: "issuer", + URI: "https://example.com/credentials", + Created: &created, } err := record.SaveProfile(valueStored)