Authorization Interactor (#356)

* Expose authorization interactor * Rename SigningRejecting to HostInteractionAborted * Fix host tests * Add test that verifies derivation index is correct * Release 1.1.120 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] Generated by cargo-workspaces * Fix test * Invoke correct sut method in test
radixdlt · Jan 27, 2025 · 9ca1867 · 9ca1867
1 parent 22a4d57
commit 9ca1867
Show file tree

Hide file tree

Showing 91 changed files with 924 additions and 199 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apple/Sources/Sargon/SargonOS/ThrowingHostInteractor+Static+Shared.swift b/apple/Sources/Sargon/SargonOS/ThrowingHostInteractor+Static+Shared.swift
@@ -3,18 +3,22 @@ public class ThrowingHostInteractor: HostInteractor {
 	public nonisolated(unsafe) static var shared: HostInteractor = ThrowingHostInteractor()
 
 	public func signAuth(request: SargonUniFFI.SignRequestOfAuthIntent) async throws -> SargonUniFFI.SignResponseOfAuthIntentHash {
-		throw CommonError.SigningRejected
+		throw CommonError.HostInteractionAborted
 	}
 
 	public func signTransactions(request: SargonUniFFI.SignRequestOfTransactionIntent) async throws -> SargonUniFFI.SignResponseOfTransactionIntentHash {
-		throw CommonError.SigningRejected
+		throw CommonError.HostInteractionAborted
 	}
 
 	public func signSubintents(request: SargonUniFFI.SignRequestOfSubintent) async throws -> SargonUniFFI.SignResponseOfSubintentHash {
-		throw CommonError.SigningRejected
+		throw CommonError.HostInteractionAborted
 	}
 
 	public func deriveKeys(request: SargonUniFFI.KeyDerivationRequest) async throws -> SargonUniFFI.KeyDerivationResponse {
-		throw CommonError.SigningRejected
+		throw CommonError.HostInteractionAborted
+	}
+
+	public func requestAuthorization(purpose: SargonUniFFI.AuthorizationPurpose) async -> SargonUniFFI.AuthorizationResponse {
+		.rejected
 	}
 }
diff --git a/apple/Tests/TestCases/System/ThrowingHostInteractorTests.swift b/apple/Tests/TestCases/System/ThrowingHostInteractorTests.swift
@@ -12,7 +12,7 @@ final class ThrowingHostInteractorTests: TestCase {
 				request: SargonUniFFI.KeyDerivationRequest(derivationPurpose: .creatingNewAccount, perFactorSource: [])
 			)
 		} catch {
-			XCTAssertEqual(error as? CommonError, CommonError.SigningRejected)
+			XCTAssertEqual(error as? CommonError, CommonError.HostInteractionAborted)
 		}
 	}
 
@@ -22,7 +22,7 @@ final class ThrowingHostInteractorTests: TestCase {
 				request: SargonUniFFI.SignRequestOfAuthIntent(factorSourceKind: .device, perFactorSource: [])
 			)
 		} catch {
-			XCTAssertEqual(error as? CommonError, CommonError.SigningRejected)
+			XCTAssertEqual(error as? CommonError, CommonError.HostInteractionAborted)
 		}
 	}
 
@@ -32,7 +32,7 @@ final class ThrowingHostInteractorTests: TestCase {
 				request: SargonUniFFI.SignRequestOfTransactionIntent(factorSourceKind: .device, perFactorSource: [])
 			)
 		} catch {
-			XCTAssertEqual(error as? CommonError, CommonError.SigningRejected)
+			XCTAssertEqual(error as? CommonError, CommonError.HostInteractionAborted)
 		}
 	}
 
@@ -42,7 +42,12 @@ final class ThrowingHostInteractorTests: TestCase {
 				request: SargonUniFFI.SignRequestOfSubintent(factorSourceKind: .device, perFactorSource: [])
 			)
 		} catch {
-			XCTAssertEqual(error as? CommonError, CommonError.SigningRejected)
+			XCTAssertEqual(error as? CommonError, CommonError.HostInteractionAborted)
 		}
 	}
+
+	func testAuthoriseGetsRejected() async {
+		let outcome = await SUT.shared.requestAuthorization(purpose: .creatingAccount)
+		XCTAssertEqual(outcome, .rejected)
+	}
 }
diff --git a/crates/app/home-cards/Cargo.toml b/crates/app/home-cards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "home-cards"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/key-derivation-traits/Cargo.toml b/crates/app/key-derivation-traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "key-derivation-traits"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/radix-connect-models/Cargo.toml b/crates/app/radix-connect-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "radix-connect-models"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/radix-connect/Cargo.toml b/crates/app/radix-connect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "radix-connect"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 

