Merge pull request #33 from tzmfreedom/fix_examples

Fix examples

examples/describe.rs

@@ -11,7 +11,7 @@ async fn main() -> Result<(), Error> {
     let mut client = Client::new(Some(client_id), Some(client_secret));
     client.login_with_credential(username, password).await?;
 
-    let res = client.describe_global().await?;
+    let res = client.describe("Account").await?;
     println!("{:?}", res);
 
     Ok(())

examples/describe_global.rs

@@ -0,0 +1,18 @@
+use rustforce::{Client, Error};
+use std::env;
+
+#[tokio::main]
+async fn main() -> Result<(), Error> {
+    let client_id = env::var("SFDC_CLIENT_ID").unwrap();
+    let client_secret = env::var("SFDC_CLIENT_SECRET").unwrap();
+    let username = env::var("SFDC_USERNAME").unwrap();
+    let password = env::var("SFDC_PASSWORD").unwrap();
+
+    let mut client = Client::new(client_id, client_secret);
+    client.login_with_credential(username, password).await?;
+
+    let res = client.describe_global().await?;
+    println!("{:?}", res);
+
+    Ok(())
+}

src/client.rs

@@ -2,8 +2,8 @@ extern crate reqwest;
 
 use crate::errors::Error;
 use crate::response::{
-    AccessToken, CreateResponse, DescribeGlobalResponse, DescribeResponse, ErrorResponse,
-    QueryResponse, SearchResponse, TokenResponse, VersionResponse,
+    AccessToken, CreateResponse, DescribeGlobalResponse, ErrorResponse, QueryResponse,
+    SearchResponse, TokenResponse, VersionResponse,
 };
 use crate::utils::substring_before;
 use regex::Regex;

src/response.rs

@@ -53,8 +53,8 @@ pub struct AccessToken {
     pub issued_at: String,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct DescribeResponse {
     pub activateable: bool,
     //    pub action_overrides: ActionOverride[],
@@ -93,8 +93,8 @@ pub struct DescribeResponse {
     pub urls: Urls,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct Field {
     pub aggregatable: bool,
     pub ai_prediction_field: bool,
@@ -156,8 +156,8 @@ pub struct Field {
     pub write_requires_master_read: bool,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct ChildRelationship {
     pub cascade_delete: bool,
     #[serde(rename = "childSObject")]
@@ -170,8 +170,8 @@ pub struct ChildRelationship {
     pub restricted_delete: bool,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct Urls {
     pub compact_layouts: String,
     pub row_template: String,
@@ -187,16 +187,16 @@ pub struct Urls {
     pub sobject: String,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct DescribeGlobalResponse {
     pub encoding: String,
     pub max_batch_size: u16,
     pub sobjects: Vec<DescribeGlobalSObjectResponse>,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct DescribeGlobalSObjectResponse {
     pub activateable: bool,
     pub createable: bool,
@@ -224,31 +224,31 @@ pub struct DescribeGlobalSObjectResponse {
     pub urls: HashMap<String, String>,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct SearchResponse {
     pub search_records: Vec<SearchRecord>,
     //    pub metadata: Metadata,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct SearchRecord {
     #[serde(rename = "Id")]
     pub id: String,
     pub attributes: SObjectAttribute,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct SObjectAttribute {
     #[serde(rename = "type")]
     pub sobject_type: String,
     pub url: String,
 }
 
-#[serde(rename_all = "camelCase")]
 #[derive(Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
 pub struct VersionResponse {
     pub label: String,
     pub url: String,