Merge pull request #724 from boschresearch/fix/oob-credential-payload

small backend fix for PR: 723

backend/business-partner-agent/pom.xml

@@ -155,7 +155,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>
-            <version>5.6.1</version>
+            <version>5.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -170,7 +170,7 @@
         <dependency>
             <groupId>io.micronaut.email</groupId>
             <artifactId>micronaut-email-mailjet</artifactId>
-            <version>1.0.1</version>
+            <version>1.1.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.activation</groupId>

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/api/PartnerAPI.java

@@ -112,7 +112,7 @@ public static void copyFrom(@NonNull PartnerAPI to, @NonNull Partner from) {
      * 2. Legal Name from public profile if set 3. aca-py label, --label flag or
      * overwritten when creating the connection with the label option 4. did, public
      * or peer
-     * 
+     *
      * @return the partners name or null if no match was found
      */
     public String getName() {

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/LedgerExplorerClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 - for information on the respective copyright owner
+ * Copyright (c) 2020-2022 - for information on the respective copyright owner
  * see the NOTICE file and/or the repository at
  * https://github.com/hyperledger-labs/business-partner-agent
  *
@@ -76,7 +76,7 @@ public class LedgerExplorerClient {
     /**
      * Query the ledger explorer for a list of credential definitions that are based
      * on a did or a TRX id.
-     * 
+     *
      * @param query query can be either a did or a transaction id.
      * @return optional list of {@link PartnerCredentialType}
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/AdminController.java

@@ -273,7 +273,7 @@ public HttpResponse<RuntimeConfig> getRuntimeConfig() {
      * Trigger the backend to write configured endpoints to the ledger. TAA digest
      * has to be passed to explicitly confirm prior TTA acceptance by the user for
      * this ledger interaction / session.
-     * 
+     *
      * @param tAADigest {@link TAADigestRequest}
      * @return {@link HttpResponse}
      */
@@ -299,7 +299,7 @@ public HttpResponse<Boolean> isEndpointsWriteRequired() {
 
     /**
      * Get TAA record (digest, text, version)
-     * 
+     *
      * @return {@link TAARecord}
      */
     @Get("/taa/get")

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/InvitationController.java

@@ -49,7 +49,7 @@ public class InvitationController {
 
     /**
      * Check invitation (receive)
-     * 
+     *
      * @param body {@link CheckInvitationRequest}
      * @return {@link MutableHttpResponse}
      */
@@ -60,7 +60,7 @@ public MutableHttpResponse<Object> checkInvitation(@Body CheckInvitationRequest
 
     /**
      * Receive / accept invitation
-     * 
+     *
      * @param body {@link AcceptInvitationRequest}
      * @return {@link MutableHttpResponse}
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/IssuerController.java

@@ -128,7 +128,7 @@ public HttpResponse<String> issueCredential(@Valid @Body IssueCredentialRequest
     /**
      * Issue OOB credential step 1 - prepares credential offer and returns URL for
      * use within the barcode
-     * 
+     *
      * @param req {@link IssueOOBCredentialRequest}
      * @return {@link APICreateInvitationResponse}
      */
@@ -140,7 +140,7 @@ public HttpResponse<APICreateInvitationResponse> issueCredentialConnectionLess(
 
     /**
      * Issue OOB credential step 2 - redirect with encoded offer
-     * 
+     *
      * @param id {@link UUID}
      * @return Redirect with encoded credential offer in the location header
      */
@@ -188,7 +188,7 @@ public HttpResponse<CredEx> revokeCredential(@PathVariable UUID id) {
     /**
      * Send holder a new credential offer based on an existing (revoked) exchange
      * record
-     * 
+     *
      * @param id credential exchange id
      * @return {@link HttpResponse}
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/MessagingController.java

@@ -52,7 +52,7 @@ public class MessagingController {
 
     /**
      * List message templates
-     * 
+     *
      * @return list of {@link MessageTemplateCmd.ApiMessageTemplate}
      */
     @Get("/template")
@@ -62,7 +62,7 @@ public HttpResponse<List<MessageTemplateCmd.ApiMessageTemplate>> listMessageTemp
 
     /**
      * Add new message template
-     * 
+     *
      * @param template {@link MessageTemplateCmd.MessageTemplateRequest}
      * @return {@link MessageTemplateCmd.ApiMessageTemplate}
      */
@@ -74,7 +74,7 @@ public HttpResponse<MessageTemplateCmd.ApiMessageTemplate> addMessageTemplate(
 
     /**
      * Update message template
-     * 
+     *
      * @param id       {@link UUID} template id
      * @param template {@link MessageTemplateCmd.MessageTemplateRequest}
      * @return HTTP status
@@ -88,7 +88,7 @@ public HttpResponse<Void> updateMessageTemplate(@PathVariable UUID id,
 
     /**
      * Delete message template
-     * 
+     *
      * @param id {@link UUID} template id
      * @return HTTP status
      */
@@ -102,7 +102,7 @@ public HttpResponse<Void> deleteMessageTemplate(@PathVariable UUID id) {
 
     /**
      * List user info
-     * 
+     *
      * @return list of {@link MessageUserInfoCmd.ApiUserInfo}
      */
     @Get("/user-info")
@@ -112,7 +112,7 @@ public HttpResponse<List<MessageUserInfoCmd.ApiUserInfo>> listUserInfo() {
 
     /**
      * Add new user info configuration
-     * 
+     *
      * @param config {@link MessageUserInfoCmd.UserInfoRequest}
      * @return {@link MessageUserInfoCmd.ApiUserInfo}
      */
@@ -124,7 +124,7 @@ public HttpResponse<MessageUserInfoCmd.ApiUserInfo> addUserInfo(
 
     /**
      * Update user info configuration
-     * 
+     *
      * @param id     {@link UUID} user info id
      * @param config {@link MessageUserInfoCmd.UserInfoRequest}
      * @return HTTP status
@@ -138,7 +138,7 @@ public HttpResponse<Void> updateUserInfo(@PathVariable UUID id,
 
     /**
      * Delete user info configuration
-     * 
+     *
      * @param id {@link UUID} user info id
      * @return HTTP status
      */
@@ -152,7 +152,7 @@ public HttpResponse<Void> deleteUserInfo(@PathVariable UUID id) {
 
     /**
      * List message trigger configuration
-     * 
+     *
      * @return list of {@link MessageTriggerConfigCmd.ApiTriggerConfig}
      */
     @Get("/trigger")
@@ -162,7 +162,7 @@ public HttpResponse<List<MessageTriggerConfigCmd.ApiTriggerConfig>> listMessageT
 
     /**
      * ASdd new message trigger configuration
-     * 
+     *
      * @param trigger {@link MessageTriggerConfigCmd.ApiTriggerConfig}
      * @return {@link MessageTriggerConfigCmd.TriggerConfigRequest}
      */
@@ -175,7 +175,7 @@ public HttpResponse<MessageTriggerConfigCmd.ApiTriggerConfig> addMessageTrigger(
 
     /**
      * Update message trigger configuration
-     * 
+     *
      * @param id      {@link UUID} message trigger id
      * @param trigger {@link MessageTriggerConfigCmd.TriggerConfigRequest}
      * @return HTTP status
@@ -190,7 +190,7 @@ public HttpResponse<Void> updateMessageTrigger(@PathVariable UUID id,
 
     /**
      * Delete message trigger configuration
-     * 
+     *
      * @param id {@link UUID} message trigger id
      * @return HTTP status
      */
@@ -204,7 +204,7 @@ public HttpResponse<Void> deleteMessageTrigger(@PathVariable UUID id) {
 
     /**
      * Manual trigger to send an invitation url by email
-     * 
+     *
      * @param request {@link AdHocMessageRequest}
      * @return HTTP status
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/ProofTemplateController.java

@@ -50,7 +50,7 @@ public class ProofTemplateController {
 
     /**
      * List configured templates
-     * 
+     *
      * @return list of {@link ProofTemplate}
      */
     @Get
@@ -63,7 +63,7 @@ public HttpResponse<List<ProofTemplate>> listProofTemplates() {
 
     /**
      * Get template by id
-     * 
+     *
      * @param id proof template id
      * @return {@link ProofTemplate}
      */
@@ -79,7 +79,7 @@ public HttpResponse<ProofTemplate> getProofTemplateForId(@PathVariable UUID id)
 
     /**
      * Add a new proof template
-     * 
+     *
      * @param template {@link ProofTemplate}
      * @return {@link ProofTemplate}
      */
@@ -109,7 +109,7 @@ public HttpResponse<Set<String>> listKnownConditionOperators() {
 
     /**
      * Delete proof template by id
-     * 
+     *
      * @param id proof template id
      * @return Http Status
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/DidResolver.java

@@ -68,7 +68,7 @@ public class DidResolver {
     /**
      * Tries to resolve the partners public profile based on the did contained
      * within a commercial register credential.
-     * 
+     *
      * @param pp {@link PartnerProof}
      */
     @Async
@@ -115,7 +115,7 @@ public void resolveDid(PartnerProof pp, @NonNull List<PresentationExchangeRecord
      * did can be resolved to a profile, if this is not possible try to do this
      * based on a did that is embedded in the partners label. The label is supposed
      * to adhere to the following format: did:sov:xxx:123:MyLabel
-     * 
+     *
      * @param p {@link Partner}
      */
     @Async
@@ -158,7 +158,7 @@ private Optional<PartnerAPI> lookupPartnerSave(String did) {
     /**
      * Extracts the did and label components from a label is supposed to adhere to
      * the following format: did:sov:123:MyLabel.
-     * 
+     *
      * @param label the label
      * @return {@link ConnectionLabel}
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/PartnerCredDefLookup.java

@@ -67,7 +67,7 @@ public class PartnerCredDefLookup {
     /**
      * Get/filter partners that can issue credentials that are based on the schema's
      * id.
-     * 
+     *
      * @param schemaId the schema id
      * @return {@link PartnerAPI} list
      */
@@ -82,7 +82,7 @@ public List<PartnerAPI> getIssuersFor(@NonNull String schemaId) {
     /**
      * If a ledger explorer is configured. Find partners that can issue credentials
      * that are based on the schema id.
-     * 
+     *
      * @param schemaId the schema id
      * @param result   {@link List} that should contain the result
      */
@@ -104,7 +104,7 @@ void filterBySupportedCredential(String schemaId, List<PartnerAPI> result) {
      * If NO ledger explorer is configured, statically match configured issuer did's
      * to partner did's to find partners that can issue a credential based on the
      * schema id.
-     * 
+     *
      * @param schemaId the schema id
      * @param result   {@link List} that should contain the result
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/connection/InvitationParser.java

@@ -243,7 +243,7 @@ private String parseInvitationBlockFromRedirect(@NonNull HttpUrl url) {
      * we are only interested in the query so the result is wrapped for easier
      * parsing. In case of an url we simply convert to maintain the original
      * location.
-     * 
+     *
      * @param invitationUri uri as String
      * @param decode        if the invitationUri needs url decoding
      * @return {@link HttpUrl} or null

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/CredentialManagerBase.java

@@ -66,7 +66,7 @@ public abstract class CredentialManagerBase {
      * If there is a problem during the credential exchange and aca-py is started
      * without the option to preserve exchange records, the record is deleted
      * immediately. Hence, we need to check if the record exists in both systems.
-     * 
+     *
      * @param id credential exchange id
      * @return {@link BPACredentialExchange}
      */

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/HolderManager.java

@@ -109,7 +109,7 @@ public class HolderManager extends CredentialManagerBase {
 
     /**
      * Request credential from issuer (partner)
-     * 
+     *
      * @param partnerId {@link UUID}
      * @param myDocId   {@link UUID}
      * @param version   {@link ExchangeVersion}
@@ -150,7 +150,7 @@ public void sendCredentialProposal(@NonNull UUID partnerId, @NonNull UUID myDocI
 
     /**
      * Holder accepts credential offer received from issuer
-     * 
+     *
      * @param id {@link UUID} bpa credential exchange id
      */
     public void sendCredentialRequest(@NonNull UUID id) {
@@ -173,7 +173,7 @@ public void sendCredentialRequest(@NonNull UUID id) {
 
     /**
      * Holder declines credential offer received from issuer
-     * 
+     *
      * @param id      {@link UUID} bpa credential exchange id
      * @param message optional reason
      */
@@ -189,7 +189,7 @@ public void declineCredentialOffer(@NonNull UUID id, @Nullable String message) {
 
     /**
      * Sets the credential's visibility in the public profile
-     * 
+     *
      * @param id {@link UUID} bpa credential exchange id
      */
     public void toggleVisibility(UUID id) {
@@ -221,7 +221,7 @@ public List<AriesCredential> listHeldCredentials(@Nullable List<CredentialType>
 
     /**
      * Find wallet credential by id
-     * 
+     *
      * @param id {@link UUID} bpa credential exchange id
      * @return {@link AriesCredential}
      */