Skip to content

Updating to quindy 0.3.1 #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pimotte wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updating to quindy 0.3.1 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion seeder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM studybits/base-image:0.1.2
FROM studybits/base-image:0.1.3
ADD pom.xml /
RUN mvn package

Expand Down
2 changes: 1 addition & 1 deletion seeder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion university-agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 /
Expand Down
2 changes: 1 addition & 1 deletion university-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions university-agent/src/main/java/nl/quintor/studybits/service/AgentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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());
Expand Down
8 changes: 3 additions & 5 deletions university-agent/src/test/java/nl/quintor/studybits/controller/ScenarioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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")));
Expand Down