smbcloud-cli 0.4.10__tar.gz → 0.4.12__tar.gz

{smbcloud_cli-0.4.10 → smbcloud_cli-0.4.12}/Cargo.lock

@@ -2528,7 +2528,7 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "smbcloud-auth"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "log",
  "reqwest",
@@ -2543,7 +2543,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "base64",
  "reqwest",
@@ -2558,7 +2558,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk-py"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "pyo3",
  "pythonize",
@@ -2572,7 +2572,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk-wasm"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "serde-wasm-bindgen",
  "smbcloud-auth-sdk",
@@ -2585,7 +2585,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-cli"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2631,7 +2631,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-deploy"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "anyhow",
  "smbcloud-model",
@@ -2643,7 +2643,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-email-sdk"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "anyhow",
  "log",
@@ -2658,7 +2658,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-gresiq"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "native-tls",
  "postgres-native-tls",
@@ -2672,7 +2672,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-gresiq-sdk"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "anyhow",
  "log",
@@ -2686,7 +2686,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-mail"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "reqwest",
  "serde",
@@ -2698,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-model"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "chrono",
  "log",
@@ -2714,7 +2714,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-network"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "clap 4.6.2",
  "log",
@@ -2727,7 +2727,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-networking"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "smbcloud-network",
  "url-builder",
@@ -2735,7 +2735,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-networking-project"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2753,11 +2753,11 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-s6n"
-version = "0.4.10"
+version = "0.4.12"
 
 [[package]]
 name = "smbcloud-utils"
