Removed old users

rust/agama-lib/src/install_settings.rs

@@ -26,7 +26,7 @@ use crate::context::InstallationContext;
 use crate::hostname::model::HostnameSettings;
 use crate::security::settings::SecuritySettings;
 use crate::storage::settings::zfcp::ZFCPConfig;
-use crate::{network::NetworkSettings, storage::settings::dasd::DASDConfig, users::UserSettings};
+use crate::{network::NetworkSettings, storage::settings::dasd::DASDConfig};
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue;
 use std::default::Default;
@@ -43,7 +43,7 @@ pub enum InstallSettingsError {
 /// Installation settings
 ///
 /// This struct represents installation settings. It serves as an entry point and it is composed of
-/// other structs which hold the settings for each area ("users", "software", etc.).
+/// other structs which hold the settings for each area ("software", etc.).
 #[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct InstallSettings {
@@ -56,8 +56,6 @@ pub struct InstallSettings {
     #[serde(skip_serializing_if = "Option::is_none")]
     #[schema(value_type = Object)]
     pub iscsi: Option<Box<RawValue>>,
-    #[serde(flatten)]
-    pub user: Option<UserSettings>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub security: Option<SecuritySettings>,
     #[serde(skip_serializing_if = "Option::is_none")]

rust/agama-lib/src/lib.rs

@@ -63,7 +63,6 @@ pub mod questions;
 pub mod security;
 pub mod storage;
 mod store;
-pub mod users;
 pub use store::Store;
 pub mod utils;
 pub use agama_utils::{dbus, openapi};

rust/agama-lib/src/store.rs

@@ -39,7 +39,6 @@ use crate::{
         },
         StorageStore, StorageStoreError,
     },
-    users::{UsersStore, UsersStoreError},
 };
 
 #[derive(Debug, thiserror::Error)]
@@ -51,8 +50,6 @@ pub enum StoreError {
     #[error(transparent)]
     Hostname(#[from] HostnameStoreError),
     #[error(transparent)]
-    Users(#[from] UsersStoreError),
-    #[error(transparent)]
     Network(#[from] NetworkStoreError),
     #[error(transparent)]
     Security(#[from] SecurityStoreError),
@@ -76,7 +73,6 @@ pub struct Store {
     bootloader: BootloaderStore,
     dasd: DASDStore,
     hostname: HostnameStore,
-    users: UsersStore,
     network: NetworkStore,
     security: SecurityStore,
     storage: StorageStore,
@@ -91,7 +87,6 @@ impl Store {
             bootloader: BootloaderStore::new(http_client.clone()),
             dasd: DASDStore::new(http_client.clone()),
             hostname: HostnameStore::new(http_client.clone()),
-            users: UsersStore::new(http_client.clone()),
             network: NetworkStore::new(http_client.clone()),
             security: SecurityStore::new(http_client.clone()),
             storage: StorageStore::new(http_client.clone()),
@@ -109,7 +104,6 @@ impl Store {
             hostname: Some(self.hostname.load().await?),
             network: Some(self.network.load().await?),
             security: self.security.load().await?.to_option(),
-            user: Some(self.users.load().await?),
             zfcp: self.zfcp.load().await?,
             ..Default::default()
         };
@@ -138,9 +132,6 @@ impl Store {
         if let Some(security) = &settings.security {
             self.security.store(security).await?;
         }
-        if let Some(user) = &settings.user {
-            self.users.store(user).await?;
-        }
         let mut dirty_flag_set = false;
         // iscsi has to be done before storage
         if let Some(iscsi) = &settings.iscsi {