Merge pull request #327 from hyperledger-labs/fix/credentialDefinitio…

…nIds Fix/credential definition ids
hyperledger-labs · Feb 23, 2021 · 3b20b02 · 3b20b02
2 parents 080ac78 + afb91e8
commit 3b20b02
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 35 deletions.
diff --git a/backend/business-partner-agent/pom.xml b/backend/business-partner-agent/pom.xml
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.9.0</version>
+            <version>4.9.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>
-            <version>5.4.2</version>
+            <version>5.4.5</version>
         </dependency>
 
         <!-- Database -->
@@ -350,7 +350,7 @@
                     <plugin>
                         <groupId>com.github.eirslett</groupId>
                         <artifactId>frontend-maven-plugin</artifactId>
-                        <version>1.11.0</version>
+                        <version>1.11.2</version>
                         <configuration>
                             <workingDirectory>../../frontend</workingDirectory>
                         </configuration>
@@ -363,8 +363,8 @@
                                 </goals>
                                 <configuration>
                                     <!-- See https://nodejs.org/en/download/ -->
-                                    <nodeVersion>v14.15.3</nodeVersion>
-                                    <npmVersion>6.14.9</npmVersion>
+                                    <nodeVersion>v14.15.5</nodeVersion>
+                                    <npmVersion>6.14.11</npmVersion>
                                 </configuration>
                             </execution>
                             <execution>

diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/URClient.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/URClient.java
@@ -81,7 +81,7 @@ public Optional<DidDocAPI> getDidDocument(String did) {
                     .getDidDocument();
         } catch (HttpClientResponseException e) {
             String msg = "Call to universal resolver failed - msg: " + e.getMessage() + ", status: " + e.getStatus();
-            log.error(msg);
+            log.error(msg, e);
             throw new PartnerException(msg);
         } catch (IOException e) {
             log.warn("Could not close connection", e);
@@ -111,7 +111,7 @@ public Optional<VerifiablePresentation<VerifiableIndyCredential>> getPublicProfi
             throw new PartnerException(msg);
         } catch (IOException e) {
             String msg = "Call to partner web endpoint failed - msg: " + e.getMessage();
-            log.error(msg);
+            log.error(msg, e);
             throw new PartnerException(msg);
         }
         return result;

diff --git a/...usiness-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/AriesEventHandler.java b/...usiness-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/AriesEventHandler.java
@@ -83,9 +83,7 @@ public void handleCredential(CredentialExchange credential) {
         // holder events, because I could also be an issuer
         if ("holder".equals(credential.getRole())) {
             synchronized (credMgmt) {
-                if ("credential_received".equals(credential.getState())) {
-                    credMgmt.handleStoreCredential(credential);
-                } else if ("credential_acked".equals(credential.getState())) {
+                if ("credential_acked".equals(credential.getState())) {
                     credMgmt.handleCredentialAcked(credential);
                 } else {
                     credMgmt.handleCredentialEvent(credential);

diff --git a/...usiness-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/CredentialManager.java b/...usiness-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/CredentialManager.java
@@ -161,20 +161,6 @@ public void handleCredentialEvent(CredentialExchange credEx) {
                 });
     }
 
-    // credential signed, but not in wallet yet
-    public void handleStoreCredential(CredentialExchange credEx) {
-        credRepo.findByThreadId(credEx.getThreadId())
-                .ifPresentOrElse(cred -> {
-                    try {
-                        credRepo.updateState(cred.getId(), credEx.getState());
-                        // TODO should not be necessary with --auto-store-credential set
-                        ac.issueCredentialRecordsStore(credEx.getCredentialExchangeId());
-                    } catch (IOException e) {
-                        log.error("aca-py not reachable", e);
-                    }
-                }, () -> log.error("Received store credential event without matching thread id"));
-    }
-
     // credential, signed and stored in wallet
     public void handleCredentialAcked(CredentialExchange credEx) {
         credRepo.findByThreadId(credEx.getThreadId())

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -44,15 +44,15 @@
         <skip.docker.build>true</skip.docker.build>
         <!-- Dependency Versions -->
         <log4j2.version>2.14.0</log4j2.version>
-        <lombok.version>1.18.16</lombok.version>
-        <micronaut.version>2.3.0</micronaut.version>
+        <lombok.version>1.18.18</lombok.version>
+        <micronaut.version>2.3.2</micronaut.version>
         <micronaut.data.version>2.2.4</micronaut.data.version>
-        <micronaut.openapi.version>2.2.2</micronaut.openapi.version>
+        <micronaut.openapi.version>2.3.1</micronaut.openapi.version>
         <micronaut.security.version>2.3.0</micronaut.security.version>
         <mockito.version>3.7.7</mockito.version>
-        <pmd.version>6.30.0</pmd.version>
-        <spotbugs.version>4.2.0</spotbugs.version>
-        <testcontainers.version>1.15.1</testcontainers.version>
+        <pmd.version>6.31.0</pmd.version>
+        <spotbugs.version>4.2.1</spotbugs.version>
+        <testcontainers.version>1.15.2</testcontainers.version>
         <!-- Plugin Versions -->
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
         <maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
@@ -116,7 +116,7 @@
             <dependency>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-core</artifactId>
-                <version>7.5.1</version>
+                <version>7.5.3</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
@@ -223,7 +223,7 @@
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.13.0</version>
+                <version>2.14.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -242,7 +242,7 @@
                 <plugin>
                     <groupId>io.micronaut.build</groupId>
                     <artifactId>micronaut-maven-plugin</artifactId>
-                    <version>1.1.4</version>
+                    <version>1.1.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

diff --git a/frontend/src/views/RequestPresentation.vue b/frontend/src/views/RequestPresentation.vue
@@ -109,7 +109,7 @@ export default {
           },
           {
             credentialDefinitionId:
-              "M6Mbe3qx7vB4wpZF4sBRjt:3:CL:571:bank_account_no_revoc",
+              "M6Mbe3qx7vB4wpZF4sBRjt:3:CL:571:Bank Account",
             label: "Bank Account",
             issuer: "Bank",
           },
@@ -123,7 +123,7 @@ export default {
           },
           {
             credentialDefinitionId:
-              "UmZ25DANwS6ngGWB4ye4tN:3:CL:104:Bank Account",
+              "SCf4pK5PTvc1LnbUAF2aHD:3:CL:104:Bank Account",
             label: "Bank Account",
             issuer: "Bank",
           },