wrap flatMap write operation in Future

Signed-off-by: Jon Bauer <[email protected]> ci: update and remove breaking steps Signed-off-by: goncalo-frade-iohk <[email protected]> update build.yml for xcode16 Signed-off-by: Jon Bauer <[email protected]> feat(agent): the body on issue credential protocol messages can be null hyperledger-identus/identus#115 Signed-off-by: goncalo-frade-iohk <[email protected]> commits squashed
hyperledger-identus · Feb 11, 2025 · 833b522 · 833b522
1 parent a7efde5
commit 833b522
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 100 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,24 +19,15 @@ env:
 jobs:
   lint:
     name: build
-    runs-on: macos-13
+    runs-on: macos-15
 
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '15.0.1'
-
-      - name: Install SSH Key
-        uses: shimataro/[email protected]
-        with:
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          known_hosts: github.com
-
-      - name: Adding Known Hosts
-        run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+          xcode-version: '16.2'
 
 #      - name: Install lcov
 #        run: brew install [email protected] && brew link --overwrite --force [email protected]

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -31,14 +31,14 @@ jobs:
         with:
             xcode-version: '15.0.1'
 
-      - name: Install SSH Key
-        uses: shimataro/[email protected]
-        with:
-            key: ${{ secrets.SSH_PRIVATE_KEY }}
-            known_hosts: github.com
-
-      - name: Adding Known Hosts
-        run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+#      - name: Install SSH Key
+#        uses: shimataro/[email protected]
+#        with:
+#            key: ${{ secrets.SSH_PRIVATE_KEY }}
+#            known_hosts: github.com
+#
+#      - name: Adding Known Hosts
+#        run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
 
       - name: Create properties file
         working-directory: E2E/e2eTests/Resources

diff --git a/.github/workflows/releaseDocumentation.yml b/.github/workflows/releaseDocumentation.yml
@@ -28,15 +28,6 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
 
-      - name: Install SSH Key
-        uses: shimataro/[email protected]
-        with:
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          known_hosts: github.com
-
-      - name: Adding Known Hosts
-        run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-
       - name: Build Docs
         uses: nick-fields/retry@v2
         with:

