bump: uuid

.env.docker.sample

@@ -9,6 +9,5 @@ POSTGRES_AUTH_USER=soaricarus_op
 POSTGRES_AUTH_PASSWORD=password
 POSTGRES_AUTH_DB=soaricarus_auth_db
 POSTGRES_AUTH_HOST=auth_db
-POSTGRES_AUTH_PORT=5432
+DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}
-DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:${POSTGRES_AUTH_PORT}/${POSTGRES_AUTH_DB}
 ENABLE_REGISTRATION=TRUE

.env.local.sample

@@ -9,6 +9,5 @@ POSTGRES_AUTH_USER=soaricarus_op_test
 POSTGRES_AUTH_PASSWORD=password
 POSTGRES_AUTH_DB=soaricarus_auth_test_db
 POSTGRES_AUTH_HOST=localhost
-POSTGRES_AUTH_PORT=5432
+DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}
-DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:${POSTGRES_AUTH_PORT}/${POSTGRES_AUTH_DB}
 ENABLE_REGISTRATION=TRUE

.gitea/workflows/tag_release.yml

@@ -12,12 +12,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
         with:
-          fetch-depth: 0
+          fetch-depth: 0 # Important for git describe --tags
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.96.1
           components: cargo
       - uses: Swatinem/rust-cache@v2
 

.gitea/workflows/workflow.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - name: Verify Docker Environment
         run: |
@@ -88,7 +88,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
@@ -108,7 +108,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
@@ -128,7 +128,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.97
+          toolchain: 1.96.1
       - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh

Cargo.toml

@@ -1,30 +1,28 @@
 [package]
 name = "soaricarus_auth"
-version = "0.8.2"
+version = "0.8.1"
 edition = "2024"
 rust-version = "1.95"
-license = "MIT"
-description = "Auth API for soaricarus"
 
 [dependencies]
 axum = { version = "0.8.9" }
 openssl = { version = "0.10.81", features = ["vendored"] }
-serde = { version = "1.0.229", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.151" }
+serde_json = { version = "1.0.150" }
-tokio = { version = "1.53.1", features = ["rt-multi-thread"] }
+tokio = { version = "1.52.3", features = ["rt-multi-thread"] }
 tracing-subscriber = { version = "0.3.23" }
 tower = { version = "0.5.3", features = ["full"] }
 tower-http = { version = "0.7.0", features = ["cors"] }
 sqlx = { version = "0.9.0", features = ["postgres", "runtime-tokio", "tls-native-tls", "time", "uuid"] }
-uuid = { version = "1.24.1", features = ["v4", "serde"] }
+uuid = { version = "1.23.5", features = ["v4", "serde"] }
 argon2 = { version = "0.5.3", features = ["std"] }
-time = { version = "0.3.55", features = ["macros", "serde"] }
+time = { version = "0.3.53", features = ["macros", "serde"] }
 josekit = { version = "0.10.3" }
 utoipa = { version = "5.5.0", features = ["axum_extras"] }
 utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
-simodels = { git = "ssh://git@git.kundeng.us/phoenix/simodels.git", tag = "v0.11.4" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.11.3" }
-sienvy = { git = "ssh://git@git.kundeng.us/phoenix/sienvy.git", tag = "v0.8.1" }
+icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.8.0" }
 
 [dev-dependencies]
-http-body-util = { version = "0.1.5" }
+http-body-util = { version = "0.1.3" }
 url = { version = "2.5.8" }

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.97 as builder
+FROM rust:1.96.1 as builder
 
 # Set the working directory inside the container
 WORKDIR /usr/src/app

LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2026 Kun Deng.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

docker-compose.yaml

@@ -19,13 +19,12 @@ services:
     image: postgres:18.4-alpine
     container_name: soaricarus_auth_db
     environment:
-      POSTGRES_USER: ${POSTGRES_AUTH_USER:-soaricarus_op}
+      POSTGRES_USER: ${POSTGRES_AUTH_USER:-icarus_op}
       POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password}
       POSTGRES_DB: ${POSTGRES_AUTH_DB:-soaricarus_auth_db}
     volumes:
       - postgres_data:/var/lib/postgresql
-    ports:
+    ports: []
-      - "5433:5432"
     healthcheck:
         # Checks if Postgres is ready to accept connections
         test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]

src/callers/login.rs

