crate api-ui #1, almost there

Author: rampage644

Cargo.toml

@@ -35,6 +35,8 @@ axum-macros = "0.5"
 dashmap = "6.1.0"
 regex = "1.11"
 indexmap = "2.7.1"
+time = "0.3.37"
+tower-sessions = { version = "0.14.0" }
 url = "2.5"
 tokio = { version = "1", features = ["full"] }
 async-trait = { version = "0.1.84" }

crates/api-sessions/Cargo.toml

@@ -9,9 +9,9 @@ core-executor = { path = "../core-executor" }
 
 async-trait = { workspace = true }
 axum = { workspace = true }
-tower-sessions = "0.14"
+tower-sessions = { workspace = true }
 tokio = { workspace = true }
-time = "0.3.37"
+time = { workspace = true }
 http = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/api-ui/Cargo.toml

@@ -5,6 +5,40 @@ edition = "2024"
 license-file.workspace = true
 
 [dependencies]
+api-sessions = { path = "../api-sessions" }
+core-metastore = { path = "../core-metastore" }
+core-utils = { path = "../core-utils" }
+core-executor = { path = "../core-executor" }
+core-history = { path = "../core-history" }
+
+axum = { workspace = true }
+chrono = { workspace = true }
+datafusion = { workspace = true }
+indexmap = { workspace = true }
+jsonwebtoken = { workspace = true }
+http = { workspace = true }
+mime_guess = "2"
+serde = { workspace = true }
+serde_json = { workspace = true }
+snafu = { workspace = true }
+tar = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tower-http = { version = "0.6.1", features = [
+  "catch-panic",
+  "timeout",
+  "sensitive-headers",
+  "cors",
+  "trace",
+] }
+tower-sessions = { workspace = true }
+time = { workspace = true }
+utoipa = { workspace = true }
+uuid = { workspace = true }
+validator = { workspace = true }
+
+[dev-dependencies]
+reqwest = "0.12.14"
 
 [lints]
 workspace = true

crates/runtime/src/http/auth/error.rs renamed to crates/api-ui/src/auth/error.rs

@@ -1,21 +1,21 @@
-use crate::http::auth::models::{AccountResponse, RefreshTokenResponse};
+use crate::auth::models::{AccountResponse, RefreshTokenResponse};
 use std::collections::HashMap;
 
 use super::error::AuthErrorResponse;
 use super::error::CreateJwtSnafu;
-use crate::http::auth::error::{
+use crate::auth::error::{
     AuthError, AuthResult, BadRefreshTokenSnafu, ResponseHeaderSnafu, SetCookieSnafu,
     TokenErrorKind,
 };
-use crate::http::auth::models::{AuthResponse, Claims, LoginPayload};
-use crate::http::state::AppState;
+use crate::auth::models::{AuthResponse, Claims, LoginPayload};
+use crate::state::AppState;
+use axum::Json;
 use axum::extract::State;
 use axum::response::IntoResponse;
-use axum::Json;
 use chrono::offset::Local;
-use http::header::SET_COOKIE;
 use http::HeaderMap;
-use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
+use http::header::SET_COOKIE;
+use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation, decode, encode};
 use serde::Serialize;
 use snafu::ResultExt;
 use time::Duration;

crates/runtime/src/http/auth/handlers.rs renamed to crates/api-ui/src/auth/handlers.rs

@@ -1,6 +1,6 @@
 use super::error::{AuthError, AuthResult, BadAuthTokenSnafu};
 use super::handlers::get_claims_validate_jwt_token;
-use crate::http::state::AppState;
+use crate::state::AppState;
 use axum::{
     extract::{Request, State},
     middleware::Next,

crates/runtime/src/http/auth/layer.rs renamed to crates/api-ui/src/auth/layer.rs

@@ -1,6 +1,6 @@
-use crate::http::state::AppState;
-use axum::routing::{get, post};
+use crate::state::AppState;
 use axum::Router;
+use axum::routing::{get, post};
 
 use super::handlers::{account, login, logout, refresh_access_token};
 

crates/runtime/src/http/auth/mod.rs renamed to crates/api-ui/src/auth/mod.rs

@@ -0,0 +1,47 @@
+pub use crate::web_assets::config::StaticWebConfig;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WebConfig {
+    pub host: String,
+    pub port: u16,
+    pub allow_origin: Option<String>,
+}
+
+// Non serializable, no Clone, Copy, Debug traits
+#[derive(Default)]
+pub struct AuthConfig {
+    jwt_secret: String,
+    demo_user: String,
+    demo_password: String,
+}
+
+impl AuthConfig {
+    #[must_use]
+    pub fn new(jwt_secret: String) -> Self {
+        Self {
+            jwt_secret,
+            ..Self::default()
+        }
+    }
+
+    pub fn with_demo_credentials(&mut self, demo_user: String, demo_password: String) {
+        self.demo_user = demo_user;
+        self.demo_password = demo_password;
+    }
+
+    #[must_use]
+    pub fn jwt_secret(&self) -> &str {
+        &self.jwt_secret
+    }
+
+    #[must_use]
+    pub fn demo_user(&self) -> &str {
+        &self.demo_user
+    }
+
+    #[must_use]
+    pub fn demo_password(&self) -> &str {
+        &self.demo_password
+    }
+}