diff --git a/crates/app/security-center/Cargo.toml b/crates/app/security-center/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "security-center"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/signing-traits/Cargo.toml b/crates/app/signing-traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "signing-traits"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/app/signing-traits/src/testing/interactors/test_sign_interactor.rs b/crates/app/signing-traits/src/testing/interactors/test_sign_interactor.rs
@@ -85,7 +85,9 @@ impl<S: Signable> SignInteractor<S> for TestSignInteractor<S> {
                 Ok(SignResponse::user_skipped_factors(ids))
             }
 
-            SigningUserInput::Reject => Err(CommonError::SigningRejected),
+            SigningUserInput::Reject => {
+                Err(CommonError::HostInteractionAborted)
+            }
         }
     }
 }
diff --git a/crates/app/signing/Cargo.toml b/crates/app/signing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "signing"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 

diff --git a/crates/common/build-info/Cargo.toml b/crates/common/build-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "build-info"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 build = "build.rs"
 

diff --git a/crates/common/bytes/Cargo.toml b/crates/common/bytes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bytes"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/entity-foundation/Cargo.toml b/crates/common/entity-foundation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "entity-foundation"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/host-info/Cargo.toml b/crates/common/host-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "host-info"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/identified-vec-of/Cargo.toml b/crates/common/identified-vec-of/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "identified-vec-of"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/metadata/Cargo.toml b/crates/common/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "metadata"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/network/Cargo.toml b/crates/common/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "network"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/numeric/Cargo.toml b/crates/common/numeric/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "numeric"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/common/short-string/Cargo.toml b/crates/common/short-string/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "short-string"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/assert-json/Cargo.toml b/crates/core/assert-json/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "assert-json"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/collections/Cargo.toml b/crates/core/collections/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-collections"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/error/Cargo.toml b/crates/core/error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "error"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/error/src/common_error.rs b/crates/core/error/src/common_error.rs
@@ -804,8 +804,8 @@ pub enum CommonError {
     #[error("Could not validate signature for the given rola challenge.")]
     InvalidSignatureForRolaChallenge = 10231,
 
-    #[error("Signing was rejected by the user")]
-    SigningRejected = 10232,
+    #[error("User aborted the interaction with sargon on host.")]
+    HostInteractionAborted = 10232,
 
     #[error("Failed to automatically build shield, reason: '{underlying}'")]
     AutomaticShieldBuildingFailure { underlying: String } = 10233,

diff --git a/crates/core/has-sample-values/Cargo.toml b/crates/core/has-sample-values/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "has-sample-values"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/misc/Cargo.toml b/crates/core/misc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-misc"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/prelude/Cargo.toml b/crates/core/prelude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "prelude"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/time-utils/Cargo.toml b/crates/core/time-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "time-utils"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/core/utils/Cargo.toml b/crates/core/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core-utils"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/addresses/Cargo.toml b/crates/crypto/addresses/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "addresses"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/cap26-models/Cargo.toml b/crates/crypto/cap26-models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cap26-models"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/ecc/Cargo.toml b/crates/crypto/ecc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ecc"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/encryption/Cargo.toml b/crates/crypto/encryption/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "encryption"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/hash/Cargo.toml b/crates/crypto/hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hash"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/crypto/hd/Cargo.toml b/crates/crypto/hd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hierarchical-deterministic"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/factors/Cargo.toml b/crates/factors/factors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factors"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/instances-provider/Cargo.toml b/crates/factors/instances-provider/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factor-instances-provider"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/keys-collector/Cargo.toml b/crates/factors/keys-collector/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "keys-collector"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/next-derivation-index-ephemeral/Cargo.toml b/crates/factors/next-derivation-index-ephemeral/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "next-derivation-index-ephemeral"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/factors/supporting-types/Cargo.toml b/crates/factors/supporting-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factors-supporting-types"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/gateway/client-and-api/Cargo.toml b/crates/gateway/client-and-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gateway-client-and-api"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]

diff --git a/crates/gateway/models/Cargo.toml b/crates/gateway/models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gateway-models"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 

diff --git a/crates/profile/logic/logic_SPLIT_ME/Cargo.toml b/crates/profile/logic/logic_SPLIT_ME/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "profile-logic"
-version = "1.1.119"
+version = "1.1.120"
 edition = "2021"
 
 [dependencies]