Merge pull request #89 from Holo-Host/v3config

Updated for V3 config support
Holo-Host · Aug 21, 2024 · 75f4dc2 · 75f4dc2
2 parents 135bf80 + d49e782
commit 75f4dc2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -21,8 +21,8 @@ holochain_types = "0.3.2"
 
 [dependencies.hpos-config-core]
 git = "https://github.com/Holo-Host/hpos-config"
-rev = "6125ac11e83c618746d181faceb4ec5f981bce9f"
+rev = "86411bdaabe7061a4b150d36c062fddc2c6c74cc"
 
 [dependencies.hpos-config-seed-bundle-explorer]
 git = "https://github.com/Holo-Host/hpos-config"
-rev = "6125ac11e83c618746d181faceb4ec5f981bce9f"
+rev = "86411bdaabe7061a4b150d36c062fddc2c6c74cc"
diff --git a/client/src/main.rs b/client/src/main.rs
@@ -117,7 +117,7 @@ struct ZTPayload {
 
 async fn try_zerotier_auth(config: &Config, holochain_public_key: VerifyingKey) -> Fallible<()> {
     match config {
-        Config::V2 { settings, .. } => {
+        Config::V3 { settings, .. } | Config::V2 { settings, .. } => {
             let zerotier_identity = Identity::read_default()?;
 
             let data = ZTData {
@@ -210,7 +210,12 @@ async fn try_registration_auth(
     holochain_public_key: VerifyingKey,
 ) -> Fallible<()> {
     match config {
-        Config::V2 {
+        Config::V3 {
+            registration_code,
+            settings,
+            ..
+        }
+        | Config::V2 {
             registration_code,
             settings,
             ..
@@ -245,8 +250,7 @@ async fn try_registration_auth(
                 }
             }
         }
-        // todo: update to use v3 soon
-        Config::V3 { settings, .. } | Config::V1 { settings, .. } => {
+        Config::V1 { settings, .. } => {
             send_failure_email(
                 settings.admin.email.clone(),
                 AuthError::ConfigVersionError.to_string(),