src/controllers/mod.rs

@@ -6,4 +6,4 @@ pub mod admin_controller;
 pub mod admin_api;
 pub mod openid_controller;
 pub mod two_factors_controller;
-pub mod two_factor_api;
+pub mod two_factors_api;

src/controllers/two_factors_api.rs

@@ -1,21 +1,20 @@
 use actix::Addr;
 use actix_web::{HttpResponse, Responder, web};
-use uuid::Uuid;
 
 use crate::actors::users_actor;
 use crate::actors::users_actor::UsersActor;
 use crate::data::current_user::CurrentUser;
 use crate::data::totp_key::TotpKey;
-use crate::data::user::{FactorID, SecondFactor, SecondFactorType, User};
+use crate::data::user::{SecondFactor, User};
 
 #[derive(serde::Deserialize)]
-pub struct AddTOTPRequest {
+pub struct Request {
     factor_name: String,
     secret: String,
     first_code: String,
 }
 
-pub async fn save_totp_factor(user: CurrentUser, form: web::Json<AddTOTPRequest>,
+pub async fn save_totp_factor(user: CurrentUser, form: web::Json<Request>,
                               users: web::Data<Addr<UsersActor>>) -> impl Responder {
     let key = TotpKey::from_encoded_secret(&form.secret);
 
@@ -31,11 +30,7 @@ pub async fn save_totp_factor(user: CurrentUser, form: web::Json<AddTOTPRequest>
     }
 
     let mut user = User::from(user);
-    user.add_factor(SecondFactor {
-        id: FactorID(Uuid::new_v4().to_string()),
-        name: form.0.factor_name,
-        kind: SecondFactorType::TOTP(key),
-    });
+    user.add_factor(SecondFactor::TOTP(key));
     let res = users.send(users_actor::UpdateUserRequest(user)).await.unwrap().0;
 
     if !res {
@@ -43,23 +38,4 @@ pub async fn save_totp_factor(user: CurrentUser, form: web::Json<AddTOTPRequest>
     } else {
         HttpResponse::Ok().body("Added new factor!")
     }
-}
-
-#[derive(serde::Deserialize)]
-pub struct DeleteFactorRequest {
-    id: FactorID,
-}
-
-pub async fn delete_factor(user: CurrentUser, form: web::Json<DeleteFactorRequest>,
-                           users: web::Data<Addr<UsersActor>>) -> impl Responder {
-    let mut user = User::from(user);
-    user.remove_factor(form.0.id);
-
-    let res = users.send(users_actor::UpdateUserRequest(user)).await.unwrap().0;
-
-    if !res {
-        HttpResponse::InternalServerError().body("Failed to update user information!")
-    } else {
-        HttpResponse::Ok().body("Removed factor!")
-    }
 }

src/data/current_user.rs

@@ -6,7 +6,6 @@ use actix::Addr;
 use actix_identity::Identity;
 use actix_web::{Error, FromRequest, HttpRequest, web};
 use actix_web::dev::Payload;
-use actix_web::error::ErrorInternalServerError;
 
 use crate::actors::users_actor;
 use crate::actors::users_actor::UsersActor;
@@ -42,14 +41,9 @@ impl FromRequest for CurrentUser {
 
 
         Box::pin(async move {
-            let user = match user_actor.send(
+            let user: User = user_actor.send(
                 users_actor::GetUserRequest(user_id)
-            ).await.unwrap().0 {
-                Some(u) => u,
-                None => {
-                    return Err(ErrorInternalServerError("Could not extract user information!"));
-                }
-            };
+            ).await.unwrap().0.unwrap();
 
             Ok(CurrentUser(user))
         })

src/data/user.rs

@@ -5,29 +5,11 @@ use crate::utils::err::Res;
 
 pub type UserID = String;
 
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct FactorID(pub String);
-
 #[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
-pub enum SecondFactorType {
+pub enum SecondFactor {
     TOTP(TotpKey)
 }
 
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
-pub struct SecondFactor {
-    pub id: FactorID,
-    pub name: String,
-    pub kind: SecondFactorType,
-}
-
-impl SecondFactor {
-    pub fn type_str(&self) -> &'static str {
-        match self.kind {
-            SecondFactorType::TOTP(_) => "Authenticator app"
-        }
-    }
-}
-
 #[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
 pub struct User {
     pub uid: UserID,
@@ -71,12 +53,6 @@ impl User {
 
         self.second_factors.as_mut().unwrap().push(factor);
     }
-
-    pub fn remove_factor(&mut self, factor_id: FactorID) {
-        if let Some(f) = self.second_factors.as_mut() {
-            f.retain(|f| f.id != factor_id);
-        }
-    }
 }
 
 impl PartialEq for User {

src/main.rs

@@ -122,8 +122,7 @@ async fn main() -> std::io::Result<()> {
             .route("/settings/two_factors/add_totp", web::get().to(two_factors_controller::add_totp_factor_route))
 
             // User API
-            .route("/settings/api/two_factor/save_totp_factor", web::post().to(two_factor_api::save_totp_factor))
-            .route("/settings/api/two_factor/delete_factor", web::post().to(two_factor_api::delete_factor))
+            .route("/settings/api/two_factors/save_totp_factor", web::post().to(two_factors_api::save_totp_factor))
 
             // Admin routes
             .route("/admin", web::get()

templates/settings/add_2fa_totp_page.html

@@ -75,7 +75,7 @@
                 return;
 
             try {
-                const res = await fetch("/settings/api/two_factor/save_totp_factor", {
+                const res = await fetch("/settings/api/two_factors/save_totp_factor", {
                     method: "post",
                     headers: {
                       'Content-Type': 'application/json',

templates/settings/two_factors_page.html

@@ -13,52 +13,6 @@
 <p>
     <a href="/settings/two_factors/add_totp" type="button" class="btn btn-primary">Add Authenticator App</a>
 </p>
+TODO : show the list of currently registered 2 factors methods
 
-<table class="table table-hover" style="max-width: 800px;" aria-describedby="Factors list">
-    <thead>
-    <tr>
-        <th scope="col">Factor type</th>
-        <th scope="col">Name</th>
-        <th scope="col">Actions</th>
-    </tr>
-    </thead>
-    <tbody>
-    {% for f in user.second_factors.as_deref().unwrap_or_default() %}
-    <tr id="factor-{{ f.id.0 }}">
-        <td>{{ f.type_str() }}</td>
-        <td>{{ f.name }}</td>
-        <td><a href="javascript:delete_factor('{{ f.id.0 }}');">Delete</a></td>
-    </tr>
-    {% endfor %}
-    </tbody>
-</table>
-
-<script>
-    async function delete_factor(id) {
-        if (!confirm("Do you really want to remove this factor?"))
-            return;
-
-        try {
-            const res = await fetch("/settings/api/two_factor/delete_factor", {
-                method: "post",
-                headers: {
-                  'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                    id: id,
-                })
-            });
-
-            let text = await res.text();
-            alert(text);
-
-            if (res.status == 200)
-                document.getElementById("factor-" + id).remove();
-        } catch(e) {
-            console.error(e);
-            alert("Failed to remove factor!");
-        }
-    }
-
-</script>
 {% endblock content %}