update register finish

Author: filipslezaklab

.gitignore

@@ -4,3 +4,4 @@
 .direnv/
 .envrc
 /node_modules
+.env

proto

@@ -2,6 +2,8 @@ use axum::{extract::State, routing::post, Json, Router};
 use axum_extra::extract::{cookie::Cookie, PrivateCookieJar};
 use time::OffsetDateTime;
 
+use super::register_mfa::router as register_mfa_router;
+
 use crate::{
     error::ApiError,
     handlers::{get_core_response, mobile_client::register_mobile_auth},
@@ -14,6 +16,7 @@ use crate::{
 
 pub(crate) fn router() -> Router<AppState> {
     Router::new()
+        .nest("/register-mfa", register_mfa_router())
         .route("/start", post(start_enrollment_process))
         .route("/activate_user", post(activate_user))
         .route("/create_device", post(create_device))
@@ -82,7 +85,7 @@ async fn activate_user(
         .grpc_server
         .send(core_request::Payload::ActivateUser(req), device_info)?;
     let payload = get_core_response(rx).await?;
-    debug!("Receving payload from the core service. Trying to remove private cookie...");
+    debug!("Receiving payload from the core service. Trying to remove private cookie...");
     if let core_response::Payload::Empty(()) = payload {
         info!("Activated user - phone number {phone:?}");
         if let Some(cookie) = private_cookies.get(ENROLLMENT_COOKIE_NAME) {

src/handlers/enrollment.rs

@@ -31,18 +31,20 @@ async fn register_code_mfa_start(
     cookie_jar: PrivateCookieJar,
     Json(req): Json<RegisterMfaCodeStartRequest>,
 ) -> Result<Json<CodeMfaSetupStartResponse>, impl IntoResponse> {
+    debug!("Register code MFA started");
     let token = cookie_jar
         .get(ENROLLMENT_COOKIE_NAME)
         .ok_or_else(|| ApiError::Unauthorized(String::new()))?
         .value()
         .to_string();
 
     if req.method != MfaMethod::Email && req.method != MfaMethod::Totp {
+        error!("Requested method not supported");
         return Err(ApiError::BadRequest("Method not supported.".to_string()));
     }
 
     let rx = state.grpc_server.send(
-        core_request::Payload::CodeMfaSetupStartRequest(CodeMfaSetupStartRequest {
+        core_request::Payload::CodeMfaSetupStart(CodeMfaSetupStartRequest {
             token,
             method: req.method.into(),
         }),
@@ -58,6 +60,7 @@ async fn register_code_mfa_start(
 #[derive(Debug, Clone, Deserialize)]
 struct RegisterMfaCodeFinishRequest {
     pub code: String,
+    pub method: MfaMethod,
 }
 
 #[instrument(level = "debug", skip(state, req))]
@@ -73,10 +76,14 @@ async fn register_code_mfa_finish(
         .value()
         .to_string();
 
+    let code = req.code;
+    let method = req.method;
+
     let rx = state.grpc_server.send(
-        core_request::Payload::CodeMfaSetupFinishRequest(CodeMfaSetupFinishRequest {
+        core_request::Payload::CodeMfaSetupFinish(CodeMfaSetupFinishRequest {
             token,
-            code: req.code,
+            code,
+            method: method as i32,
         }),
         device_info,
     )?;

src/handlers/register_mfa.rs

@@ -32,7 +32,7 @@ use crate::{
     enterprise::handlers::openid_login::{self, FlowType},
     error::ApiError,
     grpc::ProxyServer,
-    handlers::{desktop_client_mfa, enrollment, password_reset, polling, register_mfa},
+    handlers::{desktop_client_mfa, enrollment, password_reset, polling},
     proto::proxy_server,
 };
 
@@ -222,7 +222,6 @@ pub async fn run_server(config: Config) -> anyhow::Result<()> {
                 .nest("/password-reset", password_reset::router())
                 .nest("/client-mfa", desktop_client_mfa::router())
                 .nest("/openid", openid_login::router())
-                .nest("/register-mfa", register_mfa::router())
                 .route("/poll", post(polling::info))
                 .route("/health", get(healthcheck))
                 .route("/health-grpc", get(healthcheckgrpc))