[fix] added sdjwt vc dpop test

eu-digital-identity-wallet · Dec 4, 2024 · 718617e · 718617e
1 parent ec332d9
commit 718617e
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 9 deletions.
diff --git a/Sources/Extensions/HTTPURLResponse+Extensions.swift b/Sources/Extensions/HTTPURLResponse+Extensions.swift
@@ -15,9 +15,9 @@
  */
 import Foundation
 
-extension HTTPURLResponse {
+public extension HTTPURLResponse {
 
-  func valueForHeader(_ header: String) -> String? {
+  private func valueForHeader(_ header: String) -> String? {
     let lowercasedHeader = header.lowercased()
     for (key, value) in allHeaderFields {
       if let keyString = key as? String, keyString.lowercased() == lowercasedHeader {
@@ -28,7 +28,7 @@ extension HTTPURLResponse {
   }
 
   func containsDpopError() -> Bool {
-    guard statusCode == 401,
+    guard statusCode == HTTPStatusCode.unauthorized,
           let wwwAuth = valueForHeader("WWW-Authenticate") else {
       return false
     }

diff --git a/Sources/Utilities/RemoteDataAccess/Fetcher.swift b/Sources/Utilities/RemoteDataAccess/Fetcher.swift
@@ -86,7 +86,7 @@ public struct Fetcher<Element: Decodable>: Fetching {
       let (data, response) = try await self.session.data(from: url)
 
       let statusCode = (response as? HTTPURLResponse)?.statusCode ?? 0
-      if !statusCode.isWithinRange(200...299) {
+      if !statusCode.isWithinRange(HTTPStatusCode.ok...HTTPStatusCode.imUsed) {
         throw FetchError.invalidStatusCode(url, statusCode)
       }
       let object = try JSONDecoder().decode(Element.self, from: data)
@@ -108,7 +108,7 @@ public struct Fetcher<Element: Decodable>: Fetching {
       let (data, response) = try await self.session.data(from: url)
 
       let statusCode = (response as? HTTPURLResponse)?.statusCode ?? 0
-      if !statusCode.isWithinRange(200...299) {
+      if !statusCode.isWithinRange(HTTPStatusCode.ok...HTTPStatusCode.imUsed) {
         throw FetchError.invalidStatusCode(url, statusCode)
       }
 

diff --git a/Sources/Utilities/RemoteDataAccess/Poster.swift b/Sources/Utilities/RemoteDataAccess/Poster.swift
@@ -116,7 +116,7 @@ public struct Poster: PostingType {
       let httpResponse = (response as? HTTPURLResponse)
       let headers = httpResponse?.allHeaderFields ?? [:]
 
-      if statusCode >= 400 && statusCode < 500 {
+      if statusCode >= HTTPStatusCode.badRequest && statusCode < HTTPStatusCode.internalServerError {
         if let httpResponse,
            httpResponse.containsDpopError(),
            let dPopNonce = headers["DPoP-Nonce"] as? String {
@@ -127,7 +127,7 @@ public struct Poster: PostingType {
           return .failure(.response(object))
         }
 
-      } else if statusCode >= 500 && statusCode < 599 {
+      } else if statusCode >= HTTPStatusCode.internalServerError {
         return .failure(.serverError)
       }
 
@@ -140,7 +140,7 @@ public struct Poster: PostingType {
           )
         )
       } catch {
-        if statusCode == 200, let string = String(data: data, encoding: .utf8) {
+        if statusCode == HTTPStatusCode.ok, let string = String(data: data, encoding: .utf8) {
           return .failure(.cannotParse(string))
         } else {
           return .failure(.networkError(error))
@@ -166,7 +166,9 @@ public struct Poster: PostingType {
     do {
       let (_, response) = try await self.session.data(for: request)
 
-      return .success((response as? HTTPURLResponse)?.statusCode.isWithinRange(200...299) ?? false)
+      return .success((response as? HTTPURLResponse)?.statusCode.isWithinRange(
+        HTTPStatusCode.ok...HTTPStatusCode.imUsed
+      ) ?? false)
     } catch let error as NSError {
       return .failure(.networkError(error))
     } catch {

diff --git a/Tests/Wallet/VCIFlowWithOffer.swift b/Tests/Wallet/VCIFlowWithOffer.swift
@@ -300,6 +300,55 @@ class VCIFlowWithOffer: XCTestCase {
 
     XCTAssert(true)
   }
+
+  func testWithOfferSdJwtDPoP() async throws {
+
+    let privateKey = try KeyController.generateECDHPrivateKey()
+    let publicKey = try KeyController.generateECDHPublicKey(from: privateKey)
+
+    let alg = JWSAlgorithm(.ES256)
+    let publicKeyJWK = try ECPublicKey(
+      publicKey: publicKey,
+      additionalParameters: [
+        "alg": alg.name,
+        "use": "sig",
+        "kid": UUID().uuidString
+      ])
+
+    let privateKeyProxy: SigningKeyProxy = .secKey(privateKey)
+    let bindingKey: BindingKey = .jwk(
+      algorithm: alg,
+      jwk: publicKeyJWK,
+      privateKey: privateKeyProxy
+    )
+
+    let user = ActingUser(
+      username: "tneal",
+      password: "password"
+    )
+
+    let wallet = Wallet(
+      actingUser: user,
+      bindingKeys: [bindingKey],
+      dPoPConstructor: DPoPConstructor(
+        algorithm: alg,
+        jwk: publicKeyJWK,
+        privateKey: privateKeyProxy
+      )
+    )
+
+    do {
+      try await walletInitiatedIssuanceWithOfferSDJWT_DPoP(
+        wallet: wallet
+      )
+    } catch {
+
+      XCTExpectFailure()
+      XCTAssert(false, error.localizedDescription)
+    }
+
+    XCTAssert(true)
+  }
 }
 
 private func walletInitiatedIssuanceWithOfferSdJWT(
@@ -353,6 +402,23 @@ private func walletInitiatedIssuanceWithOfferMDL_DPoP(
   print("--> [ISSUANCE] Issued credential : \(credential)")
 }
 
+private func walletInitiatedIssuanceWithOfferSDJWT_DPoP(
+  wallet: Wallet,
+  claimSet: ClaimSet? = nil
+) async throws {
+
+  print("[[Scenario: Offer passed to wallet via url]] ")
+
+  let url = "\(CREDENTIAL_ISSUER_PUBLIC_URL)/credentialoffer?credential_offer=\(SdJwtVC_CredentialOffer)"
+  let credential = try await wallet.issueByCredentialOfferUrl_DPoP(
+    offerUri: url,
+    scope: PID_SdJwtVC_config_id,
+    claimSet: claimSet
+  )
+
+  print("--> [ISSUANCE] Issued credential : \(credential)")
+}
+
 private func walletInitiatedIssuanceWithOfferMdoc(
   wallet: Wallet,
   claimSet: ClaimSet? = nil