Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main Security Shield updates #377

Merged
merged 8 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ extension SecurityStructureMetadata {
public init(name: DisplayName) {
self = newSecurityStructureMetadataNamed(name: name)
}

public var isMain: Bool {
securityStructureIsMain(securityStructureMetadata: self)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ final class SecurityStructureMetadataTests: Test<SecurityStructureMetadata> {
let sut = SUT(name: "foo")
XCTAssertEqual(sut.displayName, "foo")
}

func test_is_main() {
var sut = SUT(name: "foo")
XCTAssert(sut.isMain)
}
}
2 changes: 2 additions & 0 deletions crates/profile/logic/logic_SPLIT_ME/src/logic/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ mod persona;
mod profile_header;
mod profile_network;
mod profile_networks;
mod profile_security_structure;
mod profile_update;
mod query_factor_sources;

Expand All @@ -18,5 +19,6 @@ pub use persona::*;
pub use profile_header::*;
pub use profile_network::*;
pub use profile_networks::*;
pub use profile_security_structure::*;
pub use profile_update::*;
pub use query_factor_sources::*;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo this can go under the app_preferences/security_structures/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree 👍

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
use crate::prelude::*;

pub trait ProfileHasAnyMainSecurityStructure {
/// Returns true if the profile has any main security structure.
fn has_any_main_security_structure(&self) -> bool;
}

impl ProfileHasAnyMainSecurityStructure for Profile {
/// Returns true if the profile has any main security structure.
fn has_any_main_security_structure(&self) -> bool {
self.app_preferences
.security
.security_structures_of_factor_source_ids
.iter()
.any(|s| s.is_main())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,9 @@ impl<FACTOR> AbstractSecurityStructure<FACTOR> {
)
}
}

impl<FACTOR> AbstractSecurityStructure<FACTOR> {
pub fn is_main(&self) -> bool {
self.metadata.is_main()
}
}
45 changes: 44 additions & 1 deletion crates/system/os/factors/src/sargon_os_security_structures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ impl OsSecurityStructuresQuerying for SargonOS {
EventProfileModified::SecurityStructureAdded { id },
))
.await;

if !self.profile()?.has_any_main_security_structure() {
self.set_main_security_structure(id).await?;
}
Ok(())
}

Expand Down Expand Up @@ -367,6 +371,35 @@ mod tests {
}));
}

#[actix_rt::test]
async fn add_first_structure_sets_it_as_main() {
// ARRANGE
let os = SUT::fast_boot().await;
os.with_timeout(|x| x.debug_add_all_sample_hd_factor_sources())
.await
.unwrap();

// ACT
let structure_ids = SecurityStructureOfFactorSourceIDs::sample_other();
os.with_timeout(|x| {
x.add_security_structure_of_factor_source_ids(&structure_ids)
})
.await
.unwrap();

// ASSERT
let added_structure = os
.profile()
.unwrap()
.app_preferences
.security
.security_structures_of_factor_source_ids
.iter()
.find(|s| s.metadata.id == structure_ids.metadata.id)
.unwrap();
assert!(added_structure.metadata.is_main());
}

#[actix_rt::test]
async fn when_setting_main_security_structure_with_invalid_id_error_is_thrown(
) {
Expand Down Expand Up @@ -536,6 +569,13 @@ mod tests {
.await
.unwrap();

let structure_ids_sample = SecurityStructureOfFactorSourceIDs::sample();
os.with_timeout(|x| {
x.add_security_structure_of_factor_source_ids(&structure_ids_sample)
})
.await
.unwrap();

let structure_ids_sample_other =
SecurityStructureOfFactorSourceIDs::sample_other();
os.with_timeout(|x| {
Expand Down Expand Up @@ -563,7 +603,10 @@ mod tests {
assert!(events.iter().any(|e| e.event
== Event::ProfileModified {
change: EventProfileModified::SecurityStructuresUpdated {
ids: vec![structure_ids_sample_other.metadata.id()]
ids: vec![
structure_ids_sample.metadata.id(),
structure_ids_sample_other.metadata.id()
]
}
}));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@ pub fn new_security_structure_metadata_named(
)
.into()
}

#[uniffi::export]
pub fn security_structure_is_main(
security_structure_metadata: &SecurityStructureMetadata,
) -> bool {
security_structure_metadata.into_internal().is_main()
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@ impl SargonOS {
.into_iter_result()
}

/// Returns the `SecurityStructureOfFactorSourceIDs` with the given `shield_id`.
pub fn security_structure_of_factor_source_ids_by_security_structure_id(
&self,
shield_id: SecurityStructureID,
) -> Result<SecurityStructureOfFactorSourceIDs> {
self.wrapped
.security_structure_of_factor_source_ids_by_security_structure_id(
shield_id.into_internal(),
)
.into_result()
}

/// Returns all the `SecurityStructuresOfFactorSourceIDs` which are stored
/// in profile.
pub fn security_structure_of_factor_sources_from_security_structure_of_factor_source_ids(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.radixdlt.sargon.extensions

import com.radixdlt.sargon.SecurityStructureMetadata
import com.radixdlt.sargon.securityStructureIsMain

val SecurityStructureMetadata.isMain
get() = securityStructureIsMain(securityStructureMetadata = this)

Check warning on line 7 in jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/SecurityStructureMetadata.kt

View check run for this annotation

Codecov / codecov/patch

jvm/sargon-android/src/main/java/com/radixdlt/sargon/extensions/SecurityStructureMetadata.kt#L7

Added line #L7 was not covered by tests
Loading