Merge branch 'dev' into admin-group-permission

migrations/20241211115639_directory_sync_target.down.sql

@@ -0,0 +1 @@
+ALTER TABLE openidprovider DROP COLUMN directory_sync_target;

migrations/20241211115639_directory_sync_target.up.sql

@@ -0,0 +1,7 @@
+CREATE TYPE dirsync_target AS ENUM (
+    'all',
+    'users',
+    'groups'
+);
+
+ALTER TABLE openidprovider ADD COLUMN directory_sync_target dirsync_target DEFAULT 'all'::dirsync_target NOT NULL;

src/enterprise/db/models/openid_provider.rs

@@ -45,6 +45,46 @@ impl From<String> for DirectorySyncUserBehavior {
     }
 }
 
+// What to sync from the directory
+// All: Sync both users and groups
+// Users: Sync only users and their state
+// Groups: Sync only groups (members without their state)
+#[derive(Clone, Deserialize, Serialize, PartialEq, Type, Debug)]
+#[sqlx(type_name = "dirsync_target", rename_all = "snake_case")]
+pub enum DirectorySyncTarget {
+    All,
+    Users,
+    Groups,
+}
+
+impl fmt::Display for DirectorySyncTarget {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                DirectorySyncTarget::All => "all",
+                DirectorySyncTarget::Users => "users",
+                DirectorySyncTarget::Groups => "groups",
+            }
+        )
+    }
+}
+
+impl From<String> for DirectorySyncTarget {
+    fn from(s: String) -> Self {
+        match s.to_lowercase().as_str() {
+            "all" => DirectorySyncTarget::All,
+            "users" => DirectorySyncTarget::Users,
+            "groups" => DirectorySyncTarget::Groups,
+            _ => {
+                warn!("Unknown directory sync target passed: {}", s);
+                DirectorySyncTarget::All
+            }
+        }
+    }
+}
+
 #[derive(Deserialize, Model, Serialize)]
 pub struct OpenIdProvider<I = NoId> {
     pub id: I,
@@ -64,6 +104,8 @@ pub struct OpenIdProvider<I = NoId> {
     pub directory_sync_user_behavior: DirectorySyncUserBehavior,
     #[model(enum)]
     pub directory_sync_admin_behavior: DirectorySyncUserBehavior,
+    #[model(enum)]
+    pub directory_sync_target: DirectorySyncTarget,
 }
 
 impl OpenIdProvider {
@@ -81,6 +123,7 @@ impl OpenIdProvider {
         directory_sync_interval: i32,
         directory_sync_user_behavior: DirectorySyncUserBehavior,
         directory_sync_admin_behavior: DirectorySyncUserBehavior,
+        directory_sync_target: DirectorySyncTarget,
     ) -> Self {
         Self {
             id: NoId,
@@ -96,6 +139,7 @@ impl OpenIdProvider {
             directory_sync_interval,
             directory_sync_user_behavior,
             directory_sync_admin_behavior,
+            directory_sync_target,
         }
     }
 
@@ -105,8 +149,9 @@ impl OpenIdProvider {
                 "UPDATE openidprovider SET name = $1, \
                 base_url = $2, client_id = $3, client_secret = $4, \
                 display_name = $5, google_service_account_key = $6, google_service_account_email = $7, admin_email = $8, \
-                directory_sync_enabled = $9, directory_sync_interval = $10, directory_sync_user_behavior = $11, directory_sync_admin_behavior = $12 \
-                WHERE id = $13",
+                directory_sync_enabled = $9, directory_sync_interval = $10, directory_sync_user_behavior = $11, directory_sync_admin_behavior = $12, \
+                directory_sync_target = $13 \
+                WHERE id = $14",
                 self.name,
                 self.base_url,
                 self.client_id,
@@ -119,6 +164,7 @@ impl OpenIdProvider {
                 self.directory_sync_interval,
                 self.directory_sync_user_behavior as DirectorySyncUserBehavior,
                 self.directory_sync_admin_behavior as DirectorySyncUserBehavior,
+                self.directory_sync_target as DirectorySyncTarget,
                 provider.id,
             )
             .execute(pool)
@@ -138,7 +184,8 @@ impl OpenIdProvider<Id> {
             "SELECT id, name, base_url, client_id, client_secret, display_name, \
             google_service_account_key, google_service_account_email, admin_email, directory_sync_enabled, 
             directory_sync_interval, directory_sync_user_behavior  \"directory_sync_user_behavior: DirectorySyncUserBehavior\", \
-            directory_sync_admin_behavior  \"directory_sync_admin_behavior: DirectorySyncUserBehavior\" \
+            directory_sync_admin_behavior  \"directory_sync_admin_behavior: DirectorySyncUserBehavior\", \
+            directory_sync_target  \"directory_sync_target: DirectorySyncTarget\" \
             FROM openidprovider WHERE name = $1",
             name
         )
@@ -152,7 +199,8 @@ impl OpenIdProvider<Id> {
             "SELECT id, name, base_url, client_id, client_secret, display_name, \
             google_service_account_key, google_service_account_email, admin_email, directory_sync_enabled, \
             directory_sync_interval, directory_sync_user_behavior \"directory_sync_user_behavior: DirectorySyncUserBehavior\", \
-            directory_sync_admin_behavior  \"directory_sync_admin_behavior: DirectorySyncUserBehavior\" \
+            directory_sync_admin_behavior  \"directory_sync_admin_behavior: DirectorySyncUserBehavior\", \
+            directory_sync_target  \"directory_sync_target: DirectorySyncTarget\" \
             FROM openidprovider LIMIT 1"
         )
         .fetch_optional(pool)