update: jose library version

beatt83 · Jun 3, 2024 · 248a0eb · 248a0eb
1 parent 9483130
commit 248a0eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/Package.swift b/Package.swift
@@ -21,7 +21,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/beatt83/didcore-swift.git", .upToNextMinor(from: "2.0.0")),
-        .package(url: "https://github.com/beatt83/jose-swift.git", .upToNextMinor(from: "2.2.1"))
+        .package(url: "https://github.com/beatt83/jose-swift.git", .upToNextMinor(from: "3.0.1"))
     ],
     targets: [
         .target(

diff --git a/Sources/DIDCommSwift/Envelopes/Unpack/SignedEnvelopeUnpack.swift b/Sources/DIDCommSwift/Envelopes/Unpack/SignedEnvelopeUnpack.swift
@@ -40,7 +40,7 @@ struct SignedEnvelopeUnpack {
             guard let key = try? await keySelector.findVerificationKey(signFrom: kid) else {
                 return false
             }
-            let result = try JWS.verify(jwsJson: packedMessage, jwk: key.jwk)
+            let result = try JWS.verify(jwsJson: packedMessage, key: key.jwk)
             if
                 result,
                 let signature = try jwsJson.signatures.first(where: { try $0.getKid() == kid }),

diff --git a/Sources/DIDCommSwift/Operations/FromPrior.swift b/Sources/DIDCommSwift/Operations/FromPrior.swift
@@ -41,15 +41,16 @@ struct FromPrior {
             let issKid = try extractFromPriorKid(fromPriorJwt: fromPriorJwt)
         else { return (message, nil) }
         let key = try await keySelector.findVerificationKey(signFrom: issKid)
-        let jwt = try JWT<DefaultJWTClaimsImpl>.verify(jwtString: fromPriorJwt, senderKey: key.jwk)
+        let jwt = try JWT.verify(jwtString: fromPriorJwt, senderKey: key.jwk)
+        let payload: DefaultJWTClaimsImpl = try JWT.getPayload(jwtString: fromPriorJwt)
         let newFromPrior = Message.FromPrior(
-            iss: jwt.payload.iss,
-            sub: jwt.payload.sub,
-            aud: jwt.payload.aud?.first,
-            exp: jwt.payload.exp,
-            nbf: jwt.payload.nbf,
-            iat: jwt.payload.iat,
-            jti: jwt.payload.jti
+            iss: payload.iss,
+            sub: payload.sub,
+            aud: payload.aud?.first,
+            exp: payload.exp,
+            nbf: payload.nbf,
+            iat: payload.iat,
+            jti: payload.jti
         )
 
         let updatedMessage = message