From b7e31b92327f75379fb049e4e2c6f72122eaf3c7 Mon Sep 17 00:00:00 2001
From: Mika Bomm <mika.bomm@outlook.com>
Date: Tue, 1 Apr 2025 12:30:04 +0200
Subject: [PATCH] fix ldap crate and create migration for localAuth

---
 crates/ldap/src/lib.rs           |  1 +
 crates/migration/src/baseline.rs | 35 ++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 crates/ldap/src/lib.rs

diff --git a/crates/ldap/src/lib.rs b/crates/ldap/src/lib.rs
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/crates/ldap/src/lib.rs
@@ -0,0 +1 @@
+
diff --git a/crates/migration/src/baseline.rs b/crates/migration/src/baseline.rs
index 31f93a0..dbfe516 100644
--- a/crates/migration/src/baseline.rs
+++ b/crates/migration/src/baseline.rs
@@ -13,11 +13,7 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(Project::Table)
                     .if_not_exists()
-                    .col(
-                        uuid(Project::Id)
-                            .extra("DEFAULT gen_random_uuid()")
-                            .primary_key(),
-                    )
+                    .col(pk_uuid(Project::Id).extra("DEFAULT gen_random_uuid()"))
                     .col(string(Project::Name))
                     .to_owned(),
             )
@@ -49,12 +45,8 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(User::Table)
                     .if_not_exists()
-                    .col(
-                        uuid(User::Id)
-                            .extra("DEFAULT gen_random_uuid()")
-                            .primary_key(),
-                    )
-                    .col(string(User::Name))
+                    .col(pk_uuid(User::Id).extra("DEFAULT gen_random_uuid()"))
+                    .col(string_uniq(User::Name))
                     .col(string(User::Role))
                     .to_owned(),
             )
@@ -101,6 +93,16 @@ impl MigrationTrait for Migration {
                     )
                     .to_owned(),
             )
+            .await?;
+        manager
+            .create_table(
+                Table::create()
+                    .table(LocalAuth::Table)
+                    .if_not_exists()
+                    .col(pk_uuid(LocalAuth::Id))
+                    .col(string(LocalAuth::Hash))
+                    .to_owned(),
+            )
             .await
     }
 
@@ -117,6 +119,10 @@ impl MigrationTrait for Migration {
 
         manager
             .drop_table(Table::drop().table(User::Table).to_owned())
+            .await?;
+
+        manager
+            .drop_table(Table::drop().table(UserGroupProject::Table).to_owned())
             .await
     }
 }
@@ -151,3 +157,10 @@ enum UserGroupProject {
     GroupId,
     ProjectId,
 }
+
+#[derive(DeriveIden)]
+enum LocalAuth {
+    Table,
+    Id,
+    Hash,
+}