-version = "0.4.10"
+version = "0.4.12"
 dependencies = [
  "anyhow",
  "dirs",

{smbcloud_cli-0.4.10 → smbcloud_cli-0.4.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smbcloud-cli
-Version: 0.4.10
+Version: 0.4.12
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -15,7 +15,7 @@ Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Summary: smbCloud command line interface.
 Keywords: cli,cloud,smbcloud,web2,web3
-Author-email: Seto Elkahfi <hej@setoelkahfi.se>
+Author-email: Seto Elkahfi <seto@smbcloud.xyz>
 License: Apache-2.0
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM

{smbcloud_cli-0.4.10 → smbcloud_cli-0.4.12}/crates/cli/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "smbcloud-cli"
-version = "0.4.10"
+version = "0.4.12"
 edition = "2021"
-authors = ["Seto Elkahfi <hej@setoelkahfi.se>"]
+authors = ["Seto Elkahfi <seto@smbcloud.xyz>"]
 description = "smbCloud command line interface."
 license = "Apache-2.0"
 repository = "https://github.com/smbcloudXYZ/smbcloud-cli"

{smbcloud_cli-0.4.10 → smbcloud_cli-0.4.12}/crates/cli/src/cli/mod.rs

@@ -1,5 +1,5 @@
 use {
-    crate::{account, mail, project},
+    crate::{account, cloud_auth, mail, project, tenant},
     clap::{Parser, Subcommand},
     smbcloud_network::environment::Environment,
     spinners::Spinner,
@@ -81,11 +81,21 @@ pub enum Commands {
         #[clap(subcommand)]
         command: project::cli::Commands,
     },
+    #[clap(about = "Manage your tenants.")]
+    Tenant {
+        #[clap(subcommand)]
+        command: tenant::cli::Commands,
+    },
     #[clap(about = "Manage smbCloud Mail.")]
     Mail {
         #[clap(subcommand)]
         command: mail::cli::Commands,
     },
+    #[clap(about = "Manage smbCloud Auth apps.")]
+    Auth {
+        #[clap(subcommand)]
+        command: cloud_auth::cli::Commands,
+    },
     #[clap(
         about = "Migrate local .smb/config.toml deploy fields to the smbCloud server.",
         display_order = 4

smbcloud_cli-0.4.12/crates/cli/src/cloud-auth/auth_app.rs

@@ -0,0 +1,85 @@
+use crate::cloud_auth::{
+    request::request_empty,
+    url_builder::{build_auth_app_url, build_auth_apps_url},
+};
+use reqwest::Client;
+use serde::Serialize;
+use smbcloud_model::{
+    app_auth::{AuthApp, AuthAppCreate, AuthAppUpdate},
+    error_codes::ErrorResponse,
+};
+use smbcloud_network::{environment::Environment, network::request};
+use smbcloud_networking::{constants::SMB_USER_AGENT, smb_client::SmbClient};
+
+#[derive(Serialize)]
+struct AuthAppEnvelope<T> {
+    auth_app: T,
+}
+
+pub async fn get_auth_apps(
+    env: Environment,
+    client: (&SmbClient, &str),
+    access_token: String,
+    project_id: Option<String>,
+) -> Result<Vec<AuthApp>, ErrorResponse> {
+    let builder = Client::new()
+        .get(build_auth_apps_url(env, client, project_id.as_deref()))
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}
+
+pub async fn get_auth_app(
+    env: Environment,
+    client: (&SmbClient, &str),
+    access_token: String,
+    auth_app_id: String,
+) -> Result<AuthApp, ErrorResponse> {
+    let builder = Client::new()
+        .get(build_auth_app_url(env, client, &auth_app_id))
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}
+
+pub async fn create_auth_app(
+    env: Environment,
+    client: (&SmbClient, &str),
+    access_token: String,
+    auth_app: AuthAppCreate,
+) -> Result<AuthApp, ErrorResponse> {
+    let builder = Client::new()
+        .post(build_auth_apps_url(env, client, None))
+        .json(&AuthAppEnvelope { auth_app })
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}
+
+pub async fn update_auth_app(
+    env: Environment,
+    client: (&SmbClient, &str),
+    access_token: String,
+    auth_app_id: String,
+    auth_app: AuthAppUpdate,
+) -> Result<AuthApp, ErrorResponse> {
+    let builder = Client::new()
+        .put(build_auth_app_url(env, client, &auth_app_id))
+        .json(&AuthAppEnvelope { auth_app })
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request(builder).await
+}
+
+pub async fn delete_auth_app(
+    env: Environment,
+    client: (&SmbClient, &str),
+    access_token: String,
+    auth_app_id: String,
+) -> Result<(), ErrorResponse> {
+    let builder = Client::new()
+        .delete(build_auth_app_url(env, client, &auth_app_id))
+        .header("Authorization", access_token)
+        .header("User-agent", SMB_USER_AGENT);
+    request_empty(builder).await
+}

smbcloud_cli-0.4.12/crates/cli/src/cloud-auth/cli.rs

@@ -0,0 +1,38 @@
+use clap::Subcommand;
+
+#[derive(Subcommand)]
+pub enum Commands {
+    #[clap(about = "List your Auth apps.")]
+    List {
+        #[clap(long)]
+        project_id: Option<String>,
+    },
+    #[clap(about = "Show an Auth app.")]
+    Show {
+        #[clap(long, required = true)]
+        id: String,
+    },
+    #[clap(about = "Create an Auth app.")]
+    New {
+        #[clap(long, required = true)]
+        name: String,
+        #[clap(long)]
+        project_id: Option<String>,
+        #[clap(long)]
+        support_email: Option<String>,
+    },
+    #[clap(about = "Update an Auth app.")]
+    Update {
+        #[clap(long, required = true)]
+        id: String,
+        #[clap(long)]
+        name: Option<String>,
+        #[clap(long)]
+        support_email: Option<String>,
+    },
+    #[clap(about = "Delete an Auth app.")]
+    Delete {
+        #[clap(long, required = true)]
+        id: String,
+    },
+}

smbcloud_cli-0.4.12/crates/cli/src/cloud-auth/mod.rs

@@ -0,0 +1,6 @@
+pub mod auth_app;
+pub mod cli;
+pub mod process;
+mod render;
+mod request;
+mod url_builder;

smbcloud_cli-0.4.12/crates/cli/src/cloud-auth/process.rs

@@ -0,0 +1,193 @@
+use crate::{
+    cli::CommandResult,
+    client,
+    cloud_auth::{
+        auth_app::{
+            create_auth_app, delete_auth_app, get_auth_app, get_auth_apps, update_auth_app,
+        },
+        cli::Commands,
+        render::{print_auth_app_detail, print_auth_apps},
+    },
+    mail::current_project::{resolve_optional_project_id, resolve_required_project_id},
+    token::get_smb_token::get_smb_token,
+    ui::{fail_message, fail_symbol, prompt::confirm_delete, succeed_message, succeed_symbol},
+};
+use anyhow::{anyhow, Result};
+use smbcloud_model::app_auth::{AuthAppCreate, AuthAppUpdate};
+use smbcloud_network::environment::Environment;
+use spinners::Spinner;
+
+pub async fn process_cloud_auth(env: Environment, commands: Commands) -> Result<CommandResult> {
+    match commands {
+        Commands::List { project_id } => process_auth_app_list(env, project_id).await,
+        Commands::Show { id } => process_auth_app_show(env, id).await,
+        Commands::New {
+            name,
+            project_id,
+            support_email,
+        } => process_auth_app_new(env, name, project_id, support_email).await,
+        Commands::Update {
+            id,
+            name,
+            support_email,
+        } => process_auth_app_update(env, id, name, support_email).await,
+        Commands::Delete { id } => process_auth_app_delete(env, id).await,
+    }
+}
+
+async fn process_auth_app_list(
+    env: Environment,
+    project_id: Option<String>,
+) -> Result<CommandResult> {
+    let access_token = get_smb_token(env)?;
+    let resolved_project_id = resolve_optional_project_id(env, normalize_optional(project_id))?;
+    let mut spinner = loading_spinner("Loading Auth apps");
+
+    let auth_apps = get_auth_apps(env, client(), access_token, resolved_project_id)
+        .await
+        .map_err(api_error)?;
+
+    spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
+    print_auth_apps(&auth_apps);
+
+    Ok(done_result(if auth_apps.is_empty() {
+        "No Auth apps found."
+    } else {
+        "Done."
+    }))
+}
+
+async fn process_auth_app_show(env: Environment, id: String) -> Result<CommandResult> {
+    let access_token = get_smb_token(env)?;
+    let auth_app_id = normalize_required("Auth app id", id)?;
+    let mut spinner = loading_spinner("Loading Auth app");
+
+    let auth_app = get_auth_app(env, client(), access_token, auth_app_id)
+        .await
+        .map_err(api_error)?;
+
+    spinner.stop_and_persist(&succeed_symbol(), succeed_message("Loaded."));
+    print_auth_app_detail(&auth_app);
+
+    Ok(done_result("Done."))
+}
+
+async fn process_auth_app_new(
+    env: Environment,
+    name: String,
+    project_id: Option<String>,
+    support_email: Option<String>,
+) -> Result<CommandResult> {
+    let access_token = get_smb_token(env)?;
+    let auth_app = AuthAppCreate {
+        name: normalize_required("name", name)?,
+        project_id: resolve_required_project_id(env, normalize_optional(project_id))?,
+        support_email: normalize_optional(support_email),
+    };
+    let mut spinner = loading_spinner("Creating Auth app");
+
+    let auth_app = create_auth_app(env, client(), access_token, auth_app)
+        .await
+        .map_err(api_error)?;
+
+    spinner.stop_and_persist(&succeed_symbol(), succeed_message("Created."));
+    print_auth_app_detail(&auth_app);
+
+    Ok(done_result("Auth app created."))
+}
+
+async fn process_auth_app_update(
+    env: Environment,
+    id: String,
+    name: Option<String>,
+    support_email: Option<String>,
+) -> Result<CommandResult> {
+    let access_token = get_smb_token(env)?;
+    let auth_app_id = normalize_required("Auth app id", id)?;
+    let update = AuthAppUpdate {
+        name: normalize_optional(name),
+        support_email: normalize_optional(support_email),
+    };
+
+    if update.is_empty() {
+        return Err(anyhow!(
+            "Specify at least one of `--name` or `--support-email`."
+        ));
+    }
+
+    let mut spinner = loading_spinner("Updating Auth app");
+    let auth_app = update_auth_app(env, client(), access_token, auth_app_id, update)
+        .await
+        .map_err(api_error)?;
+
+    spinner.stop_and_persist(&succeed_symbol(), succeed_message("Updated."));
+    print_auth_app_detail(&auth_app);
+
+    Ok(done_result("Auth app updated."))
+}
+
+async fn process_auth_app_delete(env: Environment, id: String) -> Result<CommandResult> {
+    let auth_app_id = normalize_required("Auth app id", id)?;
+    let confirmed = confirm_delete(
+        "Auth app deletion confirmation",
+        &format!("Delete Auth app #{auth_app_id}"),
+    )?;
+
+    if !confirmed {
+        return Ok(done_result("Cancelled."));
+    }
+
+    let access_token = get_smb_token(env)?;
+    let spinner = loading_spinner("Deleting Auth app");
+
+    match delete_auth_app(env, client(), access_token, auth_app_id).await {
+        Ok(()) => Ok(CommandResult {
+            spinner,
+            symbol: succeed_symbol(),
+            msg: succeed_message("Done. Auth app has been deleted."),
+        }),
+        Err(error) => Ok(CommandResult {
+            spinner,
+            symbol: fail_symbol(),
+            msg: fail_message(&error.to_string()),
+        }),
+    }
+}
+
+fn loading_spinner(message: &str) -> Spinner {
+    Spinner::new(
+        spinners::Spinners::SimpleDotsScrolling,
+        succeed_message(message),
+    )
+}
+
+fn done_result(message: &str) -> CommandResult {
+    CommandResult {
+        spinner: loading_spinner("Done"),
+        symbol: succeed_symbol(),
+        msg: succeed_message(message),
+    }
+}
+
+fn normalize_required(label: &str, value: String) -> Result<String> {
+    let normalized_value = value.trim().to_string();
+    if normalized_value.is_empty() {
+        return Err(anyhow!("{} cannot be empty.", label));
+    }
+    Ok(normalized_value)
+}
+
+fn normalize_optional(value: Option<String>) -> Option<String> {
+    value.and_then(|value| {
+        let normalized_value = value.trim().to_string();
+        if normalized_value.is_empty() {
+            None
+        } else {
+            Some(normalized_value)
+        }
+    })
+}
+
+fn api_error(error: impl std::fmt::Display) -> anyhow::Error {
+    anyhow!(error.to_string())
+}

smbcloud_cli-0.4.12/crates/cli/src/cloud-auth/render.rs

@@ -0,0 +1,45 @@
+use console::style;
+use smbcloud_model::app_auth::AuthApp;
+
+fn print_heading(title: &str) {
+    println!("\n{}", style(title).bold().underlined());
+}
+
+fn print_field(label: &str, value: impl AsRef<str>) {
+    println!("{} {}", style(format!("{label}:")).cyan(), value.as_ref());
+}
+
+fn print_optional_field(label: &str, value: Option<&str>) {
+    if let Some(value) = value {
+        print_field(label, value);
+    }
+}
+
+pub(crate) fn print_auth_apps(auth_apps: &[AuthApp]) {
+    print_heading("Auth apps");
+
+    if auth_apps.is_empty() {
+        println!("No Auth apps found.");
+        return;
+    }
+
+    for auth_app in auth_apps {
+        println!(
+            "#{} {} project={}",
+            auth_app.id,
+            style(&auth_app.name).bold(),
+            auth_app.project_id.as_deref().unwrap_or("-")
+        );
+    }
+}
+
+pub(crate) fn print_auth_app_detail(auth_app: &AuthApp) {
+    print_heading("Auth app");
+    print_field("ID", &auth_app.id);
+    print_field("Name", &auth_app.name);
+    print_optional_field("Project ID", auth_app.project_id.as_deref());
+    print_optional_field("Support email", auth_app.support_email.as_deref());
+    print_optional_field("Secret", auth_app.secret.as_deref());
+    print_field("Created at", auth_app.created_at.to_rfc3339());
+    print_field("Updated at", auth_app.updated_at.to_rfc3339());
+}

smbcloud_cli-0.4.12/crates/cli/src/cloud-auth/url_builder.rs

@@ -0,0 +1,28 @@
+use {
+    smbcloud_network::environment::Environment,
+    smbcloud_networking::{smb_base_url_builder, smb_client::SmbClient},
+};
+
+pub(crate) fn build_auth_apps_url(
+    env: Environment,
+    client: (&SmbClient, &str),
+    project_id: Option<&str>,
+) -> String {
+    let mut url_builder = smb_base_url_builder(env, client);
+    url_builder.add_route("v1/auth_apps");
+    if let Some(project_id) = project_id {
+        url_builder.add_param("project_id", project_id);
+    }
+    url_builder.build()
+}
+
+pub(crate) fn build_auth_app_url(
+    env: Environment,
+    client: (&SmbClient, &str),
+    auth_app_id: &str,
+) -> String {
+    let mut url_builder = smb_base_url_builder(env, client);
+    url_builder.add_route("v1/auth_apps");
+    url_builder.add_route(auth_app_id);
+    url_builder.build()
+}

{smbcloud_cli-0.4.10/crates/cli/src/deploy → smbcloud_cli-0.4.12/crates/cli/src/cloud-deploy}/process_migrate.rs

@@ -178,6 +178,7 @@ fn build_payload(
 fn strip_project(project: &Project) -> Project {
     Project {
         id: project.id,
+        tenant_id: project.tenant_id,
         name: project.name.clone(),
         runner: project.runner,
         deployment_method: DeploymentMethod::default(),

{smbcloud_cli-0.4.10/crates/cli/src/deploy → smbcloud_cli-0.4.12/crates/cli/src/cloud-deploy}/setup_create_new_project.rs

@@ -111,11 +111,13 @@ pub(crate) async fn create_new_project(
         }
     };
 
+    let tenant_id = crate::session_config::current_tenant_id(env).unwrap_or(None);
     let project = create_project(
         env,
         client(),
         access_token.clone(),
         ProjectCreate { name, description },
+        tenant_id,
     )
     .await?;
 

smbcloud_cli-0.4.12/crates/cli/src/cloud-mail/current_project.rs

@@ -0,0 +1,24 @@
+use anyhow::{anyhow, Result};
+use smbcloud_network::environment::Environment;
+
+pub(crate) fn resolve_optional_project_id(
+    env: Environment,
+    project_id: Option<String>,
+) -> Result<Option<String>> {
+    match project_id {
+        Some(project_id) => Ok(Some(project_id)),
+        None => crate::session_config::current_project_id(env),
+    }
+}
+
+pub(crate) fn resolve_required_project_id(
+    env: Environment,
+    project_id: Option<String>,
+) -> Result<String> {
+    match resolve_optional_project_id(env, project_id)? {
+        Some(project_id) => Ok(project_id),
+        None => Err(anyhow!(
+            "No project selected. Pass `--project-id` or run `smb project use --id <project-id>`."
+        )),
+    }
+}

smbcloud_cli-0.4.10/crates/cli/src/mail.rs → smbcloud_cli-0.4.12/crates/cli/src/cloud-mail/mod.rs

@@ -1,4 +1,4 @@
 pub mod cli;
-mod current_project;
+pub(crate) mod current_project;
 pub mod process;
 mod render;

{smbcloud_cli-0.4.10 → smbcloud_cli-0.4.12}/crates/cli/src/lib.rs

@@ -3,11 +3,17 @@ use smbcloud_networking::smb_client::SmbClient;
 pub mod account;
 pub mod ci;
 pub mod cli;
+#[path = "cloud-auth/mod.rs"]
+pub mod cloud_auth;
+#[path = "cloud-deploy/mod.rs"]
 pub mod deploy;
 pub mod interface;
+#[path = "cloud-mail/mod.rs"]
 pub mod mail;
 pub mod mcp;
 pub mod project;
+mod session_config;
+pub mod tenant;
 mod token;
 pub mod ui;