datHere/ckanaction
1
0
Fork 0
mirror of https://github.com/dathere/ckanaction.git synced 2025-11-09 14:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: add token auth to GET methods and custom_fields to config_option_update

Browse source
This commit is contained in:
rzmk 2025-05-02 12:16:44 -04:00
parent 0d29a691c0
commit ccaefd8076
No known key found for this signature in database
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/lib.rs
View file

@ -35,8 +35,14 @@ impl CKAN {
} }
} }
async fn get(endpoint: String) -> Result<serde_json::Value, Box<dyn std::error::Error>> { async fn get(&self, endpoint: String) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
Ok(reqwest::get(endpoint) let client = reqwest::Client::new();
let mut req_builder = client.get(endpoint);
if self.token.is_some() {
req_builder = req_builder.header("Authorization", self.token.clone().unwrap());
}
Ok(req_builder
.send()
.await? .await?
.json::<serde_json::Value>() .json::<serde_json::Value>()
.await?) .await?)
@ -807,13 +813,13 @@ impl CKAN {
/// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.status_show /// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.status_show
pub async fn status_show(&self) -> Result<serde_json::Value, Box<dyn std::error::Error>> { pub async fn status_show(&self) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
let endpoint = self.url.clone() + "/api/3/action/status_show"; let endpoint = self.url.clone() + "/api/3/action/status_show";
Ok(Self::get(endpoint).await?) Ok(Self::get(&self, endpoint).await?)
} }
/// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.vocabulary_list /// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.vocabulary_list
pub async fn vocabulary_list(&self) -> Result<serde_json::Value, Box<dyn std::error::Error>> { pub async fn vocabulary_list(&self) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
let endpoint = self.url.clone() + "/api/3/action/vocabulary_list"; let endpoint = self.url.clone() + "/api/3/action/vocabulary_list";
Ok(Self::get(endpoint).await?) Ok(Self::get(&self, endpoint).await?)
} }
/// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.vocabulary_show /// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.vocabulary_show
@ -1231,7 +1237,7 @@ impl CKAN {
&self, &self,
) -> Result<serde_json::Value, Box<dyn std::error::Error>> { ) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
let endpoint = self.url.clone() + "/api/3/action/config_option_list"; let endpoint = self.url.clone() + "/api/3/action/config_option_list";
Ok(Self::get(endpoint).await?) Ok(Self::get(&self, endpoint).await?)
} }
/// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.job_list /// https://docs.ckan.org/en/2.11/api/index.html#ckan.logic.action.get.job_list
@ -2353,11 +2359,26 @@ impl CKAN {
#[builder] #[builder]
pub async fn config_option_update( pub async fn config_option_update(
&self, &self,
key: String, custom_fields: Option<serde_json::Value>,
) -> Result<serde_json::Value, Box<dyn std::error::Error>> { ) -> Result<serde_json::Value, Box<dyn std::error::Error>> {
let endpoint = self.url.clone() + "/api/3/action/config_option_update"; let endpoint = self.url.clone() + "/api/3/action/config_option_update";
let mut map: HashMap<&str, serde_json::Value> = HashMap::new(); let mut map: HashMap<&str, serde_json::Value> = HashMap::new();
map.insert("key", json!(key)); let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
if let Some(custom) = custom_fields {
if custom.is_object() {
let custom_temp_map = custom.as_object().unwrap();
custom_map.extend(
custom_temp_map
.iter()
.map(|item| (item.0.to_owned(), item.1.to_owned())),
);
}
}
map.extend(
custom_map
.iter()
.map(|item| (item.0.as_str(), item.1.to_owned())),
);
let body = hashmap_to_json(&map)?; let body = hashmap_to_json(&map)?;
Ok(Self::post(&self) Ok(Self::post(&self)
.endpoint(endpoint) .endpoint(endpoint)