cargo update

.env.docker.sample

@@ -10,4 +10,3 @@ POSTGRES_AUTH_PASSWORD=password
 POSTGRES_AUTH_DB=icarus_auth_db
 POSTGRES_AUTH_HOST=auth_db
 DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}
-ENABLE_REGISTRATION=TRUE

.env.sample

@@ -10,4 +10,3 @@ POSTGRES_AUTH_PASSWORD=password
 POSTGRES_AUTH_DB=icarus_auth_test_db
 POSTGRES_AUTH_HOST=localhost
 DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}
-ENABLE_REGISTRATION=TRUE

.gitea/workflows/tag_release.yml

@@ -3,7 +3,7 @@ name: Release Tagging
 on:
   push:
     branches:
-      - main
+      - devel
 
 jobs:
   release:
@@ -27,10 +27,8 @@ jobs:
           PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
           BRANCH_REF="${GITHUB_REF}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
-          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH-950"
+          PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-950"
-          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE"
-
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
           echo "Branch: $BRANCH_NAME"

.gitea/workflows/workflow.yml

@@ -76,7 +76,6 @@ jobs:
           SECRET_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
           # Make SSH agent available if tests fetch private dependencies
           SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
-          ENABLE_REGISTRATION: 'TRUE'
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key

Cargo.lock

