Merge branch 'feature/ci' into development

Author: keypair34

Cargo.lock

@@ -29,7 +29,6 @@
 /// ```sh
 /// ssh-keyscan -t ed25519 api.smbcloud.xyz api-1.smbcloud.xyz 2>/dev/null
 /// ```
-
 /// Pinned ed25519 host key for `api.smbcloud.xyz` (NodeJs / Static tier).
 pub const API_SMBCLOUD_XYZ: &str =
     "api.smbcloud.xyz ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGy4LHGyOilS7SXo770V3tQnXDRVQr7X7JsPLCfy4XB";

crates/cli/src/deploy/known_hosts.rs

@@ -1,4 +1,9 @@
 #![allow(unexpected_cfgs, unsafe_op_in_unsafe_fn)]
+// The #[pyfunction] macro generates FFI wrapper code that calls From<PyErr>::from(err)
+// on the error path of every wrapped function. Since PyErr: From<PyErr> is the identity
+// impl, clippy flags it as useless_conversion. We cannot change macro-generated code,
+// so suppress the lint at crate level.
+#![allow(clippy::useless_conversion)]
 
 use pyo3::{
     create_exception,
@@ -67,7 +72,7 @@ fn serialize<'py, T>(py: Python<'py>, value: &T) -> PyResult<PyObject>
 where
     T: Serialize,
 {
-    Ok(pythonize(py, value)?.unbind().into())
+    Ok(pythonize(py, value)?.unbind())
 }
 
 fn login_payload(status: AccountStatus) -> LoginPayload {
@@ -120,18 +125,18 @@ fn signup_with_client(
     email: &str,
     password: &str,
 ) -> PyResult<PyObject> {
-    let env = parse_env(env)?;
-    let client = client_credentials(app_id, app_secret);
-    let result = runtime()
-        .block_on(rust_signup_with_client(
-            env,
-            client,
-            email.to_string(),
-            password.to_string(),
-        ))
-        .map_err(native_error)?;
-
-    serialize(py, &result)
+    parse_env(env).and_then(|env| {
+        let client = client_credentials(app_id, app_secret);
+        runtime()
+            .block_on(rust_signup_with_client(
+                env,
+                client,
+                email.to_string(),
+                password.to_string(),
+            ))
+            .map_err(native_error)
+            .and_then(|result| serialize(py, &result))
+    })
 }
 
 #[pyfunction]
@@ -143,19 +148,19 @@ fn login_with_client(
     email: &str,
     password: &str,
 ) -> PyResult<PyObject> {
-    let env = parse_env(env)?;
-    let client = client_credentials(app_id, app_secret);
-    let result = runtime()
-        .block_on(rust_login_with_client(
-            env,
-            client,
-            email.to_string(),
-            password.to_string(),
-        ))
-        .map(login_payload)
-        .map_err(native_error)?;
-
-    serialize(py, &result)
+    parse_env(env).and_then(|env| {
+        let client = client_credentials(app_id, app_secret);
+        runtime()
+            .block_on(rust_login_with_client(
+                env,
+                client,
+                email.to_string(),
+                password.to_string(),
+            ))
+            .map(login_payload)
+            .map_err(native_error)
+            .and_then(|result| serialize(py, &result))
+    })
 }
 
 #[pyfunction]
@@ -165,16 +170,16 @@ fn logout_with_client(
     app_secret: &str,
     access_token: &str,
 ) -> PyResult<()> {
-    let env = parse_env(env)?;
-    let client = client_credentials(app_id, app_secret);
-
-    runtime()
-        .block_on(rust_logout_with_client(
-            env,
-            client,
-            access_token.to_string(),
-        ))
-        .map_err(native_error)
+    parse_env(env).and_then(|env| {
+        let client = client_credentials(app_id, app_secret);
+        runtime()
+            .block_on(rust_logout_with_client(
+                env,
+                client,
+                access_token.to_string(),
+            ))
+            .map_err(native_error)
+    })
 }
 
 #[pyfunction]
@@ -185,13 +190,13 @@ fn me_with_client(
     app_secret: &str,
     access_token: &str,
 ) -> PyResult<PyObject> {
-    let env = parse_env(env)?;
-    let client = client_credentials(app_id, app_secret);
-    let result = runtime()
-        .block_on(rust_me_with_client(env, client, access_token))
-        .map_err(native_error)?;
-
-    serialize(py, &result)
+    parse_env(env).and_then(|env| {
+        let client = client_credentials(app_id, app_secret);
+        runtime()
+            .block_on(rust_me_with_client(env, client, access_token))
+            .map_err(native_error)
+            .and_then(|result| serialize(py, &result))
+    })
 }
 
 #[pyfunction]
@@ -201,12 +206,12 @@ fn remove_with_client(
     app_secret: &str,
     access_token: &str,
 ) -> PyResult<()> {
-    let env = parse_env(env)?;
-    let client = client_credentials(app_id, app_secret);
-
-    runtime()
-        .block_on(rust_remove_with_client(env, client, access_token))
-        .map_err(native_error)
+    parse_env(env).and_then(|env| {
+        let client = client_credentials(app_id, app_secret);
+        runtime()
+            .block_on(rust_remove_with_client(env, client, access_token))
+            .map_err(native_error)
+    })
 }
 
 #[pymodule(name = "_native")]

crates/smbcloud-auth-sdk-py/src/lib.rs

@@ -30,3 +30,9 @@ smbcloud-networking = { workspace = true }
 smbcloud-auth-sdk = { workspace = true }
 wasm-bindgen = { workspace = true }
 wasm-bindgen-futures = "0.4.50"
+
+# uuid's v4 feature needs a randomness source on wasm32-unknown-unknown.
+# The `js` feature wires it to the Web Crypto API (crypto.getRandomValues).
+# This only activates when building for wasm32 targets.
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+uuid = { version = "1", features = ["js"] }

crates/smbcloud-auth-sdk-wasm/Cargo.toml

@@ -87,13 +87,13 @@ pub fn parse_callback_url(
         });
     }
 