diff --git a/EdgeAgentSDK/EdgeAgent/Sources/DIDCommAgent/DIDCommAgent+Credentials.swift b/EdgeAgentSDK/EdgeAgent/Sources/DIDCommAgent/DIDCommAgent+Credentials.swift
@@ -265,8 +265,8 @@ public extension DIDCommAgent {
 
         let requestCredential = RequestCredential3_0(
             body: .init(
-                goalCode: offer.body.goalCode,
-                comment: offer.body.comment
+                goalCode: offer.body?.goalCode,
+                comment: offer.body?.comment
             ),
             type: type.rawValue,
             attachments: [.init(

diff --git a/EdgeAgentSDK/EdgeAgent/Sources/Protocols/IssueCredential/IssueCredential.swift b/EdgeAgentSDK/EdgeAgent/Sources/Protocols/IssueCredential/IssueCredential.swift
@@ -29,15 +29,15 @@ public struct IssueCredential {
 
     public let id: String
     public let type: String
-    public let body: Body
+    public let body: Body?
     public let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
     public let to: DID
 
     init(
         id: String = UUID().uuidString,
-        body: Body,
+        body: Body?,
         type: String,
         attachments: [AttachmentDescriptor],
         thid: String?,
@@ -65,7 +65,7 @@ public struct IssueCredential {
             shouldBe: [ProtocolTypes.didcommIssueCredential.rawValue]
         ) }
 
-        let body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        let body = try? JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
         self.init(
             id: fromMessage.id,
             body: body,
@@ -111,9 +111,9 @@ public struct IssueCredential {
 
         return IssueCredential(
             body: Body(
-                goalCode: request.body.goalCode,
-                comment: request.body.comment,
-                formats: request.body.formats
+                goalCode: request.body?.goalCode,
+                comment: request.body?.comment,
+                formats: request.body?.formats ?? []
             ),
             type: type.rawValue,
             attachments: request.attachments,
@@ -169,15 +169,15 @@ public struct IssueCredential3_0 {
 
     public let id: String
     public let type: String
-    public let body: Body
+    public let body: Body?
     public let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
     public let to: DID
 
     init(
         id: String = UUID().uuidString,
-        body: Body,
+        body: Body?,
         type: String,
         attachments: [AttachmentDescriptor],
         thid: String?,
@@ -204,7 +204,7 @@ public struct IssueCredential3_0 {
             shouldBe: [ProtocolTypes.didcommIssueCredential3_0.rawValue]
         ) }
 
-        let body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        let body = try? JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
         self.init(
             id: fromMessage.id,
             body: body,
@@ -247,8 +247,8 @@ public struct IssueCredential3_0 {
 
         return IssueCredential3_0(
             body: Body(
-                goalCode: request.body.goalCode,
-                comment: request.body.comment
+                goalCode: request.body?.goalCode,
+                comment: request.body?.comment
             ),
             type: type.rawValue,
             attachments: request.attachments,

diff --git a/EdgeAgentSDK/EdgeAgent/Sources/Protocols/IssueCredential/OfferCredential.swift b/EdgeAgentSDK/EdgeAgent/Sources/Protocols/IssueCredential/OfferCredential.swift
@@ -32,15 +32,15 @@ public struct OfferCredential {
 
     public let id: String
     public let type: String
-    public let body: Body
+    public let body: Body?
     public let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
     public let to: DID
 
     public init(
         id: String = UUID().uuidString,
-        body: Body,
+        body: Body?,
         type: String,
         attachments: [AttachmentDescriptor],
         thid: String?,
@@ -67,10 +67,10 @@ public struct OfferCredential {
             shouldBe: [ProtocolTypes.didcommOfferCredential.rawValue]
         ) }
 
-        let body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        let body = try? JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
         self.init(
             id: fromMessage.id,
-            body: .init(credentialPreview: .init(attributes: []), formats: []), // TODO: [Anoncreds] when they fix on the agent put this back
+            body: body,
             type: piuri.rawValue,
             attachments: fromMessage.attachments,
             thid: fromMessage.thid,
@@ -108,10 +108,10 @@ public struct OfferCredential {
 
         return OfferCredential(
             body: Body(
-                goalCode: proposed.body.goalCode,
-                comment: proposed.body.comment,
-                credentialPreview: proposed.body.credentialPreview,
-                formats: proposed.body.formats
+                goalCode: proposed.body?.goalCode,
+                comment: proposed.body?.comment,
+                credentialPreview: proposed.body?.credentialPreview ?? .init(attributes: []),
+                formats: proposed.body?.formats ?? []
             ),
             type: type.rawValue,
             attachments: proposed.attachments,
@@ -139,14 +139,14 @@ public struct OfferCredential3_0 {
         public let comment: String?
         public let replacementId: String?
         public let multipleAvailable: String?
-        public let credentialPreview: CredentialPreview3_0
+        public let credentialPreview: CredentialPreview3_0?
 
         public init(
             goalCode: String? = nil,
             comment: String? = nil,
             replacementId: String? = nil,
             multipleAvailable: String? = nil,
-            credentialPreview: CredentialPreview3_0
+            credentialPreview: CredentialPreview3_0?
         ) {
             self.goalCode = goalCode
             self.comment = comment
@@ -158,15 +158,15 @@ public struct OfferCredential3_0 {
 
     public let id: String
     public let type: String
-    public let body: Body
+    public let body: Body?
     public let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
     public let to: DID
 
     public init(
         id: String = UUID().uuidString,
-        body: Body,
+        body: Body?,
         type: String,
         attachments: [AttachmentDescriptor],
         thid: String?,
@@ -193,7 +193,7 @@ public struct OfferCredential3_0 {
             shouldBe: [ProtocolTypes.didcommOfferCredential.rawValue]
         ) }
 
-        let body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        let body = try? JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
         self.init(
             id: fromMessage.id,
             body: body,
@@ -236,9 +236,9 @@ public struct OfferCredential3_0 {
 
         return OfferCredential3_0(
             body: Body(
-                goalCode: proposed.body.goalCode,
-                comment: proposed.body.comment,
-                credentialPreview: proposed.body.credentialPreview
+                goalCode: proposed.body?.goalCode,
+                comment: proposed.body?.comment,
+                credentialPreview: proposed.body?.credentialPreview
             ),
             type: type.rawValue,
             attachments: proposed.attachments,

diff --git a/EdgeAgentSDK/EdgeAgent/Sources/Protocols/IssueCredential/ProposeCredential.swift b/EdgeAgentSDK/EdgeAgent/Sources/Protocols/IssueCredential/ProposeCredential.swift
@@ -5,13 +5,13 @@ import Foundation
 // ALL parameterS are DIDCOMMV2 format and naming conventions and follows the protocol
 // https://github.com/hyperledger/aries-rfcs/tree/main/features/0453-issue-credential-v2
 public struct ProposeCredential {
-    struct Body: Codable, Equatable {
-        let goalCode: String?
-        let comment: String?
-        let credentialPreview: CredentialPreview
-        let formats: [CredentialFormat]
+    public struct Body: Codable, Equatable {
+        public let goalCode: String?
+        public let comment: String?
+        public let credentialPreview: CredentialPreview
+        public let formats: [CredentialFormat]
 
-        init(
+        public init(
             goalCode: String? = nil,
             comment: String? = nil,
             credentialPreview: CredentialPreview,
@@ -26,15 +26,15 @@ public struct ProposeCredential {
 
     public let id: String
     public let type = ProtocolTypes.didcommProposeCredential.rawValue
-    let body: Body
-    let attachments: [AttachmentDescriptor]
+    public let body: Body?
+    public let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
     public let to: DID
 
     init(
         id: String = UUID().uuidString,
-        body: Body,
+        body: Body?,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
@@ -57,7 +57,7 @@ public struct ProposeCredential {
             type: fromMessage.piuri,
             shouldBe: [ProtocolTypes.didcommProposeCredential.rawValue]
         ) }
-        let body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        let body = try? JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
         self.init(
             id: fromMessage.id,
             body: body,
@@ -119,15 +119,15 @@ extension ProposeCredential: Equatable {
 // ALL parameterS are DIDCOMMV2 format and naming conventions and follows the protocol
 // https://github.com/hyperledger/aries-rfcs/tree/main/features/0453-issue-credential-v2
 public struct ProposeCredential3_0 {
-    struct Body: Codable, Equatable {
-        let goalCode: String?
-        let comment: String?
-        let credentialPreview: CredentialPreview3_0
+    public struct Body: Codable, Equatable {
+        public let goalCode: String?
+        public let comment: String?
+        public let credentialPreview: CredentialPreview3_0?
 
-        init(
+        public init(
             goalCode: String? = nil,
             comment: String? = nil,
-            credentialPreview: CredentialPreview3_0
+            credentialPreview: CredentialPreview3_0?
         ) {
             self.goalCode = goalCode
             self.comment = comment
@@ -137,15 +137,15 @@ public struct ProposeCredential3_0 {
 
     public let id: String
     public let type = ProtocolTypes.didcommProposeCredential3_0.rawValue
-    let body: Body
-    let attachments: [AttachmentDescriptor]
+    public let body: Body?
+    public let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
     public let to: DID
 
     init(
         id: String = UUID().uuidString,
-        body: Body,
+        body: Body?,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
@@ -168,7 +168,7 @@ public struct ProposeCredential3_0 {
             type: fromMessage.piuri,
             shouldBe: [ProtocolTypes.didcommProposeCredential3_0.rawValue]
         ) }
-        let body = try JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
+        let body = try? JSONDecoder.didComm().decode(Body.self, from: fromMessage.body)
         self.init(
             id: fromMessage.id,
             body: body,