V3config support (#63)

* Updated git hash and code for V3 config * fix: Cargo.lock consistency (#62) * Fixed V3 variant * Updated hashes for V3 config * Use email getter per review comments * update hpos_hc_connect * holochain: v0.4.0-dev.18 * Updated git hash and code for V3 config * Updated hashes for V3 config * Use email getter per review comments --------- Co-authored-by: Matthew Geddes <[email protected]> Co-authored-by: Stefan Junker <[email protected]> Co-authored-by: zo-el <[email protected]>
Holo-Host · Aug 21, 2024 · 57bfed8 · 57bfed8
1 parent ca3bde7
commit 57bfed8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -150,10 +150,7 @@ impl HbsClient {
     async fn inner_get_access_token(&self) -> Result<Response> {
         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?;