-    if let Some(expected_state) = expected_state {
-        if state.as_deref() != Some(expected_state) {
-            return Err(ErrorResponse::Error {
-                error_code: ErrorCode::InvalidParams,
-                message: "Apple callback state mismatch.".to_string(),
-            });
-        }
+    if let Some(expected_state) = expected_state
+        && state.as_deref() != Some(expected_state)
+    {
+        return Err(ErrorResponse::Error {
+            error_code: ErrorCode::InvalidParams,
+            message: "Apple callback state mismatch.".to_string(),
+        });
     }
 
     Ok(AppleAuthSession {

crates/smbcloud-auth-sdk/src/apple.rs

@@ -4,7 +4,7 @@ use {
     serde_repr::{Deserialize_repr, Serialize_repr},
     std::{
         fmt::{self, Display, Formatter},
-        path::PathBuf,
+        path::Path,
     },
 };
 
@@ -54,7 +54,7 @@ pub enum SwiftFramework {
 }
 
 impl Runner {
-    pub fn from(repo_path: &PathBuf) -> Result<Runner, ErrorResponse> {
+    pub fn from(repo_path: &Path) -> Result<Runner, ErrorResponse> {
         // Any package.json-driven app belongs on the NodeJs runner.
         // Framework-specific checks are not reliable because modern Next.js apps
         // do not need a next.config.* file at all.

crates/smbcloud-model/src/runner.rs

@@ -206,12 +206,12 @@ pub async fn request_login(builder: RequestBuilder) -> Result<AccountStatus, Err
                 message: error_code.to_string(),
             })
         }
-        (status, _) => parse_error_response(response).await.or_else(|_| {
-            Err(ErrorResponse::Error {
+        (status, _) => parse_error_response(response)
+            .await
+            .map_err(|_| ErrorResponse::Error {
                 error_code: ErrorCode::NetworkError,
                 message: format!("Unexpected login response status: {}", status),
-            })
-        }),
+            }),
     }
 }
 

crates/smbcloud-network/src/network.rs

@@ -1,7 +1,7 @@
 {
   "name": "@smbcloud/sdk-auth",
   "description": "Browser Auth SDK for smbCloud, built from Rust and WebAssembly.",
-  "version": "0.3.34",
+  "version": "0.3.35",
   "type": "module",
   "main": "dist/smbcloud_auth_wasm.js",
   "module": "dist/smbcloud_auth_wasm.js",