From 2823346ff18ad99215a131c08a3e515e8a599b4f Mon Sep 17 00:00:00 2001
From: Pim Otte <potte@quintor.nl>
Date: Mon, 15 Jul 2019 11:00:20 +0200
Subject: [PATCH] Updating to quindy 0.3.1

---
 seeder/Dockerfile                                         | 2 +-
 seeder/pom.xml                                            | 2 +-
 university-agent/Dockerfile                               | 2 +-
 university-agent/pom.xml                                  | 2 +-
 .../java/nl/quintor/studybits/service/AgentService.java   | 6 +++---
 .../java/nl/quintor/studybits/controller/ScenarioIT.java  | 8 +++-----
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/seeder/Dockerfile b/seeder/Dockerfile
index 0abf6aa..e094611 100644
--- a/seeder/Dockerfile
+++ b/seeder/Dockerfile
@@ -1,4 +1,4 @@
-FROM studybits/base-image:0.1.2
+FROM studybits/base-image:0.1.3
 ADD pom.xml /
 RUN mvn package
 
diff --git a/seeder/pom.xml b/seeder/pom.xml
index 6cd1c4a..85a67f9 100644
--- a/seeder/pom.xml
+++ b/seeder/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>nl.quintor</groupId>
             <artifactId>quindy</artifactId>
-            <version>0.1.2</version>
+            <version>0.1.3</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/university-agent/Dockerfile b/university-agent/Dockerfile
index 5bb2ba1..31a419a 100644
--- a/university-agent/Dockerfile
+++ b/university-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM studybits/base-image:0.1.2
+FROM studybits/base-image:0.1.3
 RUN apt-get update && apt-get install -y  curl
 
 ADD pom.xml /
diff --git a/university-agent/pom.xml b/university-agent/pom.xml
index 1ff27f7..63b579c 100644
--- a/university-agent/pom.xml
+++ b/university-agent/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>nl.quintor</groupId>
             <artifactId>quindy</artifactId>
-            <version>0.1.2</version>
+            <version>0.1.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
diff --git a/university-agent/src/main/java/nl/quintor/studybits/service/AgentService.java b/university-agent/src/main/java/nl/quintor/studybits/service/AgentService.java
index a93b648..cd35567 100644
--- a/university-agent/src/main/java/nl/quintor/studybits/service/AgentService.java
+++ b/university-agent/src/main/java/nl/quintor/studybits/service/AgentService.java
@@ -116,11 +116,11 @@ private MessageEnvelope handleCredentialRequest(MessageEnvelope<CredentialReques
         values.put("average", student.getTranscript().getAverage());
         values.put("status", student.getTranscript().getStatus());
 
-        CredentialWithRequest credentialWithRequest = universityIssuer.createCredential(credentialRequest, values).get();
+        Credential credential = universityIssuer.createCredential(credentialRequest, values).get();
 
         studentService.proveTranscript(student.getStudentId());
 
-        return messageEnvelopeCodec.encryptMessage(credentialWithRequest, IndyMessageTypes.CREDENTIAL, messageEnvelope.getDid()).get();
+        return messageEnvelopeCodec.encryptMessage(credential, IndyMessageTypes.CREDENTIAL, messageEnvelope.getDid()).get();
     }
 
     private MessageEnvelope handleProof(MessageEnvelope<Proof> proofEnvelope) throws IndyException, ExecutionException, InterruptedException, IOException {
@@ -130,7 +130,7 @@ private MessageEnvelope handleProof(MessageEnvelope<Proof> proofEnvelope) throws
 
         Proof proof = messageEnvelopeCodec.decryptMessage(proofEnvelope).get();
         log.debug("Proof: {}", proof);
-        List<ProofAttribute> proofAttributes = universityVerifier.getVerifiedProofAttributes(proofRequest, proof, proofEnvelope.getDid()).get();
+        List<ProofAttribute> proofAttributes = universityVerifier.getVerifiedProofAttributes(proofRequest, proof).get();
 
 
         exchangePositionService.fullfillPosition(student.getExchangePosition().getId());
diff --git a/university-agent/src/test/java/nl/quintor/studybits/controller/ScenarioIT.java b/university-agent/src/test/java/nl/quintor/studybits/controller/ScenarioIT.java
index 26b1617..6756f2b 100644
--- a/university-agent/src/test/java/nl/quintor/studybits/controller/ScenarioIT.java
+++ b/university-agent/src/test/java/nl/quintor/studybits/controller/ScenarioIT.java
@@ -187,7 +187,7 @@ public void test4_CredentialRequest() throws IndyException, JsonProcessingExcept
 
         MessageEnvelope authcryptedCredentialRequestEnvelope = studentCodec.encryptMessage(credentialRequest, IndyMessageTypes.CREDENTIAL_REQUEST, rugLisaDid).get();
 
-        MessageEnvelope<CredentialWithRequest> credentialEnvelope = givenCorrectHeaders(ENDPOINT_RUG)
+        MessageEnvelope<Credential> credentialEnvelope = givenCorrectHeaders(ENDPOINT_RUG)
                 .body(authcryptedCredentialRequestEnvelope.toJSON())
                 .post("/agent/message")
                 .then()
@@ -196,11 +196,9 @@ public void test4_CredentialRequest() throws IndyException, JsonProcessingExcept
 
         assertThat(credentialEnvelope.getMessageType().getURN(), is(equalTo(IndyMessageTypes.CREDENTIAL.getURN())));
 
-        CredentialWithRequest credentialWithRequest = studentCodec.decryptMessage(credentialEnvelope).get();
+        Credential credential = studentCodec.decryptMessage(credentialEnvelope).get();
 
-        studentProver.storeCredential(credentialWithRequest).get();
-
-        Credential credential = credentialWithRequest.getCredential();
+        studentProver.storeCredential(credentialRequest, credential).get();
 
         assertThat(credential.getValues().get("degree").get("raw").asText(), is(equalTo("Bachelor of Arts, Marketing")));
         assertThat(credential.getValues().get("average").get("raw").asText(), is(equalTo("8")));