Merge branch 'feature/sigit-account-smb-client' into development

Author: setoelkahfi

Cargo.lock

@@ -7,7 +7,9 @@ use dialoguer::{theme::ColorfulTheme, Input, Password};
 use reqwest::{Client, StatusCode};
 use smbcloud_model::forgot::{Args, Email, Param, UserUpdatePassword};
 use smbcloud_network::environment::Environment;
-use smbcloud_networking::{constants::PATH_USERS_PASSWORD, smb_base_url_builder};
+use smbcloud_networking::{
+    constants::PATH_USERS_PASSWORD, smb_base_url_builder, smb_client::SmbClient,
+};
 use smbcloud_utils::email_validation;
 use spinners::Spinner;
 
@@ -115,7 +117,7 @@ async fn input_code(env: Environment) -> Result<CommandResult> {
 }
 
 fn build_smb_forgot_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
     url_builder.add_route(PATH_USERS_PASSWORD);
     url_builder.build()
 }

crates/cli/src/account/forgot/mod.rs

@@ -12,6 +12,7 @@ use {
             GH_OAUTH_CLIENT_ID, GH_OAUTH_REDIRECT_HOST, GH_OAUTH_REDIRECT_PORT, PATH_AUTHORIZE,
         },
         smb_base_url_builder,
+        smb_client::SmbClient,
     },
     spinners::Spinner,
     std::{
@@ -192,7 +193,7 @@ pub async fn process_connect_github(env: Environment, code: String) -> Result<Sm
 }
 
 fn build_authorize_smb_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
     url_builder.add_route(PATH_AUTHORIZE);
     url_builder.build()
 }

crates/cli/src/account/lib.rs

@@ -32,6 +32,7 @@ use {
             PATH_USERS_PASSWORD,
         },
         smb_base_url_builder,
+        smb_client::SmbClient,
     },
     smbcloud_networking_account::{check_email::check_email, login::login},
     smbcloud_utils::email_validation,
@@ -301,7 +302,7 @@ async fn login_with_email(env: Environment) -> Result<CommandResult> {
         }
     };
 
-    match check_email(env, &username).await {
+    match check_email(env, SmbClient::Cli, &username).await {
         Ok(auth) => {
             // Only continue with password input if email is found and confirmed.
             if auth.error_code.is_some() {
@@ -336,7 +337,7 @@ async fn do_process_login(env: Environment, args: LoginArgs) -> Result<CommandRe
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Loading"),
     );
-    let account_status = match login(env, args.username, args.password).await {
+    let account_status = match login(env, SmbClient::Cli, args.username, args.password).await {
         Ok(response) => response,
         Err(_) => return Err(anyhow!(fail_message("Check your internet connection."))),
     };
@@ -554,25 +555,25 @@ async fn input_reset_password_token(env: Environment) -> Result<CommandResult> {
 }
 
 fn build_smb_resend_email_verification_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
     url_builder.add_route(PATH_RESEND_CONFIRMATION);
     url_builder.build()
 }
 
 fn build_smb_resend_reset_password_instructions_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
     url_builder.add_route(PATH_RESET_PASSWORD_INSTRUCTIONS);
     url_builder.build()
 }
 
 fn build_smb_reset_password_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
     url_builder.add_route(PATH_USERS_PASSWORD);
     url_builder.build()
 }
 
 fn build_smb_connect_github_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
     url_builder.add_route(PATH_LINK_GITHUB_ACCOUNT);
     url_builder.build()
 }

crates/cli/src/account/login/process.rs

