From af2166fb72064b77b1e5564e9f8b5e747e4d89d1 Mon Sep 17 00:00:00 2001
From: Jacek Chmielewski <jacek@defguard.net>
Date: Mon, 26 Jan 2026 10:40:36 +0100
Subject: [PATCH 1/3] Add ClientRemoteMfaFinish RPC

---
 core/proxy.proto | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/core/proxy.proto b/core/proxy.proto
index eca283b..ca7cecb 100644
--- a/core/proxy.proto
+++ b/core/proxy.proto
@@ -272,6 +272,15 @@ message CodeMfaSetupFinishResponse {
   repeated string recovery_codes = 1;
 }
 
+message ClientRemoteMfaFinishRequest {
+  string token = 2;
+}
+
+message ClientRemoteMfaFinishResponse {
+  string preshared_key = 1;
+  string token = 2;
+}
+
 message InitialInfo {
   bytes private_cookies_key = 1;
 }
@@ -307,6 +316,7 @@ message CoreResponse {
     CodeMfaSetupStartResponse code_mfa_setup_start_response = 16;
     CodeMfaSetupFinishResponse code_mfa_setup_finish_response = 17;
     InitialInfo initial_info = 18;
+    ClientRemoteMfaFinishResponse client_remote_mfa_finish = 19;
   }
 }
 
@@ -334,6 +344,7 @@ message CoreRequest {
     ClientMfaTokenValidationRequest client_mfa_token_validation = 17;
     CodeMfaSetupStartRequest code_mfa_setup_start = 18;
     CodeMfaSetupFinishRequest code_mfa_setup_finish = 19;
+    ClientRemoteMfaFinishRequest client_remote_mfa_finish = 20;
   }
 }
 

From b9f5ae34e8779d8a2170bdecad9eb51d4b7154d4 Mon Sep 17 00:00:00 2001
From: Jacek Chmielewski <jacek@defguard.net>
Date: Mon, 26 Jan 2026 11:06:52 +0100
Subject: [PATCH 2/3] remove unused field

---
 core/proxy.proto | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/proxy.proto b/core/proxy.proto
index ca7cecb..4bd0f37 100644
--- a/core/proxy.proto
+++ b/core/proxy.proto
@@ -273,12 +273,11 @@ message CodeMfaSetupFinishResponse {
 }
 
 message ClientRemoteMfaFinishRequest {
-  string token = 2;
+  string token = 1;
 }
 
 message ClientRemoteMfaFinishResponse {
   string preshared_key = 1;
-  string token = 2;
 }
 
 message InitialInfo {

From 0b982922c4dab3304a8cb01aed1d8cee806600b7 Mon Sep 17 00:00:00 2001
From: Jacek Chmielewski <jacek@defguard.net>
Date: Mon, 26 Jan 2026 13:32:02 +0100
Subject: [PATCH 3/3] rename ClientRemoteMfa to AwaitRemoteMfa

---
 core/proxy.proto | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/proxy.proto b/core/proxy.proto
index 4bd0f37..4c2194b 100644
--- a/core/proxy.proto
+++ b/core/proxy.proto
@@ -272,11 +272,11 @@ message CodeMfaSetupFinishResponse {
   repeated string recovery_codes = 1;
 }
 
-message ClientRemoteMfaFinishRequest {
+message AwaitRemoteMfaFinishRequest {
   string token = 1;
 }
 
-message ClientRemoteMfaFinishResponse {
+message AwaitRemoteMfaFinishResponse {
   string preshared_key = 1;
 }
 
@@ -315,7 +315,7 @@ message CoreResponse {
     CodeMfaSetupStartResponse code_mfa_setup_start_response = 16;
     CodeMfaSetupFinishResponse code_mfa_setup_finish_response = 17;
     InitialInfo initial_info = 18;
-    ClientRemoteMfaFinishResponse client_remote_mfa_finish = 19;
+    AwaitRemoteMfaFinishResponse await_remote_mfa_finish = 19;
   }
 }
 
@@ -343,7 +343,7 @@ message CoreRequest {
     ClientMfaTokenValidationRequest client_mfa_token_validation = 17;
     CodeMfaSetupStartRequest code_mfa_setup_start = 18;
     CodeMfaSetupFinishRequest code_mfa_setup_finish = 19;
-    ClientRemoteMfaFinishRequest client_remote_mfa_finish = 20;
+    AwaitRemoteMfaFinishRequest await_remote_mfa_finish = 20;
   }
 }