continued working on api

2 files changed, 16 insertions, 16 deletions

diff --git a/src/client.rs b/src/client.rs
index 3caa330..e4071b0 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -44,9 +44,9 @@ impl HydrusClient {
 
         let response = ureq::get(req_url).call()?.body_mut().read_to_vec()?;
 
-        let key = musli::json::decode(response.as_slice())?;
+        let key: AccessKey = musli::json::decode(response.as_slice())?;
 
-        Ok(key)
+        Ok(key.access_key)
     }
 
     pub fn get_session_key(&self) -> Result<String> {
@@ -61,9 +61,9 @@ impl HydrusClient {
 
         let response = request.call()?.body_mut().read_to_vec()?;
 
-        let key = musli::json::decode(response.as_slice())?;
+        let key: SessionKey = musli::json::decode(response.as_slice())?;
 
-        Ok(key)
+        Ok(key.session_key)
     }
 
     pub fn verify_access_key(&self, key: String) -> Result<KeyInfo> {
diff --git a/src/types.rs b/src/types.rs
index c34e56f..d1abb8d 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -96,21 +96,21 @@ where
 }
 
 #[derive(Decode)]
-struct AccessKey {
-    access_key: String,
+pub struct AccessKey {
+    pub access_key: String,
 }
 
 #[derive(Decode)]
-struct SessionKey {
-    session_key: String,
+pub struct SessionKey {
+    pub session_key: String,
 }
 
 #[derive(Decode)]
 pub struct KeyInfo {
-    name: String,
-    permits_everything: bool,
-    basic_permissions: Vec<HydrusPermissions>,
-    human_permissions: String,
+    pub name: String,
+    pub permits_everything: bool,
+    pub basic_permissions: Vec<HydrusPermissions>,
+    pub human_permissions: String,
 }
 
 #[derive(PartialEq, Debug, Clone)]
@@ -196,9 +196,9 @@ where
 
 #[derive(Decode)]
 pub struct Service {
-    name: String,
+    pub name: String,
     #[musli(default)]
-    service_key: String,
-    servicetype: ServiceType,
-    type_pretty: String,
+    pub service_key: String,
+    pub servicetype: ServiceType,
+    pub type_pretty: String,
 }