Merge branch 'feature/smbcloud-client' into development

Author: setoelkahfi

.env.example

@@ -1,6 +1 @@
-CLI_CLIENT_ID=
-SIGIT_CLIENT_ID=
-WEB_CONSOLE_CLIENT_ID=
 CLI_CLIENT_SECRET=
-SIGIT_CLIENT_SECRET=
-WEB_CONSOLE_CLIENT_SECRET=

Cargo.lock

@@ -11,6 +11,7 @@ clap_mangen = "0.2.10"
 console = "0.16"
 dialoguer = "0.11.0"
 dirs = "6.0"
+dotenv_codegen = "0.15"
 git2 = "0.20.1"
 home = "0.5.4"
 indicatif = "0.17.11"

Cargo.toml

@@ -29,6 +29,7 @@ clap_mangen = { workspace = true }
 console = { workspace = true }
 dialoguer = { workspace = true }
 dirs = { workspace = true }
+dotenv_codegen = { workspace = true }
 git2 = { workspace = true }
 home = { workspace = true }
 indicatif = { workspace = true }

crates/cli/Cargo.toml

@@ -1,15 +1,14 @@
 use crate::{
     cli::CommandResult,
+    client,
     ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
 };
 use anyhow::Result;
 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, smb_client::SmbClient,
-};
+use smbcloud_networking::{constants::PATH_USERS_PASSWORD, smb_base_url_builder};
 use smbcloud_utils::email_validation;
 use spinners::Spinner;
 
@@ -117,7 +116,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, &SmbClient::Cli);
+    let mut url_builder = smb_base_url_builder(env, client());
     url_builder.add_route(PATH_USERS_PASSWORD);
     url_builder.build()
 }

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

@@ -193,7 +193,8 @@ 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, &SmbClient::Cli);
+    let secret = "secret";
+    let mut url_builder = smb_base_url_builder(env, (&SmbClient::Cli, secret));
     url_builder.add_route(PATH_AUTHORIZE);
     url_builder.build()
 }

crates/cli/src/account/lib.rs

@@ -5,6 +5,7 @@ use {
             signup::{do_signup, signup_with_email, SignupMethod},
         },
         cli::CommandResult,
+        client,
         token::is_logged_in::is_logged_in as is_logged_in_async,
         ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     },
@@ -25,9 +26,7 @@ use {
         signup::{GithubEmail, Provider, SignupGithubParams, SignupUserGithub},
     },
     smbcloud_network::environment::Environment,
-    smbcloud_networking::{
-        constants::PATH_LINK_GITHUB_ACCOUNT, smb_base_url_builder, smb_client::SmbClient,
-    },
+    smbcloud_networking::{constants::PATH_LINK_GITHUB_ACCOUNT, smb_base_url_builder},
     smbcloud_networking_account::{
         check_email::check_email, login::login,
         resend_email_verification::resend_email_verification as account_resend_email_verification,
@@ -214,7 +213,7 @@ async fn resend_email_verification(env: Environment, user: User) -> Result<Comma
             .bold()
             .to_string(),
     );
-    match account_resend_email_verification(env, SmbClient::Cli, user.email).await {
+    match account_resend_email_verification(env, client(), user.email).await {
         Ok(_) => Ok(CommandResult {
             spinner,
             symbol: succeed_symbol(),
@@ -292,7 +291,7 @@ async fn login_with_email(env: Environment) -> Result<CommandResult> {
         }
     };
 
-    match check_email(env, SmbClient::Cli, &username).await {
+    match check_email(env, client(), &username).await {
         Ok(auth) => {
             // Only continue with password input if email is found and confirmed.
             if auth.error_code.is_some() {
@@ -327,7 +326,7 @@ async fn do_process_login(env: Environment, args: LoginArgs) -> Result<CommandRe
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Loading"),
     );
-    let account_status = match login(env, SmbClient::Cli, args.username, args.password).await {
+    let account_status = match login(env, client(), args.username, args.password).await {
         Ok(response) => response,
         Err(_) => return Err(anyhow!(fail_message("Check your internet connection."))),
     };
@@ -466,7 +465,7 @@ async fn resend_reset_password_instruction(env: Environment, user: User) -> Resu
         succeed_message("Sending reset password instruction..."),
     );
 
-    match account_resend_reset_password_instruction(env, SmbClient::Cli, user.email).await {
+    match account_resend_reset_password_instruction(env, client(), user.email).await {
         Ok(_) => {
             spinner.stop_and_persist(
                 "✅",
@@ -509,7 +508,7 @@ async fn input_reset_password_token(env: Environment) -> Result<CommandResult> {
         style("Resetting password...").green().bold().to_string(),
     );
 
-    match account_reset_password(env, SmbClient::Cli, token, password).await {
+    match account_reset_password(env, client(), token, password).await {
         Ok(_) => Ok(CommandResult {
             spinner,
             symbol: succeed_symbol(),
@@ -520,7 +519,7 @@ async fn input_reset_password_token(env: Environment) -> Result<CommandResult> {
 }
 
 fn build_smb_connect_github_url(env: Environment) -> String {
-    let mut url_builder = smb_base_url_builder(env, &SmbClient::Cli);
+    let mut url_builder = smb_base_url_builder(env, client());
     url_builder.add_route(PATH_LINK_GITHUB_ACCOUNT);
     url_builder.build()
 }

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

@@ -1,13 +1,13 @@
 use {
     crate::{
         cli::CommandResult,
+        client,
         token::{get_smb_token::get_smb_token, smb_token_file_path::smb_token_file_path},
         ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     },
     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,
@@ -68,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, SmbClient::Cli, token).await {
+    match logout(env, client(), token).await {
         Ok(_) => Ok(()),
         Err(e) => Err(anyhow!("{e}")),
     }

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

@@ -1,4 +1,5 @@
 use crate::account::lib::is_logged_in;
+use crate::client;
 use crate::token::get_smb_token::get_smb_token;
 use crate::{
     cli::CommandResult,
@@ -7,7 +8,6 @@ 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};
@@ -51,7 +51,7 @@ pub async fn process_me(env: Environment) -> Result<CommandResult> {
         succeed_message("Loading"),
     );
     let token = get_smb_token(env)?;
-    match me(env, SmbClient::Cli, &token).await {
+    match me(env, client(), &token).await {
         Ok(user) => {
             spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
             show_user(&user);

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

@@ -3,6 +3,7 @@ use {
     crate::{
         account::lib::authorize_github,
         cli::CommandResult,
+        client,
         token::smb_token_file_path::smb_token_file_path,
         ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
     },
@@ -13,7 +14,7 @@ use {
     serde::Serialize,
     smbcloud_model::signup::SignupResult,
     smbcloud_network::environment::Environment,
-    smbcloud_networking::{constants::PATH_USERS, smb_base_url_builder, smb_client::SmbClient},
+    smbcloud_networking::{constants::PATH_USERS, smb_base_url_builder},
     smbcloud_networking_account::signup::signup,
     smbcloud_utils::email_validation,
     spinners::Spinner,
@@ -155,7 +156,7 @@ pub async fn do_signup_email(
         succeed_message("Signing you up"),
     );
 
-    match signup(env, SmbClient::Cli, email, password).await {
+    match signup(env, client(), email, password).await {
         Ok(_) => Ok(CommandResult {
             spinner,
             symbol: succeed_symbol(),
@@ -171,7 +172,7 @@ 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);
+    let mut url_builder = smb_base_url_builder(env, client());
     url_builder.add_route(PATH_USERS);
     url_builder.build()
 }