Revert "!!! Replace Pythia BrainKey with Hash BrainKey"

This reverts commit 29d6659.

Package.resolved

@@ -18,6 +18,15 @@
         "version" : "7.0.0"
       }
     },
+    {
+      "identity" : "virgil-pythia-x",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/VirgilSecurity/virgil-pythia-x.git",
+      "state" : {
+        "revision" : "5b8eb3a4a8e891826d8a2c0d00e13a4b246aa596",
+        "version" : "0.12.0-dev.1"
+      }
+    },
     {
       "identity" : "virgil-ratchet-x",
       "kind" : "remoteSourceControl",

Package.swift

@@ -16,14 +16,19 @@ let package = Package(
     ],
 
     dependencies: [
-        .package(url: "https://github.com/VirgilSecurity/virgil-ratchet-x.git", exact: .init(0, 10, 0))
+        .package(
+            url: "https://github.com/VirgilSecurity/virgil-pythia-x.git",
+            exact: .init(0, 12, 0, prereleaseIdentifiers: ["dev", "1"])
+        ),
+        .package(url: "https://github.com/VirgilSecurity/virgil-ratchet-x.git", exact: .init(0, 10, 0)),
     ],
 
     targets: [
         .target(
             name: "VirgilE3Kit",
             dependencies: [
-                .product(name: "VirgilSDKRatchet", package: "virgil-ratchet-x")
+                .product(name: "VirgilSDKRatchet", package: "virgil-ratchet-x"),
+                .product(name: "VirgilSDKPythia", package: "virgil-pythia-x"),
             ],
             path: "Source"
         ),

Source/EThree.swift

@@ -196,7 +196,8 @@ import VirgilSDKRatchet
             identity: params.identity,
             crypto: crypto,
             accessTokenProvider: accessTokenProvider,
-            keyknoxServiceUrl: params.serviceUrls.keyknoxServiceUrl
+            keyknoxServiceUrl: params.serviceUrls.keyknoxServiceUrl,
+            pythiaServiceUrl: params.serviceUrls.pythiaServiceUrl
         )
 
         let sqliteCardStorage = try SQLiteCardStorage(

Source/Models/EThreeParams.swift

@@ -37,6 +37,7 @@
 import Foundation
 import VirgilCrypto
 import VirgilSDK
+import VirgilSDKPythia
 import VirgilSDKRatchet
 
 /// Contains parameters for initializing EThree
@@ -72,6 +73,9 @@ import VirgilSDKRatchet
         /// Card service URL
         @objc public var cardServiceUrl: URL
 
+        /// Pythia service URL
+        @objc public var pythiaServiceUrl: URL
+
         /// Keyknox service URL
         @objc public var keyknoxServiceUrl: URL
 
@@ -81,14 +85,17 @@ import VirgilSDKRatchet
         /// Init
         /// - Parameters:
         ///   - cardServiceUrl: Card service URL
+        ///   - pythiaServiceUrl: Pythia service URL
         ///   - keyknoxServiceUrl: Keyknox service URL
         ///   - ratchetServiceUrl: Ratchet service URL
         @objc public init(
             cardServiceUrl: URL,
+            pythiaServiceUrl: URL,
             keyknoxServiceUrl: URL,
             ratchetServiceUrl: URL
         ) {
             self.cardServiceUrl = cardServiceUrl
+            self.pythiaServiceUrl = pythiaServiceUrl
             self.keyknoxServiceUrl = keyknoxServiceUrl
             self.ratchetServiceUrl = ratchetServiceUrl
         }
@@ -215,6 +222,7 @@ import VirgilSDKRatchet
         self.tokenCallback = tokenCallback
         self.serviceUrls = ServiceUrls(
             cardServiceUrl: CardClient.defaultURL,
+            pythiaServiceUrl: PythiaClient.defaultURL,
             keyknoxServiceUrl: KeyknoxClient.defaultURL,
             ratchetServiceUrl: RatchetClient.defaultURL
         )

Source/Storages/Cloud/CloudKeyManager.swift

@@ -37,6 +37,7 @@
 import Foundation
 import VirgilCrypto
 import VirgilSDK
+import VirgilSDKPythia
 
 internal class CloudKeyManager {
     private let identity: String
@@ -53,7 +54,8 @@ internal class CloudKeyManager {
         identity: String,
         crypto: VirgilCrypto,
         accessTokenProvider: AccessTokenProvider,
-        keyknoxServiceUrl: URL
+        keyknoxServiceUrl: URL,
+        pythiaServiceUrl: URL
     ) throws {
         self.identity = identity
         self.crypto = crypto
@@ -70,7 +72,16 @@ internal class CloudKeyManager {
 
         self.keyknoxManager = try KeyknoxManager(keyknoxClient: keyknoxClient)
 
-        self.brainKey = BrainKey(crypto: self.crypto)
+        let pythiaClient = PythiaClient(
+            accessTokenProvider: self.accessTokenProvider,
+            serviceUrl: pythiaServiceUrl,
+            connection: connection,
+            retryConfig: ExpBackoffRetry.Config()
+        )
+
+        let brainKeyContext = try BrainKeyContext(client: pythiaClient)
+
+        self.brainKey = BrainKey(context: brainKeyContext)
     }
 
     internal func setUpCloudKeyStorage(password: String) throws -> CloudKeyStorage {

Tests/Swift/Utils/TestConfig.swift

@@ -67,16 +67,19 @@ import VirgilE3Kit
 
     @objc public class ServiceUrls: NSObject, Decodable {
         public let Card: String
+        public let Pythia: String
         public let Keyknox: String
         public let Ratchet: String
 
         @objc public func get() -> EThreeParams.ServiceUrls {
             let cardServiceUrl = URL(string: self.Card)!
+            let pythiaServiceUrl = URL(string: self.Pythia)!
             let keyknoxServiceUrl = URL(string: self.Keyknox)!
             let ratchetServiceUrl = URL(string: self.Ratchet)!
 
             return EThreeParams.ServiceUrls(
                 cardServiceUrl: cardServiceUrl,
+                pythiaServiceUrl: pythiaServiceUrl,
                 keyknoxServiceUrl: keyknoxServiceUrl,
                 ratchetServiceUrl: ratchetServiceUrl
             )

Tests/Swift/Utils/TestUtils.swift

@@ -38,6 +38,7 @@ import Foundation
 import VirgilCrypto
 import VirgilE3Kit
 import VirgilSDK
+import VirgilSDKPythia
 
 @objc(VTETestUtils) public class TestUtils: NSObject {
     @objc public let crypto: VirgilCrypto
@@ -248,8 +249,14 @@ import VirgilSDK
         let serviceUrls = self.config.ServiceUrls.get()
         let connection = HttpConnection()
         let retryConfig = ExpBackoffRetry.Config()
+        let pythiaClient = PythiaClient(
+            accessTokenProvider: provider,
+            serviceUrl: serviceUrls.pythiaServiceUrl,
+            connection: connection,
+            retryConfig: retryConfig
+        )
 
-        let brainKeyContext = try! BrainKeyContext()
+        let brainKeyContext = try! BrainKeyContext(client: pythiaClient)
         let brainKey = BrainKey(context: brainKeyContext)
 
         brainKey.generateKeyPair(password: password, brainKeyId: nil) { keyPair, error in

VirgilE3Kit.podspec

@@ -12,5 +12,6 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target   = "4.0"
   s.source       		= { :git => "https://github.com/VirgilSecurity/virgil-e3kit-x.git", :tag => s.version }
   s.source_files  		= 'Source/**/*.{swift}'
+  s.dependency "VirgilSDKPythia", '= 0.12.0'
   s.dependency "VirgilSDKRatchet", '= 0.10.0'
 end