feat(didcore): update for new didcore version and to use didcore jwk

beatt83 · Oct 12, 2023 · 46a29b1 · 46a29b1
1 parent 17f4e9c
commit 46a29b1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 36 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.7.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -13,7 +13,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/swift-libp2p/swift-multibase.git", .upToNextMajor(from: "0.0.1")),
         .package(url: "https://github.com/swift-libp2p/swift-bases.git", .upToNextMajor(from: "0.0.3")),
-        .package(url: "[email protected]:beatt83/didcore-swift.git", branch: "main")
+        .package(url: "[email protected]:beatt83/didcore-swift.git", .upToNextMinor(from: "1.0.0"))
     ],
     targets: [
         .target(

diff --git a/Sources/PeerDID/Models/JWK.swift b/Sources/PeerDID/Models/JWK.swift
diff --git a/Sources/PeerDID/Models/VerificationMaterialFormat.swift b/Sources/PeerDID/Models/VerificationMaterialFormat.swift
@@ -47,7 +47,10 @@ extension PeerDIDVerificationMaterial {
         case .jwk:
             let decoder = JSONDecoder()
             let jwk = try decoder.decode(JWK.self, from: value)
-            guard let decoded = Data(base64URLEncoded: jwk.x) else {
+            guard 
+                let x = jwk.x,
+                let decoded = Data(base64URLEncoded: x)
+            else {
                 throw PeerDIDError.invalidBase64URLKey
             }
             return decoded

diff --git a/Tests/PeerDIDTests/CreatePeerDIDAlgo0Tests.swift b/Tests/PeerDIDTests/CreatePeerDIDAlgo0Tests.swift
@@ -5,6 +5,7 @@
 //  Created by Gonçalo Frade on 12/08/2023.
 //
 
+import DIDCore
 @testable import PeerDID
 import XCTest
 
@@ -32,6 +33,7 @@ final class CreatePeerDIDAlgo0Tests: XCTestCase {
 
     func testCreatePeerDIDAlgo0JWKKey() throws {
         let jwk = JWK(
+            kty: "OKP", 
             crv: "Ed25519",
             x: "owBhCbktDjkfS6PdQddT0D3yjSitaSysP3YimJ_YgmA"
         )

diff --git a/Tests/PeerDIDTests/DecodeEcnumbasisTests.swift b/Tests/PeerDIDTests/DecodeEcnumbasisTests.swift
@@ -4,6 +4,7 @@
 //
 //  Created by Gonçalo Frade on 12/08/2023.
 //
+import DIDCore
 @testable import PeerDID
 import XCTest
 
@@ -70,6 +71,7 @@ final class DecodeEcnumbasisTest: XCTestCase {
 
     func testDecodeFormatJWKKeyEd25519() throws {
         let expectedJWK = JWK(
+            kty: "OKP",
             crv: "Ed25519",
             x: "owBhCbktDjkfS6PdQddT0D3yjSitaSysP3YimJ_YgmA"
         )
@@ -92,6 +94,7 @@ final class DecodeEcnumbasisTest: XCTestCase {
 
     func testDecodeFormatJWKKeyX25519() throws {
         let expectedJWK = JWK(
+            kty: "OKP",
             crv: "X25519",
             x: "BIiFcQEn3dfvB2pjlhOQQour6jXy9d5s2FKEJNTOJik"
         )

diff --git a/Tests/PeerDIDTests/TestsHelpers.swift b/Tests/PeerDIDTests/TestsHelpers.swift
@@ -5,12 +5,13 @@
 //  Created by Gonçalo Frade on 12/08/2023.
 //
 
+import DIDCore
 @testable import PeerDID
 import Foundation
 
 extension JWK {
     static func testable(crv: String = "Ed25519", x: String = "owBhCbktDjkfS6PdQddT0D3yjSitaSysP3YimJ_YgmA") -> JWK {
-        return JWK(crv: crv, x: x)
+        return JWK(kty: "OKP", crv: crv, x: x)
     }
 
     static func testableData(crv: String = "Ed25519", x: String = "owBhCbktDjkfS6PdQddT0D3yjSitaSysP3YimJ_YgmA") -> Data {