@@ -28,14 +28,14 @@ pub mod response {
     #[derive(Default, Deserialize, Serialize, utoipa::ToSchema)]
     pub struct Response {
         pub message: String,
-        pub data: Vec<simodels::login_result::LoginResult>,
+        pub data: Vec<icarus_models::login_result::LoginResult>,
     }
 
     pub mod service_login {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct Response {
             pub message: String,
-            pub data: Vec<simodels::login_result::LoginResult>,
+            pub data: Vec<icarus_models::login_result::LoginResult>,
         }
     }
 
@@ -43,7 +43,7 @@ pub mod response {
         #[derive(Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
         pub struct Response {
             pub message: String,
-            pub data: Vec<simodels::login_result::LoginResult>,
+            pub data: Vec<icarus_models::login_result::LoginResult>,
         }
     }
 }
@@ -92,7 +92,7 @@ pub mod endpoint {
             Ok(user) => {
                 if hashing::verify_password(&payload.password, user.password.clone()).unwrap() {
                     // Create token
-                    let key = sienvy::environment::get_secret_key().value;
+                    let key = icarus_envy::environment::get_secret_key().value;
                     let (token_literal, duration) =
                         token_stuff::create_token(&key, &user.id).unwrap();
 
@@ -104,11 +104,11 @@ pub mod endpoint {
                             StatusCode::OK,
                             Json(response::Response {
                                 message: String::from("Successful"),
-                                data: vec![simodels::login_result::LoginResult {
+                                data: vec![icarus_models::login_result::LoginResult {
                                     id: user.id,
                                     username: user.username.clone(),
                                     token: token_literal,
-                                    token_type: String::from(simodels::token::TOKEN_TYPE),
+                                    token_type: String::from(icarus_models::token::TOKEN_TYPE),
                                     expiration: duration,
                                 }],
                             }),
@@ -151,16 +151,16 @@ pub mod endpoint {
 
         match repo::service::valid_passphrase(&pool, &payload.passphrase).await {
             Ok((id, username, _date_created)) => {
-                let key = sienvy::environment::get_secret_key().value;
+                let key = icarus_envy::environment::get_secret_key().value;
                 let (token_literal, duration) =
                     token_stuff::create_service_token(&key, &id).unwrap();
 
                 if token_stuff::verify_token(&key, &token_literal) {
-                    let login_result = simodels::login_result::LoginResult {
+                    let login_result = icarus_models::login_result::LoginResult {
                         id,
                         username,
                         token: token_literal,
-                        token_type: String::from(simodels::token::TOKEN_TYPE),
+                        token_type: String::from(icarus_models::token::TOKEN_TYPE),
                         expiration: duration,
                     };
 
@@ -203,7 +203,7 @@ pub mod endpoint {
         axum::Json<response::refresh_token::Response>,
     ) {
         let mut response = response::refresh_token::Response::default();
-        let key = sienvy::environment::get_secret_key().value;
+        let key = icarus_envy::environment::get_secret_key().value;
 
         if token_stuff::verify_token(&key, &payload.access_token) {
             let token_type = token_stuff::get_token_type(&key, &payload.access_token).unwrap();
@@ -215,11 +215,11 @@ pub mod endpoint {
                         Ok((username, _, _)) => {
                             match token_stuff::create_service_refresh_token(&key, &id) {
                                 Ok((access_token, exp_dur)) => {
-                                    let login_result = simodels::login_result::LoginResult {
+                                    let login_result = icarus_models::login_result::LoginResult {
                                         id,
                                         token: access_token,
                                         expiration: exp_dur,
-                                        token_type: String::from(simodels::token::TOKEN_TYPE),
+                                        token_type: String::from(icarus_models::token::TOKEN_TYPE),
                                         username,
                                     };
                                     response.message = String::from("Successful");

src/callers/register.rs

@@ -29,7 +29,7 @@ pub mod response {
     #[derive(Deserialize, Serialize, utoipa::ToSchema)]
     pub struct Response {
         pub message: String,
-        pub data: Vec<simodels::user::User>,
+        pub data: Vec<icarus_models::user::User>,
     }
 }
 
@@ -67,7 +67,7 @@ pub async fn register_user(
     };
 
     if registration_enabled {
-        let mut user = simodels::user::User {
+        let mut user = icarus_models::user::User {
             username: payload.username.clone(),
             password: payload.password.clone(),
             email: payload.email.clone(),
@@ -91,7 +91,7 @@ pub async fn register_user(
                     )
                 } else {
                     let salt_string = hashing::generate_salt().unwrap();
-                    let mut salt = simodels::user::salt::Salt::default();
+                    let mut salt = icarus_models::user::salt::Salt::default();
                     let generated_salt = salt_string;
                     salt.salt = generated_salt.to_string();
                     salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
@@ -144,7 +144,7 @@ pub async fn register_user(
 /// Checks to see if registration is enabled
 async fn is_registration_enabled() -> Result<bool, std::io::Error> {
     let key = String::from("ENABLE_REGISTRATION");
-    let var = sienvy::environment::get_env(&key);
+    let var = icarus_envy::environment::get_env(&key);
     let parsed_value = var.value.to_uppercase();
 
     if parsed_value == "TRUE" {

src/db/init.rs

@@ -1,7 +1,7 @@
 use sqlx::postgres::PgPoolOptions;
 
 pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-    let database_url = sienvy::environment::get_db_url().value;
+    let database_url = icarus_envy::environment::get_db_url().value;
     println!("Database url: {database_url}");
 
     PgPoolOptions::new()

src/main.rs

@@ -44,7 +44,7 @@ mod init {
                 register_responses::Response,
             login_responses::Response, login_responses::service_login::Response, login_responses::refresh_token::Response)),
         tags(
-            (name = "soaricarus Auth API", description = "Auth API for soaricarus API")
+            (name = "Icarus Auth API", description = "Auth API for Icarus API")
             )
     )]
     struct ApiDoc;
@@ -67,10 +67,10 @@ mod init {
                 .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2]
 
             // Dynamically set the allowed origin based on the environment
-            match std::env::var(sienvy::keys::APP_ENV).as_deref() {
+            match std::env::var(icarus_envy::keys::APP_ENV).as_deref() {
                 Ok("production") => {
-                    let allowed_origins_env = sienvy::environment::get_allowed_origins();
+                    let allowed_origins_env = icarus_envy::environment::get_allowed_origins();
-                    match sienvy::utility::delimitize(&allowed_origins_env) {
+                    match icarus_envy::utility::delimitize(&allowed_origins_env) {
                         Ok(alwd) => {
                             let allowed_origins: Vec<axum::http::HeaderValue> = alwd
                                 .into_iter()
@@ -162,7 +162,7 @@ mod tests {
         pub const LIMIT: usize = 6;
 
         pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-            let tm_db_url = sienvy::environment::get_db_url().value;
+            let tm_db_url = icarus_envy::environment::get_db_url().value;
             let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
             sqlx::PgPool::connect_with(tm_options).await
         }
@@ -175,7 +175,7 @@ mod tests {
         }
 
         pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
-            let db_url = sienvy::environment::get_db_url().value;
+            let db_url = icarus_envy::environment::get_db_url().value;
             let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name);
             sqlx::PgPool::connect_with(options).await
         }
@@ -207,7 +207,7 @@ mod tests {
         }
 
         pub async fn get_database_name() -> Result<String, Box<dyn std::error::Error>> {
-            let database_url = sienvy::environment::get_db_url().value;
+            let database_url = icarus_envy::environment::get_db_url().value;
 
             let parsed_url = url::Url::parse(&database_url)?;
             if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" {
@@ -508,7 +508,7 @@ mod tests {
 
         let app = init::routes().await.layer(axum::Extension(pool));
         let id = uuid::Uuid::parse_str("22f9c775-cce9-457a-a147-9dafbb801f61").unwrap();
-        let key = sienvy::environment::get_secret_key().value;
+        let key = icarus_envy::environment::get_secret_key().value;
 
         match token_stuff::create_service_token(&key, &id) {
             Ok((token, _expire)) => {

src/repo/mod.rs

@@ -12,7 +12,7 @@ pub mod user {
     pub async fn get(
         pool: &sqlx::PgPool,
         username: &String,
-    ) -> Result<simodels::user::User, sqlx::Error> {
+    ) -> Result<icarus_models::user::User, sqlx::Error> {
         let result = sqlx::query(
             r#"
         SELECT * FROM "user" WHERE username = $1
@@ -24,7 +24,7 @@ pub mod user {
 
         match result {
             Ok(r) => match r {
-                Some(r) => Ok(simodels::user::User {
+                Some(r) => Ok(icarus_models::user::User {
                     id: r.try_get("id")?,
                     username: r.try_get("username")?,
                     password: r.try_get("password")?,
@@ -46,7 +46,7 @@ pub mod user {
 
     pub async fn update_last_login(
         pool: &sqlx::PgPool,
-        user: &simodels::user::User,
+        user: &icarus_models::user::User,
         time: &time::OffsetDateTime,
     ) -> Result<time::OffsetDateTime, sqlx::Error> {
         let result = sqlx::query(
@@ -95,7 +95,7 @@ pub mod user {
 
     pub async fn insert(
         pool: &sqlx::PgPool,
-        user: &simodels::user::User,
+        user: &icarus_models::user::User,
     ) -> Result<(uuid::Uuid, std::option::Option<time::OffsetDateTime>), sqlx::Error> {
         let row = sqlx::query(
             r#"
@@ -145,7 +145,7 @@ pub mod salt {
     pub async fn get(
         pool: &sqlx::PgPool,
         id: &uuid::Uuid,
-    ) -> Result<simodels::user::salt::Salt, sqlx::Error> {
+    ) -> Result<icarus_models::user::salt::Salt, sqlx::Error> {
         let result = sqlx::query(
             r#"
         SELECT * FROM "salt" WHERE id = $1
@@ -157,7 +157,7 @@ pub mod salt {
 
         match result {
             Ok(r) => match r {
-                Some(r) => Ok(simodels::user::salt::Salt {
+                Some(r) => Ok(icarus_models::user::salt::Salt {
                     id: r.try_get("id")?,
                     salt: r.try_get("salt")?,
                 }),
@@ -169,7 +169,7 @@ pub mod salt {
 
     pub async fn insert(
         pool: &sqlx::PgPool,
-        salt: &simodels::user::salt::Salt,
+        salt: &icarus_models::user::salt::Salt,
     ) -> Result<uuid::Uuid, sqlx::Error> {
         let row = sqlx::query(
             r#"

src/token_stuff/mod.rs

@@ -8,8 +8,8 @@ use time;
 
 pub const KEY_ENV: &str = "SECRET_KEY";
 pub const MESSAGE: &str = "Something random";
-pub const ISSUER: &str = "soaricarus_auth";
+pub const ISSUER: &str = "icarus_auth";
-pub const AUDIENCE: &str = "soaricarus";
+pub const AUDIENCE: &str = "icarus";
 
 pub fn get_issued() -> time::Result<time::OffsetDateTime> {
     Ok(time::OffsetDateTime::now_utc())
@@ -24,39 +24,39 @@ pub fn create_token(
     provided_key: &String,
     id: &uuid::Uuid,
 ) -> Result<(String, i64), josekit::JoseError> {
-    let resource = simodels::token::TokenResource {
+    let resource = icarus_models::token::TokenResource {
         message: String::from(MESSAGE),
         issuer: String::from(ISSUER),
         audiences: vec![String::from(AUDIENCE)],
         id: *id,
     };
-    simodels::token::create_token(provided_key, &resource, time::Duration::hours(4))
+    icarus_models::token::create_token(provided_key, &resource, time::Duration::hours(4))
 }
 
 pub fn create_service_token(
     provided: &String,
     id: &uuid::Uuid,
 ) -> Result<(String, i64), josekit::JoseError> {
-    let resource = simodels::token::TokenResource {
+    let resource = icarus_models::token::TokenResource {
         message: String::from(SERVICE_SUBJECT),
         issuer: String::from(ISSUER),
         audiences: vec![String::from(AUDIENCE)],
         id: *id,
     };
-    simodels::token::create_token(provided, &resource, time::Duration::hours(1))
+    icarus_models::token::create_token(provided, &resource, time::Duration::hours(1))
 }
 
 pub fn create_service_refresh_token(
     key: &String,
     id: &uuid::Uuid,
 ) -> Result<(String, i64), josekit::JoseError> {
-    let resource = simodels::token::TokenResource {
+    let resource = icarus_models::token::TokenResource {
         message: String::from(SERVICE_SUBJECT),
         issuer: String::from(ISSUER),
         audiences: vec![String::from(AUDIENCE)],
         id: *id,
     };
-    simodels::token::create_token(key, &resource, time::Duration::hours(4))
+    icarus_models::token::create_token(key, &resource, time::Duration::hours(4))
 }
 
 pub fn verify_token(key: &String, token: &String) -> bool {
@@ -82,9 +82,9 @@ pub fn extract_id_from_token(key: &String, token: &String) -> Result<uuid::Uuid,
     }
 }
 
-pub const APP_TOKEN_TYPE: &str = "SoarIcarus_App";
+pub const APP_TOKEN_TYPE: &str = "Icarus_App";
 pub const APP_SUBJECT: &str = "Something random";
-pub const SERVICE_TOKEN_TYPE: &str = "SoarIcarus_Service";
+pub const SERVICE_TOKEN_TYPE: &str = "Icarus_Service";
 pub const SERVICE_SUBJECT: &str = "Service random";
 
 pub fn get_token_type(key: &String, token: &String) -> Result<String, std::io::Error> {
@@ -123,7 +123,7 @@ mod tests {
 
     #[test]
     fn test_tokenize() {
-        let special_key = sienvy::environment::get_secret_key().value;
+        let special_key = icarus_envy::environment::get_secret_key().value;
         let id = uuid::Uuid::new_v4();
         match create_token(&special_key, &id) {
             Ok((token, _duration)) => {