savepoint

WalletConnect · Aug 12, 2024 · a009088 · a009088
1 parent bd983cb
commit a009088
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/Sources/WalletConnectSign/Auth/Link/ApproveSessionAuthenticateUtil.swift b/Sources/WalletConnectSign/Auth/Link/ApproveSessionAuthenticateUtil.swift
@@ -123,7 +123,7 @@ class ApproveSessionAuthenticateUtil {
 
 
     func getVerifyContext(requestId: RPCID, domain: String) -> VerifyContext {
-        (try? verifyContextStore.get(key: requestId.string)) ?? verifyClient.createVerifyContext(origin: nil, domain: domain, isScam: false)
+        (try? verifyContextStore.get(key: requestId.string)) ?? verifyClient.createVerifyContext(origin: nil, domain: domain, isScam: false, isVerified: nil)
     }
 
 

diff --git a/Sources/WalletConnectSign/Auth/Services/Wallet/AuthRequestSubscriber.swift b/Sources/WalletConnectSign/Auth/Services/Wallet/AuthRequestSubscriber.swift
@@ -64,11 +64,11 @@ class AuthRequestSubscriber {
                             let assertionId = payload.decryptedPayload.sha256().toHexString()
                             response = try await verifyClient.verify(.v1(assertionId: assertionId))
                         }
-                        let verifyContext = verifyClient.createVerifyContext(origin: response.origin, domain: payload.request.authPayload.domain, isScam: response.isScam)
+                        let verifyContext = verifyClient.createVerifyContext(origin: response.origin, domain: payload.request.authPayload.domain, isScam: response.isScam, isVerified: response.isVerified)
                         verifyContextStore.set(verifyContext, forKey: request.id.string)
                         onRequest?((request, verifyContext))
                     } catch {
-                        let verifyContext = verifyClient.createVerifyContext(origin: nil, domain: payload.request.authPayload.domain, isScam: nil)
+                        let verifyContext = verifyClient.createVerifyContext(origin: nil, domain: payload.request.authPayload.domain, isScam: nil, isVerified: nil)
                         verifyContextStore.set(verifyContext, forKey: request.id.string)
                         onRequest?((request, verifyContext))
                         return

diff --git a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
@@ -226,7 +226,7 @@ final class ApproveEngine {
             expiry: Int64(expiry)
         )
 
-        let verifyContext = (try? verifyContextStore.get(key: proposal.proposer.publicKey)) ?? verifyClient.createVerifyContext(origin: nil, domain: proposal.proposer.metadata.url, isScam: false)
+        let verifyContext = (try? verifyContextStore.get(key: proposal.proposer.publicKey)) ?? verifyClient.createVerifyContext(origin: nil, domain: proposal.proposer.metadata.url, isScam: false, isVerified: nil)
 
 
         let session = WCSession(
@@ -411,12 +411,13 @@ private extension ApproveEngine {
                 let verifyContext = verifyClient.createVerifyContext(
                     origin: response.origin,
                     domain: payload.request.proposer.metadata.url,
-                    isScam: response.isScam
+                    isScam: response.isScam,
+                    isVerified: response.isVerified
                 )
                 verifyContextStore.set(verifyContext, forKey: proposal.proposer.publicKey)
                 onSessionProposal?(proposal.publicRepresentation(pairingTopic: payload.topic), verifyContext)
             } catch {
-                let verifyContext = verifyClient.createVerifyContext(origin: nil, domain: payload.request.proposer.metadata.url, isScam: nil)
+                let verifyContext = verifyClient.createVerifyContext(origin: nil, domain: payload.request.proposer.metadata.url, isScam: nil, isVerified: nil)
                 onSessionProposal?(proposal.publicRepresentation(pairingTopic: payload.topic), verifyContext)
                 return
             }

diff --git a/Sources/WalletConnectVerify/AttestationJWTVerifier.swift b/Sources/WalletConnectVerify/AttestationJWTVerifier.swift
@@ -44,7 +44,7 @@ class AttestationJWTVerifier {
             throw Errors.messageIdMismatch
         }
 
-        return VerifyResponse(origin: claims.origin, isScam: claims.isScam)
+        return VerifyResponse(origin: claims.origin, isScam: claims.isScam, isVerified: claims.isVerified)
     }
 
     func verifyJWTAgainstPubKey(_ jwtString: String, signingPubKey: P256.Signing.PublicKey) throws {

diff --git a/Sources/WalletConnectVerify/Register/VerifyResponse.swift b/Sources/WalletConnectVerify/Register/VerifyResponse.swift
@@ -3,4 +3,5 @@ import Foundation
 public struct VerifyResponse: Decodable {
     public let origin: String?
     public let isScam: Bool?
+    public let isVerified: Bool?
 }
diff --git a/Sources/WalletConnectVerify/VerifyClient.swift b/Sources/WalletConnectVerify/VerifyClient.swift
@@ -3,7 +3,7 @@ import Foundation
 
 public protocol VerifyClientProtocol {
     func verify(_ verificationType: VerificationType) async throws -> VerifyResponse
-    func createVerifyContext(origin: String?, domain: String, isScam: Bool?) -> VerifyContext
+    func createVerifyContext(origin: String?, domain: String, isScam: Bool?, isVerified: Bool?) -> VerifyContext
     func createVerifyContextForLinkMode(redirectUniversalLink: String, domain: String) -> VerifyContext
 }
 
@@ -53,8 +53,8 @@ public actor VerifyClient: VerifyClientProtocol {
         }
     }
 
-    nonisolated public func createVerifyContext(origin: String?, domain: String, isScam: Bool?) -> VerifyContext {
-        verifyContextFactory.createVerifyContext(origin: origin, domain: domain, isScam: isScam)
+    nonisolated public func createVerifyContext(origin: String?, domain: String, isScam: Bool?, isVerified: Bool?) -> VerifyContext {
+        verifyContextFactory.createVerifyContext(origin: origin, domain: domain, isScam: isScam, isVerified: isVerified)
     }
 
     nonisolated public func createVerifyContextForLinkMode(redirectUniversalLink: String, domain: String) -> VerifyContext {
@@ -69,14 +69,13 @@ public actor VerifyClient: VerifyClientProtocol {
 #if DEBUG
 
 public struct VerifyClientMock: VerifyClientProtocol {
-
     public init() {}
 
     public func verify(_ verificationType: VerificationType) async throws -> VerifyResponse {
-        return VerifyResponse(origin: "domain.com", isScam: nil)
+        return VerifyResponse(origin: "domain.com", isScam: nil, isVerified: nil)
     }
 
-    public func createVerifyContext(origin: String?, domain: String, isScam: Bool?) -> VerifyContext {
+    public func createVerifyContext(origin: String?, domain: String, isScam: Bool?, isVerified: Bool?) -> VerifyContext {
         return VerifyContext(origin: "domain.com", validation: .valid)
     }
 

diff --git a/Sources/WalletConnectVerify/VerifyContextFactory.swift b/Sources/WalletConnectVerify/VerifyContextFactory.swift
@@ -2,7 +2,7 @@
 import Foundation
 
 class VerifyContextFactory {
-    public func createVerifyContext(origin: String?, domain: String, isScam: Bool?, isVerified: Bool? = nil) -> VerifyContext {
+    public func createVerifyContext(origin: String?, domain: String, isScam: Bool?, isVerified: Bool?) -> VerifyContext {
 
         guard isScam != true else {
             return VerifyContext(

diff --git a/Tests/VerifyTests/VerifyContextFactoryTests.swift b/Tests/VerifyTests/VerifyContextFactoryTests.swift
@@ -17,22 +17,22 @@ class VerifyContextFactoryTests: XCTestCase {
     }
 
     func testScamValidation() {
-        let context = factory.createVerifyContext(origin: "http://example.com", domain: "http://example.com", isScam: true)
+        let context = factory.createVerifyContext(origin: "http://example.com", domain: "http://example.com", isScam: true, isVerified: nil)
         XCTAssertEqual(context.validation, .scam)
     }
 
     func testValidOriginAndDomain() {
-        let context = factory.createVerifyContext(origin: "http://example.com", domain: "http://example.com", isScam: false)
+        let context = factory.createVerifyContext(origin: "http://example.com", domain: "http://example.com", isScam: false, isVerified: nil)
         XCTAssertEqual(context.validation, .valid)
     }
 
     func testInvalidOriginAndDomain() {
-        let context = factory.createVerifyContext(origin: "http://example.com", domain: "http://different.com", isScam: false)
+        let context = factory.createVerifyContext(origin: "http://example.com", domain: "http://different.com", isScam: false, isVerified: nil)
         XCTAssertEqual(context.validation, .invalid)
     }
 
     func testUnknownValidation() {
-        let context = factory.createVerifyContext(origin: nil, domain: "http://example.com", isScam: false)
+        let context = factory.createVerifyContext(origin: nil, domain: "http://example.com", isScam: false, isVerified: nil)
         XCTAssertEqual(context.validation, .unknown)
     }