@@ -748,7 +748,7 @@ dependencies = [
 
 [[package]]
 name = "icarus_auth"
-version = "0.6.4"
+version = "0.6.0"
 dependencies = [
  "argon2",
  "axum",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_auth"
-version = "0.6.4"
+version = "0.6.0"
 edition = "2024"
 rust-version = "1.90"
 

README.md

@@ -8,26 +8,22 @@ need to be modified. The `SECRET_KEY` variable should be changed since it will b
 generation. The `SECRET_PASSPHASE` should also be changed when in production mode, but make sure
 the respective `passphrase` database table record exists.
 
-To enable or disable registrations, use `TRUE` or `FALSE` for the `ENABLE_REGISTRATION` variable.
+Build image
-By default it is `TRUE`.
-
-
-### Build image
 ```
 docker compose build
 ```
 
-### Start images
+Start images
 ```
 docker compose up -d --force-recreate
 ```
 
-### Bring it down
+Bring it down
 ```
 docker compose down -v
 ```
 
-### Pruning
+Pruning
 ```
 docker system prune -a
 ```

src/callers/register.rs

@@ -52,22 +52,8 @@ pub async fn register_user(
     axum::Extension(pool): axum::Extension<sqlx::PgPool>,
     Json(payload): Json<request::Request>,
 ) -> (StatusCode, Json<response::Response>) {
-    let registration_enabled = match is_registration_enabled().await {
-        Ok(value) => value,
-        Err(err) => {
-            eprintln!("Error: {err:?}");
-            return (
-                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
-                Json(response::Response {
-                    message: String::from("Registration check failed"),
-                    data: Vec::new(),
-                }),
-            );
-        }
-    };
-
-    if registration_enabled {
     let mut user = icarus_models::user::User {
+        id: uuid::Uuid::nil(),
         username: payload.username.clone(),
         password: payload.password.clone(),
         email: payload.email.clone(),
@@ -76,17 +62,19 @@ pub async fn register_user(
         lastname: payload.lastname.clone(),
         status: String::from("Active"),
         email_verified: true,
-            ..Default::default()
+        date_created: Some(time::OffsetDateTime::now_utc()),
+        last_login: None,
+        salt_id: uuid::Uuid::nil(),
     };
 
     match repo::user::exists(&pool, &user.username).await {
         Ok(res) => {
             if res {
                 (
-                        StatusCode::BAD_REQUEST,
+                    StatusCode::NOT_FOUND,
                     Json(response::Response {
                         message: String::from("Error"),
-                            data: Vec::new(),
+                        data: vec![user],
                     }),
                 )
             } else {
@@ -101,9 +89,8 @@ pub async fn register_user(
                 user.password = hashed_password;
 
                 match repo::user::insert(&pool, &user).await {
-                        Ok((id, date_created)) => {
+                    Ok(id) => {
                         user.id = id;
-                            user.date_created = date_created;
                         (
                             StatusCode::CREATED,
                             Json(response::Response {
@@ -130,30 +117,4 @@ pub async fn register_user(
             }),
         ),
     }
-    } else {
-        (
-            axum::http::StatusCode::NOT_ACCEPTABLE,
-            Json(response::Response {
-                message: String::from("Registration is not enabled"),
-                data: Vec::new(),
-            }),
-        )
-    }
-}
-
-/// 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 = icarus_envy::environment::get_env(&key).await;
-    let parsed_value = var.value.to_uppercase();
-
-    if parsed_value == "TRUE" {
-        Ok(true)
-    } else if parsed_value == "FALSE" {
-        Ok(false)
-    } else {
-        Err(std::io::Error::other(
-            "Could not determine value of ENABLE_REGISTRATION",
-        ))
-    }
 }

src/db/init.rs

@@ -1,20 +0,0 @@
-use sqlx::postgres::PgPoolOptions;
-
-pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-    let database_url = icarus_envy::environment::get_db_url().await.value;
-    println!("Database url: {database_url}");
-
-    PgPoolOptions::new()
-        .max_connections(super::connection_settings::MAXCONN)
-        .connect(&database_url)
-        .await
-}
-
-pub async fn migrations(pool: &sqlx::PgPool) {
-    // Run migrations using the sqlx::migrate! macro
-    // Assumes your migrations are in a ./migrations folder relative to Cargo.toml
-    sqlx::migrate!("./migrations")
-        .run(pool)
-        .await
-        .expect("Failed to run migrations");
-}

src/db/mod.rs

@@ -1,5 +0,0 @@
-pub mod init;
-
-mod connection_settings {
-    pub const MAXCONN: u32 = 5;
-}

src/lib.rs

@@ -0,0 +1,36 @@
+// TODO: Get rid of this file and place the code in more appropriate places
+pub mod callers;
+pub mod config;
+pub mod hashing;
+pub mod repo;
+pub mod token_stuff;
+
+mod connection_settings {
+    pub const MAXCONN: u32 = 5;
+}
+
+pub mod db {
+
+    use sqlx::postgres::PgPoolOptions;
+
+    use crate::connection_settings;
+
+    pub async fn create_pool() -> Result<sqlx::PgPool, sqlx::Error> {
+        let database_url = icarus_envy::environment::get_db_url().await.value;
+        println!("Database url: {database_url}");
+
+        PgPoolOptions::new()
+            .max_connections(connection_settings::MAXCONN)
+            .connect(&database_url)
+            .await
+    }
+
+    pub async fn migrations(pool: &sqlx::PgPool) {
+        // Run migrations using the sqlx::migrate! macro
+        // Assumes your migrations are in a ./migrations folder relative to Cargo.toml
+        sqlx::migrate!("./migrations")
+            .run(pool)
+            .await
+            .expect("Failed to run migrations");
+    }
+}

src/main.rs

@@ -1,9 +1,5 @@
-pub mod callers;
+use icarus_auth::callers;
-pub mod config;
+use icarus_auth::config;
-pub mod db;
-pub mod hashing;
-pub mod repo;
-pub mod token_stuff;
 
 #[tokio::main]
 async fn main() {
@@ -25,7 +21,7 @@ mod init {
     };
     use utoipa::OpenApi;
 
-    use super::callers;
+    use crate::callers;
     use callers::common as common_callers;
     use callers::login as login_caller;
     use callers::register as register_caller;
@@ -128,11 +124,11 @@ mod init {
     }
 
     pub async fn app() -> Router {
-        let pool = super::db::init::create_pool()
+        let pool = icarus_auth::db::create_pool()
             .await
             .expect("Failed to create pool");
 
-        super::db::init::migrations(&pool).await;
+        icarus_auth::db::migrations(&pool).await;
 
         routes()
             .await
@@ -220,8 +216,8 @@ mod tests {
         }
     }
 
-    fn get_test_register_request() -> callers::register::request::Request {
+    fn get_test_register_request() -> icarus_auth::callers::register::request::Request {
-        callers::register::request::Request {
+        icarus_auth::callers::register::request::Request {
             username: String::from("somethingsss"),
             password: String::from("Raindown!"),
             email: String::from("dev@null.com"),
@@ -231,7 +227,9 @@ mod tests {
         }
     }
 
-    fn get_test_register_payload(usr: &callers::register::request::Request) -> serde_json::Value {
+    fn get_test_register_payload(
+        usr: &icarus_auth::callers::register::request::Request,
+    ) -> serde_json::Value {
         json!({
             "username": &usr.username,
             "password": &usr.password,
@@ -247,7 +245,7 @@ mod tests {
 
         pub async fn register(
             app: &axum::Router,
-            usr: &super::callers::register::request::Request,
+            usr: &icarus_auth::callers::register::request::Request,
         ) -> Result<axum::response::Response, std::convert::Infallible> {
             let payload = super::get_test_register_payload(&usr);
             let req = axum::http::Request::builder()
@@ -300,7 +298,7 @@ mod tests {
 
         let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
 
-        db::init::migrations(&pool).await;
+        icarus_auth::db::migrations(&pool).await;
 
         let app = init::routes().await.layer(axum::Extension(pool));
 
@@ -357,7 +355,7 @@ mod tests {
 
         let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
 
-        db::init::migrations(&pool).await;
+        icarus_auth::db::migrations(&pool).await;
 
         let app = init::routes().await.layer(axum::Extension(pool));
 
@@ -445,7 +443,7 @@ mod tests {
 
         let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
 
-        db::init::migrations(&pool).await;
+        icarus_auth::db::migrations(&pool).await;
 
         let app = init::routes().await.layer(axum::Extension(pool));
         let passphrase =
@@ -499,13 +497,13 @@ mod tests {
 
         let pool = db_mgr::connect_to_db(&db_name).await.unwrap();
 
-        db::init::migrations(&pool).await;
+        icarus_auth::db::migrations(&pool).await;
 
         let app = init::routes().await.layer(axum::Extension(pool));
         let id = uuid::Uuid::parse_str("22f9c775-cce9-457a-a147-9dafbb801f61").unwrap();
         let key = icarus_envy::environment::get_secret_key().await.value;
 
-        match token_stuff::create_service_token(&key, &id) {
+        match icarus_auth::token_stuff::create_service_token(&key, &id) {
             Ok((token, _expire)) => {
                 let payload = serde_json::json!({
                     "access_token": token

src/repo/mod.rs

@@ -94,7 +94,7 @@ pub mod user {
     pub async fn insert(
         pool: &sqlx::PgPool,
         user: &icarus_models::user::User,
-    ) -> Result<(uuid::Uuid, std::option::Option<time::OffsetDateTime>), sqlx::Error> {
+    ) -> Result<uuid::Uuid, sqlx::Error> {
         let row = sqlx::query(
             r#"
                 INSERT INTO "user" (username, password, email, phone, firstname, lastname, email_verified, status, salt_id) 
@@ -124,10 +124,10 @@ pub mod user {
                 .map_err(|_e| sqlx::Error::RowNotFound)?,
         };
 
-        if result.id.is_nil() && result.date_created.is_none() {
+        if !result.id.is_nil() {
-            Err(sqlx::Error::RowNotFound)
+            Ok(result.id)
         } else {
-            Ok((result.id, result.date_created))
+            Err(sqlx::Error::RowNotFound)
         }
     }
 }