@@ -7,6 +7,7 @@ use {
     anyhow::{anyhow, Result},
     dialoguer::{theme::ColorfulTheme, Confirm},
     smbcloud_network::environment::Environment,
+    smbcloud_networking::smb_client::SmbClient,
     smbcloud_networking_account::logout::logout,
     spinners::Spinner,
     std::fs,
@@ -67,7 +68,7 @@ pub async fn process_logout(env: Environment) -> Result<CommandResult> {
 
 async fn do_process_logout(env: Environment) -> Result<()> {
     let token = get_smb_token(env)?;
-    match logout(env, token).await {
+    match logout(env, SmbClient::Cli, token).await {
         Ok(_) => Ok(()),
         Err(e) => Err(anyhow!("{e}")),
     }

crates/cli/src/account/logout/mod.rs

@@ -7,6 +7,7 @@ use crate::{
 use anyhow::Result;
 use smbcloud_model::account::User;
 use smbcloud_network::environment::Environment;
+use smbcloud_networking::smb_client::SmbClient;
 use smbcloud_networking_account::me::me;
 use spinners::Spinner;
 use tabled::{Table, Tabled};
@@ -50,7 +51,7 @@ pub async fn process_me(env: Environment) -> Result<CommandResult> {
         succeed_message("Loading"),
     );
     let token = get_smb_token(env)?;
-    match me(env, &token).await {
+    match me(env, SmbClient::Cli, &token).await {
         Ok(user) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
             show_user(&user);

crates/cli/src/account/me/mod.rs

@@ -13,10 +13,7 @@ use {
     serde::Serialize,
     smbcloud_model::signup::SignupResult,
     smbcloud_network::environment::Environment,
-    smbcloud_networking::{
-        constants::{PATH_USERS, SMB_USER_AGENT},
-        smb_base_url_builder,
-    },
+    smbcloud_networking::{constants::PATH_USERS, smb_base_url_builder, smb_client::SmbClient},
     smbcloud_networking_account::signup::signup,
     smbcloud_utils::email_validation,
     spinners::Spinner,
@@ -115,6 +112,7 @@ async fn signup_with_github(env: Environment) -> Result<CommandResult> {
     }
 }
 
+/// Signup with GitHub account.
 pub async fn do_signup<T: Serialize + ?Sized>(env: Environment, args: &T) -> Result<CommandResult> {
     let spinner = Spinner::new(
         spinners::Spinners::BouncingBall,
@@ -147,12 +145,6 @@ pub async fn do_signup<T: Serialize + ?Sized>(env: Environment, args: &T) -> Res
     }
 }
 
-fn build_smb_signup_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env);
-    url_builder.add_route(PATH_USERS);
-    url_builder.build()
-}
-
 pub async fn do_signup_email(
     env: Environment,
     email: String,
@@ -163,7 +155,7 @@ pub async fn do_signup_email(
         succeed_message("Signing you up"),
     );
 
-    match signup(env, SMB_USER_AGENT.to_string(), email, password).await {
+    match signup(env, SmbClient::Cli, email, password).await {
         Ok(_) => Ok(CommandResult {
             spinner,
             symbol: succeed_symbol(),
@@ -177,3 +169,9 @@ pub async fn do_signup_email(
         }
     }
 }
+
+fn build_smb_signup_url(env: Environment) -> String {
+    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
+    url_builder.add_route(PATH_USERS);
+    url_builder.build()
+}

crates/cli/src/account/signup/process.rs

@@ -9,6 +9,7 @@ use {
         error_codes::{ErrorCode, ErrorResponse},
     },
     smbcloud_network::environment::Environment,
+    smbcloud_networking::smb_client::SmbClient,
     smbcloud_networking_project::crud_project_read::get_project,
     smbcloud_utils::config::Config,
     spinners::Spinner,
@@ -74,7 +75,14 @@ pub(crate) async fn check_project(
         spinners::Spinners::Hamburger,
         succeed_message("Validate project"),
     );
-    match get_project(env, access_token.to_string(), id.to_string()).await {
+    match get_project(
+        env,
+        SmbClient::Cli,
+        access_token.to_string(),
+        id.to_string(),
+    )
+    .await
+    {
         Ok(_) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Valid project"));
             Ok(())

crates/cli/src/deploy/config.rs

@@ -15,6 +15,7 @@ use {
     git2::{PushOptions, RemoteCallbacks, Repository},
     smbcloud_model::project::{DeploymentPayload, DeploymentStatus},
     smbcloud_network::environment::Environment,
+    smbcloud_networking::smb_client::SmbClient,
     smbcloud_networking_account::me::me,
     smbcloud_networking_project::{
         crud_project_deployment_create::create_deployment, crud_project_deployment_update::update,
@@ -103,9 +104,15 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
         status: DeploymentStatus::Started,
     };
 
-    let created_deployment =
-        create_deployment(env, &access_token, config.project.id, payload).await?;
-    let user = me(env, &access_token).await?;
+    let created_deployment = create_deployment(
+        env,
+        SmbClient::Cli,
+        &access_token,
+        config.project.id,
+        payload,
+    )
+    .await?;
+    let user = me(env, SmbClient::Cli, &access_token).await?;
 
     let mut push_opts = PushOptions::new();
     let mut callbacks = RemoteCallbacks::new();
@@ -158,6 +165,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
                     let result = handle.block_on(async {
                         update(
                             update_env, // Env is Copy
+                            SmbClient::Cli,
                             access_token_for_update_cb.clone(),
                             project_id_for_update_cb,
                             deployment_id_for_update_cb,
@@ -193,6 +201,7 @@ pub async fn process_deploy(env: Environment) -> Result<CommandResult> {
             };
             let result = update(
                 env,
+                SmbClient::Cli,
                 access_token.clone(),
                 config.project.id,
                 created_deployment.id,

crates/cli/src/deploy/process_deploy.rs

@@ -8,6 +8,7 @@ use {
         runner::Runner,
     },
     smbcloud_network::environment::Environment,
+    smbcloud_networking::smb_client::SmbClient,
     smbcloud_networking_project::crud_project_create::create_project,
     std::path::Path,
 };
@@ -94,6 +95,7 @@ pub(crate) async fn create_new_project(
 
     match create_project(
         env,
+        SmbClient::Cli,
         access_token,
         ProjectCreate {
             name,