fix ldap crate and create migration for localAuth

.env.example

@@ -12,3 +12,5 @@ REDIS_HOST=
 REDIS_PORT=
 SECRET_KEY=
 
+# LDAP section
+LDAP_ADMIN_PASSWORD=

crates/ldap/Cargo.toml

@@ -6,7 +6,7 @@ edition = { workspace = true }
 [dependencies]
 actix-web = "4"
 serde = { version = "1", features = ["derive"] }
-ldap3 = "0.10"
+ldap3 = "0.11"
 tokio = { version = "1", features = ["full"] }
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4"

crates/ldap/src/lib.rs

@@ -0,0 +1 @@
+

crates/migration/src/baseline.rs

@@ -13,11 +13,7 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(Project::Table)
                     .if_not_exists()
-                    .col(
+                    .col(pk_uuid(Project::Id).extra("DEFAULT gen_random_uuid()"))
-                        uuid(Project::Id)
-                            .extra("DEFAULT gen_random_uuid()")
-                            .primary_key(),
-                    )
                     .col(string(Project::Name))
                     .to_owned(),
             )
@@ -49,12 +45,8 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(User::Table)
                     .if_not_exists()
-                    .col(
+                    .col(pk_uuid(User::Id).extra("DEFAULT gen_random_uuid()"))
-                        uuid(User::Id)
+                    .col(string_uniq(User::Name))
-                            .extra("DEFAULT gen_random_uuid()")
-                            .primary_key(),
-                    )
-                    .col(string(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,
+}

dev-compose.yml

@@ -36,7 +36,8 @@ services:
     volumes:
       - openldap_data:/var/lib/ldap
       - openldap_config:/etc/ldap/slapd.d
-      - users.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/users.ldif
+      # Custom LDAP configuration
+      - ./crates/ldap/src/users.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/users.ldif
 
     healthcheck:
       test: ["CMD", "ldapsearch", "-x", "-H", "ldap://localhost", "-b", "dc=Schule,dc=intern"]