cargo update

.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"

Cargo.lock

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

Cargo.toml

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

src/callers/register.rs

@@ -53,6 +53,7 @@ pub async fn register_user(
     Json(payload): Json<request::Request>,
 ) -> (StatusCode, Json<response::Response>) {
     let mut user = icarus_models::user::User {
+        id: uuid::Uuid::nil(),
         username: payload.username.clone(),
         password: payload.password.clone(),
         email: payload.email.clone(),
@@ -61,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 {
@@ -86,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 {

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)
         }
     }
 }