update hpos-connect and fix uninstall checks (#59)

* hpos-connect: update and jurisdiction update

* clippy

Cargo.toml

@@ -34,4 +34,4 @@ mr_bundle = { version = "0.4.0-dev.4" }
 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" }
 chrono = "0.4.33"
-hpos_hc_connect = { git = "https://github.com/holo-host/hpos-service-crates.git", rev = "81485983b949884e7a574cae519818b628f57865" }
+hpos_hc_connect = { git = "https://github.com/holo-host/hpos-service-crates.git", rev = "2618edaaea4552713a8818dcd13b05805b5854c6" }

src/types/happ.rs

@@ -37,15 +37,15 @@ impl HostHappPreferences {
                 (jurisdictions_list, c.is_exclusion)
             }
             None => {
-                warn!("Could not get publisher jurisdiction for happ.");
-                return false;
+                warn!("No host jurisdiction for happ set.");
+                return true;
             }
         };
 
         let publisher_jurisdiction = match maybe_publisher_jurisdiction {
             Some(pj) => pj,
             None => {
-                warn!("Could not get publisher jurisdiction for happ.");
+                warn!("Could not get publisher jurisdiction for happ");
                 return false;
             }
         };
@@ -68,8 +68,8 @@ impl HostHappPreferences {
                 (categories_list, c.is_exclusion)
             }
             None => {
-                warn!("Host's category preferences not available");
-                return false;
+                warn!("No category preferences set by host");
+                return true;
             }
         };
 

src/types/hbs.rs

@@ -101,10 +101,7 @@ impl HbsClient {
         let json: serde_json::Value = serde_json::to_value(payload)?;
         let token = match self.get_access_token().await {
             Ok(token) => match token {
-                Some(token) => match token.access_token {
-                    Some(token) => token,
-                    None => String::new(),
-                },
+                Some(token) => token.access_token.unwrap_or_default(),
                 None => String::new(),
             },
             Err(_) => String::new(),

src/utils.rs

@@ -312,6 +312,7 @@ pub async fn install_holo_hosted_happs(
                 if is_kyc_level_2 {
                     trace!("Enabling happ {} for holo hosting", happ_id);
                     let holoport_id = get_holoport_id().await?;
+                    // Questions: if its here does this not mean that the happ is already enabled?
                     core_app_client
                         .holo_enable_happ(happ_id, &holoport_id)
                         .await?;