[Auth] #377 Auth respond service

Example/IntegrationTests/Chat/ChatTests.swift

@@ -15,7 +15,7 @@ final class ChatTests: XCTestCase {
     override func setUp() {
         registry = KeyValueRegistry()
         invitee = makeClient(prefix: "🦖 Registered")
-        inviter = makeClient(prefix: "🍄 Inviter") 
+        inviter = makeClient(prefix: "🍄 Inviter")
 
         waitClientsConnected()
     }

Package.swift

@@ -18,7 +18,7 @@ let package = Package(
             targets: ["Chat"]),
         .library(
             name: "WalletConnectPairing",
-            targets: ["WalletConnectPairing"]),
+            targets: ["WalletConnectPairing"])
     ],
     dependencies: [],
     targets: [

Sources/Auth/Services/App/AuthRequestService.swift

@@ -24,8 +24,7 @@ actor AuthRequestService {
         let payload = AuthPayload(requestParams: params, iat: issueAt)
         let params = AuthRequestParams(requester: requester, payloadParams: payload)
         let request = RPCRequest(method: "wc_authRequest", params: params)
-        try await networkingInteractor.request(request, topic: topic)
+        try await networkingInteractor.request(request, topic: topic, tag: AuthRequestParams.tag)
         try await networkingInteractor.subscribe(topic: responseTopic)
     }
 }
-

Sources/Auth/Services/Common/CacaoFormatter.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+protocol CacaoFormatting {
+    func format(_ request: AuthRequestParams, _ signature: CacaoSignature, _ issuer: Account) -> Cacao
+}
+
+class CacaoFormatter: CacaoFormatting {
+    func format(_ request: AuthRequestParams, _ signature: CacaoSignature, _ issuer: Account) -> Cacao {
+        fatalError("not implemented")
+    }
+}

Sources/Auth/Services/Common/NetworkingInteractor.swift

