JCL-299: Unwrap presentation for verify method (#474)

Author: acoburn

access-grant/src/main/java/com/inrupt/client/accessgrant/AccessGrantClient.java

@@ -232,7 +232,6 @@ public CompletionStage<AccessGrant> grantAccess(final AccessRequest request) {
                     }
                 });
         });
-
     }
 
     /**
@@ -298,7 +297,8 @@ public CompletionStage<VerificationResponse> verify(final AccessCredential crede
             try (final InputStream is = new ByteArrayInputStream(credential.serialize().getBytes(UTF_8))) {
                 final Map<String, Object> data = jsonService.fromJson(is,
                         new HashMap<String, Object>(){}.getClass().getGenericSuperclass());
-                presentation.put(VERIFIABLE_CREDENTIAL, data);
+                Utils.getCredentialsFromPresentation(data, credential.getTypes()).stream().findFirst()
+                    .ifPresent(c -> presentation.put(VERIFIABLE_CREDENTIAL, c));
             } catch (final IOException ex) {
                 throw new AccessGrantException("Unable to serialize credential", ex);
             }

access-grant/src/test/java/com/inrupt/client/accessgrant/MockAccessGrantServer.java

@@ -207,6 +207,7 @@ private void setupMocks() {
                     .atPriority(1)
                     .withHeader("Authorization", containing("Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9."))
                     .withRequestBody(containing("\"" + wireMockServer.baseUrl() + "/access-grant-1\""))
+                    .withRequestBody(containing("\"verifiableCredential\":{\""))
                     .willReturn(aResponse()
                         .withStatus(200)
                         .withHeader("Content-Type", "application/json")
@@ -216,6 +217,7 @@ private void setupMocks() {
                     .atPriority(1)
                     .withHeader("Authorization", containing("Bearer eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9."))
                     .withRequestBody(containing("\"" + wireMockServer.baseUrl() + "/access-request-5\""))
+                    .withRequestBody(containing("\"verifiableCredential\":{\""))
                     .willReturn(aResponse()
                         .withStatus(200)
                         .withHeader("Content-Type", "application/json")