Merge branch 'feature/use-request' into development

* feature/use-request:
  use request

Author: paydii

crates/cli/src/deploy/mod.rs

@@ -72,7 +72,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
         status: DeploymentStatus::Started,
     };
 
-    let created_deployment = create(env, config.project.id.clone(), payload).await?;
+    let created_deployment = create(env, &access_token, config.project.id.clone(), payload).await?;
     let user = me(env).await?;
 
     let mut push_opts = PushOptions::new();

crates/smbcloud-networking-project/src/crud_project_create.rs

@@ -6,7 +6,7 @@ use smbcloud_model::{
 };
 use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};
 
-use crate::build_project_url;
+use crate::url_builder::build_project_url;
 
 pub async fn create_project(
     env: Environment,

crates/smbcloud-networking-project/src/crud_project_delete.rs

@@ -1,4 +1,4 @@
-use crate::build_project_url_with_id;
+use crate::url_builder::build_project_url_with_id;
 use reqwest::Client;
 use smbcloud_model::error_codes::ErrorResponse;
 use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};

crates/smbcloud-networking-project/src/crud_project_deployment_create.rs

@@ -1,37 +1,22 @@
-use crate::build_project_deployment_index;
-use anyhow::{anyhow, Result};
-use log::debug;
+use crate::url_builder::build_project_deployment_index;
+use anyhow::Result;
 use reqwest::Client;
-use smbcloud_model::project::{Deployment, DeploymentPayload};
-use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, get_smb_token};
+use smbcloud_model::{
+    error_codes::ErrorResponse,
+    project::{Deployment, DeploymentPayload},
+};
+use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};
 
 pub async fn create(
     env: Environment,
+    access_token: &str,
     project_id: i32,
     payload: DeploymentPayload,
-) -> Result<Deployment> {
-    // Get current token
-    let token = get_smb_token(env).await?;
-
-    debug!("Current token: {}", token);
-
-    let response = Client::new()
+) -> Result<Deployment, ErrorResponse> {
+    let builder = Client::new()
         .post(build_project_deployment_index(env, project_id.to_string()))
         .json(&payload)
-        .header("Authorization", token)
-        .header("User-agent", SMB_USER_AGENT)
-        .send()
-        .await?;
-
-    match response.status() {
-        reqwest::StatusCode::CREATED => {
-            let deployment: Deployment = response.json().await?;
-            Ok(deployment)
-            // After receiving the response
-            //let body = response.text().await?;
-            //println!("Response body: {}", body);
-            // todo!()
-        }
-        _ => Err(anyhow!("Something wrong.")),
-    }
-}
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}

crates/smbcloud-networking-project/src/crud_project_deployment_read.rs

@@ -1,4 +1,4 @@
-use crate::{build_project_deployment, build_project_deployment_index};
+use crate::url_builder::{build_project_deployment, build_project_deployment_index};
 use anyhow::Result;
 use reqwest::Client;
 use smbcloud_model::{error_codes::ErrorResponse, project::Deployment};

crates/smbcloud-networking-project/src/crud_project_deployment_update.rs

@@ -4,9 +4,9 @@ use smbcloud_model::{
     error_codes::ErrorResponse,
     project::{Deployment, DeploymentPayload},
 };
-use smbcloud_networking::{environment::Environment, network::request};
+use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};
 
-use crate::build_project_deployment;
+use crate::url_builder::build_project_deployment;
 
 pub async fn update(
     env: Environment,
@@ -19,6 +19,7 @@ pub async fn update(
     let builder = Client::new()
         .put(url)
         .json(&status)
-        .header("Authorization", access_token);
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
     request(builder).await
 }

crates/smbcloud-networking-project/src/crud_project_read.rs

@@ -1,4 +1,4 @@
-use crate::{build_project_url, build_project_url_with_id};
+use crate::url_builder::{build_project_url, build_project_url_with_id};
 use reqwest::Client;
 use smbcloud_model::{error_codes::ErrorResponse, project::Project};
 use smbcloud_networking::{constants::SMB_USER_AGENT, environment::Environment, network::request};

crates/smbcloud-networking-project/src/lib.rs

@@ -4,37 +4,4 @@ pub mod crud_project_deployment_create;
 pub mod crud_project_deployment_read;
 pub mod crud_project_deployment_update;
 pub mod crud_project_read;
-
-use smbcloud_networking::{environment::Environment, smb_base_url_builder};
-
-// Private functions
-
-fn build_project_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
-    url_builder.add_route("v1/projects");
-    url_builder.build()
-}
-
-fn build_project_url_with_id(env: Environment, id: String) -> String {
-    let mut url_builder = smb_base_url_builder(env);
-    url_builder.add_route("v1/projects");
-    url_builder.add_route(id.as_str());
-    url_builder.build()
-}
-
-fn build_project_deployment_index(env: Environment, project_id: String) -> String {
-    let mut url_builder = smb_base_url_builder(env);
-    url_builder.add_route("v1/projects");
-    url_builder.add_route(project_id.as_str());
-    url_builder.add_route("deployment");
-    url_builder.build()
-}
-
-fn build_project_deployment(env: Environment, project_id: String, id: String) -> String {
-    let mut url_builder = smb_base_url_builder(env);
-    url_builder.add_route("v1/projects");
-    url_builder.add_route(project_id.as_str());
-    url_builder.add_route("deployment");
-    url_builder.add_route(id.as_str());
-    url_builder.build()
-}
+mod url_builder;

crates/smbcloud-networking-project/src/url_builder.rs

@@ -0,0 +1,34 @@
+
+use smbcloud_networking::{environment::Environment, smb_base_url_builder};
+
+// Private functions
+
+pub(crate) fn build_project_url(env: Environment) -> String {
+    let mut url_builder = smb_base_url_builder(env);
+    url_builder.add_route("v1/projects");
+    url_builder.build()
+}
+
+pub(crate) fn build_project_url_with_id(env: Environment, id: String) -> String {
+    let mut url_builder = smb_base_url_builder(env);
+    url_builder.add_route("v1/projects");
+    url_builder.add_route(id.as_str());
+    url_builder.build()
+}
+
+pub(crate) fn build_project_deployment_index(env: Environment, project_id: String) -> String {
+    let mut url_builder = smb_base_url_builder(env);
+    url_builder.add_route("v1/projects");
+    url_builder.add_route(project_id.as_str());
+    url_builder.add_route("deployment");
+    url_builder.build()
+}
+
+pub(crate) fn build_project_deployment(env: Environment, project_id: String, id: String) -> String {
+    let mut url_builder = smb_base_url_builder(env);
+    url_builder.add_route("v1/projects");
+    url_builder.add_route(project_id.as_str());
+    url_builder.add_route("deployment");
+    url_builder.add_route(id.as_str());
+    url_builder.build()
+}