@@ -8,16 +8,16 @@ import JSONRPC
 protocol NetworkInteracting {
     var requestPublisher: AnyPublisher<RequestSubscriptionPayload, Never> {get}
     func subscribe(topic: String) async throws
-    func request(_ request: RPCRequest, topic: String, envelopeType: Envelope.EnvelopeType) async throws
+    func request(_ request: RPCRequest, topic: String, tag: Int, envelopeType: Envelope.EnvelopeType) async throws
+    func respond(topic: String, response: RPCResponse, tag: Int, envelopeType: Envelope.EnvelopeType) async throws
 }
 
 extension NetworkInteracting {
-    func request(_ request: RPCRequest, topic: String, envelopeType: Envelope.EnvelopeType = .type0) async throws {
-        try await self.request(request, topic: topic, envelopeType: envelopeType)
+    func request(_ request: RPCRequest, topic: String, tag: Int, envelopeType: Envelope.EnvelopeType = .type0) async throws {
+        try await self.request(request, topic: topic, tag: tag, envelopeType: envelopeType)
     }
 }
 
-
 class NetworkingInteractor: NetworkInteracting {
     private let relayClient: RelayClient
     private let serializer: Serializing
@@ -39,9 +39,15 @@ class NetworkingInteractor: NetworkInteracting {
         try await relayClient.subscribe(topic: topic)
     }
 
-    func request(_ request: RPCRequest, topic: String, envelopeType: Envelope.EnvelopeType) async throws {
+    func request(_ request: RPCRequest, topic: String, tag: Int, envelopeType: Envelope.EnvelopeType) async throws {
         try rpcHistory.set(request, forTopic: topic, emmitedBy: .local)
         let message = try! serializer.serialize(topic: topic, encodable: request, envelopeType: envelopeType)
-        try await relayClient.publish(topic: topic, payload: message, tag: AuthRequestParams.tag)
+        try await relayClient.publish(topic: topic, payload: message, tag: tag)
+    }
+
+    func respond(topic: String, response: RPCResponse, tag: Int, envelopeType: Envelope.EnvelopeType) async throws {
+        try rpcHistory.resolve(response)
+        let message = try! serializer.serialize(topic: topic, encodable: response, envelopeType: envelopeType)
+        try await relayClient.publish(topic: topic, payload: message, tag: tag)
     }
 }

Sources/Auth/Services/Wallet/AuthRequestSubscriber.swift

@@ -7,7 +7,7 @@ class AuthRequestSubscriber {
     private let logger: ConsoleLogging
     private var publishers = [AnyCancellable]()
     private let messageFormatter: SIWEMessageFormatting
-    var onRequest: ((_ id: Int64, _ message: String)->())?
+    var onRequest: ((_ id: Int64, _ message: String)->Void)?
 
     init(networkingInteractor: NetworkInteracting,
          logger: ConsoleLogging,
@@ -21,17 +21,18 @@ class AuthRequestSubscriber {
     private func subscribeForRequest() {
         networkingInteractor.requestPublisher.sink { [unowned self] subscriptionPayload in
             guard subscriptionPayload.request.method == "wc_authRequest" else { return }
-            guard let authRequest = try? subscriptionPayload.request.params?.get(AuthRequestParams.self) else {
+            guard let authRequestParams = try? subscriptionPayload.request.params?.get(AuthRequestParams.self) else {
                 logger.debug("Malformed auth request params")
                 return
             }
             do {
-                let message = try messageFormatter.formatMessage(from: authRequest)
+                let message = try messageFormatter.formatMessage(from: authRequestParams)
                 guard let requestId = subscriptionPayload.request.id?.right else { return }
                 onRequest?(requestId, message)
             } catch {
                 logger.debug(error)
             }
         }.store(in: &publishers)
     }
+
 }

Sources/Auth/Services/Wallet/AuthRespondService.swift

@@ -1,13 +1,41 @@
 import Foundation
+import WalletConnectKMS
+import JSONRPC
+import WalletConnectUtils
 
 actor AuthRespondService {
+    enum Errors: Error {
+        case recordForIdNotFound
+        case malformedAuthRequestParams
+    }
     private let networkingInteractor: NetworkInteracting
+    private let kms: KeyManagementService
+    private let rpcHistory: RPCHistory
+    private let logger: ConsoleLogging
 
-    init(networkingInteractor: NetworkInteracting) {
+    init(networkingInteractor: NetworkInteracting,
+         logger: ConsoleLogging,
+         kms: KeyManagementService,
+         rpcHistory: RPCHistory) {
         self.networkingInteractor = networkingInteractor
+        self.logger = logger
+        self.kms = kms
+        self.rpcHistory = rpcHistory
     }
 
-    func respond(respondParams: RespondParams) async throws {
+    func respond(respondParams: RespondParams, issuer: Account) async throws {
+        guard let request = rpcHistory.get(recordId: RPCID(respondParams.id))?.request else { throw Errors.recordForIdNotFound }
+        guard let authRequestParams = try? request.params?.get(AuthRequestParams.self) else { throw Errors.malformedAuthRequestParams }
+
+        let peerPubKey = authRequestParams.requester.publicKey
+        let responseTopic = peerPubKey.rawRepresentation.sha256().toHexString()
+        let selfPubKey = try kms.createX25519KeyPair()
+        let agreementKeys = try kms.performKeyAgreement(selfPublicKey: selfPubKey, peerPublicKey: peerPubKey)
+        try kms.setAgreementSecret(agreementKeys, topic: responseTopic)
+
+        let cacao = CacaoFormatter().format(authRequestParams, respondParams.signature, issuer)
+        let response = RPCResponse(id: request.id!, result: cacao)
 
+        try await networkingInteractor.respond(topic: respondParams.topic, response: response, tag: AuthResponseParams.tag, envelopeType: .type1(pubKey: selfPubKey.rawRepresentation))
     }
 }

Sources/Auth/Types/Cacao/Cacao.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+struct Cacao: Codable, Equatable {
+    let header: CacaoHeader
+    let payload: CacaoPayload
+    let signature: CacaoSignature
+}

Sources/Auth/Types/ProtocolRPCParams/AuthRequestParams.swift

@@ -1,4 +1,3 @@
-
 import Foundation
 import WalletConnectUtils
 

Sources/Auth/Types/ProtocolRPCParams/AuthResponseParams.swift

@@ -1,4 +1,3 @@
-
 import Foundation
 import WalletConnectUtils
 

Sources/Auth/Types/RequestSubscriptionPayload.swift

@@ -2,6 +2,6 @@ import Foundation
 import JSONRPC
 
 struct RequestSubscriptionPayload: Codable {
-    let topic: String
+    let id: Int64
     let request: RPCRequest
 }

Sources/Auth/Types/RespondParams.swift

@@ -1,6 +1,7 @@
 import Foundation
 
 struct RespondParams {
+    let id: Int64
     let topic: String
     let signature: CacaoSignature
 }

Sources/Chat/ChatClientFactory.swift

@@ -10,8 +10,7 @@ public struct ChatClientFactory {
         relayClient: RelayClient,
         kms: KeyManagementService,
         logger: ConsoleLogging,
-        keyValueStorage: KeyValueStorage) -> ChatClient
-    {
+        keyValueStorage: KeyValueStorage) -> ChatClient {
         let topicToRegistryRecordStore = CodableStore<RegistryRecord>(defaults: keyValueStorage, identifier: StorageDomainIdentifiers.topicToInvitationPubKey.rawValue)
         let serialiser = Serializer(kms: kms)
         let jsonRpcHistory = JsonRpcHistory<ChatRequestParams>(logger: logger, keyValueStore: CodableStore<JsonRpcRecord>(defaults: keyValueStorage, identifier: StorageDomainIdentifiers.jsonRpcHistory.rawValue))

Sources/JSONRPC/RPCResponse.swift

@@ -43,6 +43,10 @@ public struct RPCResponse: Equatable {
         self.init(id: RPCID(id), outcome: .success(AnyCodable(result)))
     }
 
+    public init<C>(id: RPCID, result: C) where C: Codable {
+        self.init(id: id, outcome: .success(AnyCodable(result)))
+    }
+
     public init(id: Int64, error: JSONRPCError) {
         self.init(id: RPCID(id), outcome: .failure(error))
     }

Sources/WalletConnectUtils/RPCHistory.swift

@@ -10,8 +10,8 @@ public final class RPCHistory {
         let id: RPCID
         let topic: String
         let origin: Origin
-        let request: RPCRequest
-        var response: RPCResponse? = nil
+        public let request: RPCRequest
+        var response: RPCResponse?
     }
 
     enum HistoryError: Error {

Tests/AuthTests/Mocks/NetworkingInteractorMock.swift

@@ -1,16 +1,26 @@
 import Foundation
 import Combine
 @testable import Auth
+import JSONRPC
+import WalletConnectKMS
 
 struct NetworkingInteractorMock: NetworkInteracting {
+
     let requestPublisherSubject = PassthroughSubject<RequestSubscriptionPayload, Never>()
     var requestPublisher: AnyPublisher<RequestSubscriptionPayload, Never> {
         requestPublisherSubject.eraseToAnyPublisher()
     }
-    
+
     func subscribe(topic: String) async throws {
-
+
+    }
+
+    func request(_ request: RPCRequest, topic: String, tag: Int, envelopeType: Envelope.EnvelopeType) async throws {
+
     }
 
+    func respond(topic: String, response: RPCResponse, tag: Int, envelopeType: Envelope.EnvelopeType) async throws {
+
+    }
 
 }

Tests/AuthTests/Mocks/SIWEMessageFormatterMock.swift

@@ -7,4 +7,3 @@ class SIWEMessageFormatterMock: SIWEMessageFormatting {
         return formattedMessage
     }
 }
-

Tests/AuthTests/Stubs/RequestSubscriptionPayload.swift

@@ -10,7 +10,6 @@ extension RequestSubscriptionPayload {
         let payload = AuthPayload(requestParams: RequestParams.stub(), iat: issueAt)
         let params = AuthRequestParams(requester: requester, payloadParams: payload)
         let request = RPCRequest(method: "wc_authRequest", params: params, id: id)
-        return RequestSubscriptionPayload(topic: "", request: request)
+        return RequestSubscriptionPayload(id: 123, request: request)
     }
 }
-

Tests/WalletConnectSignTests/ApproveEngineTests.swift

@@ -64,7 +64,7 @@ final class ApproveEngineTests: XCTestCase {
         XCTAssertTrue(networkingInteractor.didCallSubscribe)
         XCTAssert(cryptoMock.hasAgreementSecret(for: topicB), "Responder must store agreement key for topic B")
         XCTAssertEqual(networkingInteractor.didRespondOnTopic!, topicA, "Responder must respond on topic A")
-        XCTAssertEqual(extendedPairing.expiryDate.timeIntervalSince1970,  Date(timeIntervalSinceNow: 2_592_000).timeIntervalSince1970, accuracy: 1, "pairing expiry has been extended by 30 days")
+        XCTAssertEqual(extendedPairing.expiryDate.timeIntervalSince1970, Date(timeIntervalSinceNow: 2_592_000).timeIntervalSince1970, accuracy: 1, "pairing expiry has been extended by 30 days")
     }
 
     func testReceiveProposal() {