diff --git a/Cargo.lock b/Cargo.lock index 6de9694..b2b3530 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2227,8 +2227,8 @@ dependencies = [ [[package]] name = "hpos-config-core" -version = "0.2.0" -source = "git+https://github.com/Holo-Host/hpos-config?rev=a36f862869cc162c843ac27ed617910d68f480cc#a36f862869cc162c843ac27ed617910d68f480cc" +version = "0.2.1" +source = "git+https://github.com/Holo-Host/hpos-config?rev=86411bdaabe7061a4b150d36c062fddc2c6c74cc#86411bdaabe7061a4b150d36c062fddc2c6c74cc" dependencies = [ "argon2min", "arrayref", @@ -2245,9 +2245,10 @@ dependencies = [ [[package]] name = "hpos-config-seed-bundle-explorer" -version = "0.2.0" -source = "git+https://github.com/Holo-Host/hpos-config?rev=a36f862869cc162c843ac27ed617910d68f480cc#a36f862869cc162c843ac27ed617910d68f480cc" +version = "0.2.1" +source = "git+https://github.com/Holo-Host/hpos-config?rev=86411bdaabe7061a4b150d36c062fddc2c6c74cc#86411bdaabe7061a4b150d36c062fddc2c6c74cc" dependencies = [ + "base36", "base64 0.13.1", "ed25519-dalek", "hc_seed_bundle", @@ -2262,7 +2263,7 @@ dependencies = [ [[package]] name = "hpos_hc_connect" version = "0.1.0" -source = "git+https://github.com/holo-host/hpos-service-crates.git?rev=b86a56a87bdc53d9b42e1f690462d2c557375908#b86a56a87bdc53d9b42e1f690462d2c557375908" +source = "git+https://github.com/holo-host/hpos-service-crates.git?rev=c48e1f17fe4ced00e52b07ea55f2e1e76e52fa62#c48e1f17fe4ced00e52b07ea55f2e1e76e52fa62" dependencies = [ "again", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 7168074..b46a284 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ holochain_conductor_api = { version = "0.4.0-dev.18", features = ["chc"]} holochain_keystore = { version = "0.4.0-dev.16" } holochain_websocket = { version = "0.4.0-dev.18"} mr_bundle = { version = "0.4.0-dev.5" } -hpos-config-core = { git = "https://github.com/Holo-Host/hpos-config", rev = "a36f862869cc162c843ac27ed617910d68f480cc" } -hpos-config-seed-bundle-explorer ={ git = "https://github.com/Holo-Host/hpos-config", rev = "a36f862869cc162c843ac27ed617910d68f480cc" } +hpos-config-core = { git = "https://github.com/Holo-Host/hpos-config", rev = "86411bdaabe7061a4b150d36c062fddc2c6c74cc" } +hpos-config-seed-bundle-explorer ={ git = "https://github.com/Holo-Host/hpos-config", rev = "86411bdaabe7061a4b150d36c062fddc2c6c74cc" } chrono = "0.4.33" -hpos_hc_connect = { git = "https://github.com/holo-host/hpos-service-crates.git", rev = "b86a56a87bdc53d9b42e1f690462d2c557375908" } +hpos_hc_connect = { git = "https://github.com/holo-host/hpos-service-crates.git", rev = "c48e1f17fe4ced00e52b07ea55f2e1e76e52fa62" } diff --git a/src/types/hbs.rs b/src/types/hbs.rs index 6d4a9f8..948d3c6 100644 --- a/src/types/hbs.rs +++ b/src/types/hbs.rs @@ -150,10 +150,7 @@ impl HbsClient { async fn inner_get_access_token(&self) -> Result { let config: hpos_config_core::Config = get_hpos_config()?; - let email = match config { - hpos_config_core::Config::V1 { settings, .. } - | hpos_config_core::Config::V2 { settings, .. } => settings.admin.email, - }; + let email = config.email(); let mut core_app = CoreAppAgent::spawn(None).await?; let pub_key = core_app.pubkey().await?;