#379 auth core types

.swiftpm/xcode/xcshareddata/xcschemes/AuthTests.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AuthTests"
+               BuildableName = "AuthTests"
+               BlueprintName = "AuthTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/IntegrationTests/Relay/RelayClientEndToEndTests.swift

@@ -22,7 +22,7 @@ final class RelayClientEndToEndTests: XCTestCase {
         )
         let urlFactory = RelayUrlFactory(socketAuthenticator: socketAuthenticator)
         let socket = WebSocket(url: urlFactory.create(host: relayHost, projectId: projectId))
-        
+
         let logger = ConsoleLogger()
         let dispatcher = Dispatcher(socket: socket, socketConnectionHandler: ManualSocketConnectionHandler(socket: socket), logger: logger)
         return RelayClient(dispatcher: dispatcher, logger: logger, keyValueStorage: RuntimeKeyValueStorage())

Example/Showcase/Classes/PresentationLayer/Import/ImportInteractor.swift

@@ -1,4 +1,3 @@
-
 final class ImportInteractor {
     private let registerService: RegisterService
     private let accountStorage: AccountStorage

Package.swift

@@ -27,6 +27,10 @@ let package = Package(
             name: "Chat",
             dependencies: ["WalletConnectRelay", "WalletConnectUtils", "WalletConnectKMS"],
             path: "Sources/Chat"),
+        .target(
+            name: "Auth",
+            dependencies: ["WalletConnectRelay", "WalletConnectUtils", "WalletConnectKMS"],
+            path: "Sources/Auth"),
         .target(
             name: "WalletConnectRelay",
             dependencies: ["WalletConnectUtils", "WalletConnectKMS"],
@@ -50,6 +54,9 @@ let package = Package(
         .testTarget(
             name: "ChatTests",
             dependencies: ["Chat", "WalletConnectUtils", "TestingUtils"]),
+        .testTarget(
+            name: "AuthTests",
+            dependencies: ["Auth", "WalletConnectUtils", "TestingUtils"]),
         .testTarget(
             name: "RelayerTests",
             dependencies: ["WalletConnectRelay", "WalletConnectUtils", "TestingUtils"]),

Sources/Auth/AuthClient.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+class AuthClient {
+
+}

Sources/Auth/Services/App/AuthRequestService.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+actor AuthRequestService {
+
+    func request(params: RequestParams, topic: String) async throws {
+
+    }
+}

Sources/Auth/Services/App/CreatePairingService.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+actor CreatePairingService {
+
+    func create() async throws -> WalletConnectURI {
+        fatalError("not implemented")
+    }
+}

Sources/Auth/Services/Wallet/AuthService.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+actor AuthService {
+
+    func respond(respondParams: RespondParams) async throws {
+
+    }
+}

Sources/Auth/Services/Wallet/PairService.swift

@@ -0,0 +1,8 @@
+import Foundation
+
+actor PairService {
+
+    func pair(_ uri: WalletConnectURI) async throws {
+        fatalError("not implemented")
+    }
+}

Sources/Auth/Types/AuthPayloadParams.swift

@@ -0,0 +1,16 @@
+import Foundation
+
+struct AuthPayloadParams {
+    let type: String
+    let chainId: String
+    let domain: String
+    let aud: String
+    let version: String
+    let nonce: String
+    let iat: String
+    let nbf: String?
+    let exp: String?
+    let statement: String?
+    let requestId: String?
+    let resources: String?
+}

Sources/Auth/Types/Cacao/CacaoHeader.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+struct CacaoHeader {
+    let t: String
+}

Sources/Auth/Types/Cacao/CacaoPayload.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+struct CacaoPayload {
+    let iss: String
+    let domain: String
+    let aud: String
+    let version: String
+    let nonce: String
+    let iat: String
+    let nbf: String
+    let exp: String
+    let statement: String
+    let requestId: String
+    let resources: String
+}

Sources/Auth/Types/Cacao/CacaoSignature.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+struct CacaoSignature {
+    let t: String
+    let s: String
+    let m: String
+}

Sources/Auth/Types/RelayProtocolOptions.swift

@@ -0,0 +1,6 @@
+//
+
+import Foundation
+import WalletConnectUtils
+
+typealias RelayProtocolOptions = WalletConnectUtils.RelayProtocolOptions

Sources/Auth/Types/RequestParams.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+struct RequestParams {
+    let domain: String
+    let chainId: String
+    let nonce: String
+    let aud: String
+    let nbf: String?
+    let exp: String?
+    let statement: String?
+    let requestId: String?
+    let resources: String?
+}

Sources/Auth/Types/RespondParams.swift

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

Sources/Auth/Types/WalletConnectURI.swift

@@ -0,0 +1,6 @@
+//
+
+import Foundation
+import WalletConnectUtils
+
+typealias WalletConnectURI = WalletConnectUtils.WalletConnectURI

Sources/WalletConnectSign/Types/RelayProtocolOptions.swift

@@ -0,0 +1,6 @@
+//     
+
+import Foundation
+import WalletConnectUtils
+
+typealias RelayProtocolOptions = WalletConnectUtils.RelayProtocolOptions

Sources/WalletConnectSign/Types/Session/WCSession.swift

@@ -57,7 +57,7 @@ struct WCSession: SequenceObject, Equatable {
         peerParticipant: Participant,
         namespaces: [String: SessionNamespace],
         requiredNamespaces: [String: ProposalNamespace],
-        events: Set<String>, 
+        events: Set<String>,
         accounts: Set<Account>,
         acknowledged: Bool,
         expiry: Int64

Sources/WalletConnectSign/Types/WalletConnectURI.swift

@@ -1,50 +1,6 @@
-import Foundation
-
-public struct WalletConnectURI: Equatable {
-
-    let topic: String
-    let version: String
-    let symKey: String
-    let relay: RelayProtocolOptions
-
-    init(topic: String, symKey: String, relay: RelayProtocolOptions) {
-        self.version = "2"
-        self.topic = topic
-        self.symKey = symKey
-        self.relay = relay
-    }
+//     
 
-    public init?(string: String) {
-        guard string.hasPrefix("wc:") else {
-            return nil
-        }
-        let urlString = !string.hasPrefix("wc://") ? string.replacingOccurrences(of: "wc:", with: "wc://") : string
-        guard let components = URLComponents(string: urlString) else {
-            return nil
-        }
-        let query: [String: String]? = components.queryItems?.reduce(into: [:]) { $0[$1.name] = $1.value }
-
-        guard let topic = components.user,
-              let version = components.host,
-              let symKey = query?["symKey"],
-              let relayProtocol = query?["relay-protocol"]
-        else { return nil }
-        let relayData = query?["relay-data"]
-        self.version = version
-        self.topic = topic
-        self.symKey = symKey
-        self.relay = RelayProtocolOptions(protocol: relayProtocol, data: relayData)
-    }
-
-    public var absoluteString: String {
-        return "wc:\(topic)@\(version)?symKey=\(symKey)&\(relayQuery)"
-    }
+import Foundation
+import WalletConnectUtils
 
-    private var relayQuery: String {
-        var query = "relay-protocol=\(relay.protocol)"
-        if let relayData = relay.data {
-            query = "\(query)&relay-data=\(relayData)"
-        }
-        return query
-    }
-}
+typealias WalletConnectURI = WalletConnectUtils.WalletConnectURI

Sources/WalletConnectUtils/RelayProtocolOptions.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+public struct RelayProtocolOptions: Codable, Equatable {
+    public let `protocol`: String
+    public let data: String?
+
+    public init(protocol: String, data: String?) {
+        self.protocol = `protocol`
+        self.data = data
+    }
+}

Sources/WalletConnectUtils/WalletConnectURI.swift

@@ -0,0 +1,50 @@
+import Foundation
+
+public struct WalletConnectURI: Equatable {
+
+    public let topic: String
+    public let version: String
+    public let symKey: String
+    public let relay: RelayProtocolOptions
+
+    public init(topic: String, symKey: String, relay: RelayProtocolOptions) {
+        self.version = "2"
+        self.topic = topic
+        self.symKey = symKey
+        self.relay = relay
+    }
+
+    public init?(string: String) {
+        guard string.hasPrefix("wc:") else {
+            return nil
+        }
+        let urlString = !string.hasPrefix("wc://") ? string.replacingOccurrences(of: "wc:", with: "wc://") : string
+        guard let components = URLComponents(string: urlString) else {
+            return nil
+        }
+        let query: [String: String]? = components.queryItems?.reduce(into: [:]) { $0[$1.name] = $1.value }
+
+        guard let topic = components.user,
+              let version = components.host,
+              let symKey = query?["symKey"],
+              let relayProtocol = query?["relay-protocol"]
+        else { return nil }
+        let relayData = query?["relay-data"]
+        self.version = version
+        self.topic = topic
+        self.symKey = symKey
+        self.relay = RelayProtocolOptions(protocol: relayProtocol, data: relayData)
+    }
+
+    public var absoluteString: String {
+        return "wc:\(topic)@\(version)?symKey=\(symKey)&\(relayQuery)"
+    }
+
+    private var relayQuery: String {
+        var query = "relay-protocol=\(relay.protocol)"
+        if let relayData = relay.data {
+            query = "\(query)&relay-data=\(relayData)"
+        }
+        return query
+    }
+}

Tests/AuthTests/AuthClientTest.swift

@@ -0,0 +1,6 @@
+import Foundation
+import XCTest
+
+class AuthClientTest: XCTestCase {
+
+}

Tests/RelayerTests/DispatcherTests.swift

@@ -7,7 +7,6 @@ import Combine
 class WebSocketMock: WebSocketConnecting {
     var request: URLRequest = URLRequest(url: URL(string: "wss://relay.walletconnect.com")!)
 
-
     var onText: ((String) -> Void)?
     var onConnect: (() -> Void)?
     var onDisconnect: ((Error?) -> Void)?