tsk-55: Version bump

.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/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.3"
+version = "0.6.2"
 dependencies = [
  "argon2",
  "axum",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_auth"
-version = "0.6.3"
+version = "0.6.2"
 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.
-By default it is `TRUE`.
-
-
-### Build image
+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,108 +52,67 @@ 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(),
-                }),
-            );
-        }
+    let mut user = icarus_models::user::User {
+        username: payload.username.clone(),
+        password: payload.password.clone(),
+        email: payload.email.clone(),
+        phone: payload.phone.clone(),
+        firstname: payload.firstname.clone(),
+        lastname: payload.lastname.clone(),
+        status: String::from("Active"),
+        email_verified: true,
+        ..Default::default()
     };
 
-    if registration_enabled {
-        let mut user = icarus_models::user::User {
-            username: payload.username.clone(),
-            password: payload.password.clone(),
-            email: payload.email.clone(),
-            phone: payload.phone.clone(),
-            firstname: payload.firstname.clone(),
-            lastname: payload.lastname.clone(),
-            status: String::from("Active"),
-            email_verified: true,
-            ..Default::default()
-        };
+    match repo::user::exists(&pool, &user.username).await {
+        Ok(res) => {
+            if res {
+                (
+                    StatusCode::BAD_REQUEST,
+                    Json(response::Response {
+                        message: String::from("Error"),
+                        data: Vec::new(),
+                    }),
+                )
+            } else {
+                let salt_string = hashing::generate_salt().unwrap();
+                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();
+                user.salt_id = salt.id;
+                let hashed_password =
+                    hashing::hash_password(&user.password, &generated_salt).unwrap();
+                user.password = hashed_password;
 
-        match repo::user::exists(&pool, &user.username).await {
-            Ok(res) => {
-                if res {
-                    (
-                        StatusCode::BAD_REQUEST,
-                        Json(response::Response {
-                            message: String::from("Error"),
-                            data: Vec::new(),
-                        }),
-                    )
-                } else {
-                    let salt_string = hashing::generate_salt().unwrap();
-                    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();
-                    user.salt_id = salt.id;
-                    let hashed_password =
-                        hashing::hash_password(&user.password, &generated_salt).unwrap();
-                    user.password = hashed_password;
-
-                    match repo::user::insert(&pool, &user).await {
-                        Ok((id, date_created)) => {
-                            user.id = id;
-                            user.date_created = date_created;
-                            (
-                                StatusCode::CREATED,
-                                Json(response::Response {
-                                    message: String::from("User created"),
-                                    data: vec![user],
-                                }),
-                            )
-                        }
-                        Err(err) => (
-                            StatusCode::BAD_REQUEST,
+                match repo::user::insert(&pool, &user).await {
+                    Ok((id, date_created)) => {
+                        user.id = id;
+                        user.date_created = date_created;
+                        (
+                            StatusCode::CREATED,
                             Json(response::Response {
-                                message: err.to_string(),
+                                message: String::from("User created"),
                                 data: vec![user],
                             }),
-                        ),
+                        )
                     }
+                    Err(err) => (
+                        StatusCode::BAD_REQUEST,
+                        Json(response::Response {
+                            message: err.to_string(),
+                            data: vec![user],
+                        }),
+                    ),
                 }
             }
-            Err(err) => (
-                StatusCode::BAD_REQUEST,
-                Json(response::Response {
-                    message: err.to_string(),
-                    data: vec![user],
-                }),
-            ),
         }
-    } else {
-        (
-            axum::http::StatusCode::NOT_ACCEPTABLE,
+        Err(err) => (
+            StatusCode::BAD_REQUEST,
             Json(response::Response {
-                message: String::from("Registration is not enabled"),
-                data: Vec::new(),
+                message: err.to_string(),
+                data: vec![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 = 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/repo/mod.rs

@@ -124,10 +124,10 @@ pub mod user {
                 .map_err(|_e| sqlx::Error::RowNotFound)?,
         };
 
-        if result.id.is_nil() && result.date_created.is_none() {
-            Err(sqlx::Error::RowNotFound)
-        } else {
+        if !result.id.is_nil() && !result.date_created.is_none() {
             Ok((result.id, result.date_created))
+        } else {
+            Err(sqlx::Error::RowNotFound)
         }
     }
 }