.env.example

@@ -12,5 +12,3 @@ 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.11"
+ldap3 = "0.10"
 tokio = { version = "1", features = ["full"] }
-env_logger = "0.11"
+env_logger = "0.10"
 log = "0.4"

crates/ldap/src/lib.rs

@@ -1 +0,0 @@
-

crates/migration/src/baseline.rs

@@ -13,7 +13,11 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(Project::Table)
                     .if_not_exists()
-                    .col(pk_uuid(Project::Id).extra("DEFAULT gen_random_uuid()"))
+                    .col(
+                        uuid(Project::Id)
+                            .extra("DEFAULT gen_random_uuid()")
+                            .primary_key(),
+                    )
                     .col(string(Project::Name))
                     .to_owned(),
             )
@@ -45,8 +49,12 @@ impl MigrationTrait for Migration {
                 Table::create()
                     .table(User::Table)
                     .if_not_exists()
-                    .col(pk_uuid(User::Id).extra("DEFAULT gen_random_uuid()"))
+                    .col(
-                    .col(string_uniq(User::Name))
+                        uuid(User::Id)
+                            .extra("DEFAULT gen_random_uuid()")
+                            .primary_key(),
+                    )
+                    .col(string(User::Name))
                     .col(string(User::Role))
                     .to_owned(),
             )
@@ -93,16 +101,6 @@ 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
     }
 
@@ -119,10 +117,6 @@ 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
     }
 }
@@ -157,10 +151,3 @@ enum UserGroupProject {
     GroupId,
     ProjectId,
 }
-
-#[derive(DeriveIden)]
-enum LocalAuth {
-    Table,
-    Id,
-    Hash,
-}

dev-compose.yml

@@ -36,8 +36,7 @@ services:
     volumes:
       - openldap_data:/var/lib/ldap
       - openldap_config:/etc/ldap/slapd.d
-      # Custom LDAP configuration
+      - users.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/users.ldif
-      - ./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"]