Replace Option<SecondFactor> with SecondFactor

src/controllers/admin_controller.rs

@@ -81,10 +81,9 @@ pub async fn users_route(user: CurrentUser, users: web::Data<Addr<UsersActor>>,
         user.enabled = update.0.enabled.is_some();
         user.admin = update.0.admin.is_some();
 
-        if let Some(factors) = user.two_factor.as_mut() {
+        let factors_to_keep = update.0.two_factor.split(';').collect::<Vec<_>>();
-            let factors_to_keep = update.0.two_factor.split(';').collect::<Vec<_>>();
+        user.two_factor.retain(|f| factors_to_keep.contains(&f.id.0.as_str()));
-            factors.retain(|f| factors_to_keep.contains(&f.id.0.as_str()));
+
-        }
 
         user.authorized_clients = match update.0.grant_type.as_str() {
             "all_clients" => None,

src/data/user.rs

@@ -41,7 +41,8 @@ pub struct User {
     pub admin: bool,
 
     /// 2FA
-    pub two_factor: Option<Vec<SecondFactor>>,
+    #[serde(default)]
+    pub two_factor: Vec<SecondFactor>,
 
     /// None = all services
     /// Some([]) = no service
@@ -65,21 +66,15 @@ impl User {
     }
 
     pub fn has_two_factor(&self) -> bool {
-        self.two_factor.as_ref().map(|f| !f.is_empty()).unwrap_or(false)
+        !self.two_factor.is_empty()
     }
 
     pub fn add_factor(&mut self, factor: SecondFactor) {
-        if self.two_factor.is_none() {
+        self.two_factor.push(factor);
-            self.two_factor = Some(vec![]);
-        }
-
-        self.two_factor.as_mut().unwrap().push(factor);
     }
 
     pub fn remove_factor(&mut self, factor_id: FactorID) {
-        if let Some(f) = self.two_factor.as_mut() {
+        self.two_factor.retain(|f| f.id != factor_id);
-            f.retain(|f| f.id != factor_id);
-        }
     }
 }
 
@@ -103,7 +98,7 @@ impl Default for User {
             need_reset_password: false,
             enabled: true,
             admin: false,
-            two_factor: Some(vec![]),
+            two_factor: vec![],
             authorized_clients: Some(Vec::new()),
         }
     }

templates/settings/edit_user.html

@@ -74,7 +74,7 @@
     <fieldset class="form-group">
         <legend class="mt-4">Two factor authentication</legend>
         <strong>If you uncheck a factor, it will be DELETED</strong>
-        {% for f in u.two_factor.as_deref().unwrap_or_default() %}
+        {% for f in u.two_factor %}
         <div class="form-check">
             <label class="form-check-label">
                 <input type="checkbox" class="form-check-input two-fact-checkbox"

templates/settings/two_factors_page.html

@@ -23,7 +23,7 @@
     </tr>
     </thead>
     <tbody>
-    {% for f in user.two_factor.as_deref().unwrap_or_default() %}
+    {% for f in user.two_factor %}
     <tr id="factor-{{ f.id.0 }}">
         <td>{{ f.type_str() }}</td>
         <td>{{ f.name }}</td>