Add AC command to reset the vpn-api client

nymtech · Feb 18, 2025 · 6937dac · 6937dac
1 parent 95aa867
commit 6937dac
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 0 deletions.
diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/commander.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/commander.rs
@@ -128,6 +128,17 @@ impl AccountControllerCommander {
             .map_err(RequestZkNymError::internal)?;
         rx.await.map_err(RequestZkNymError::internal)?
     }
+
+    pub async fn reset_vpn_api_client(
+        &self,
+        vpn_api_client: nym_vpn_api_client::VpnApiClient,
+    ) -> Result<(), AccountCommandError> {
+        let (tx, rx) = ReturnSender::new();
+        self.command_tx
+            .send(AccountCommand::ResetVpnApiClient(tx, vpn_api_client))
+            .map_err(AccountCommandError::internal)?;
+        rx.await.map_err(AccountCommandError::internal)?
+    }
 }
 
 // Set of commands used to ensure that the account controller is in the correct state before

diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/mod.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/mod.rs
@@ -98,6 +98,10 @@ pub enum AccountCommand {
     GetZkNymById(String),
     ConfirmZkNymIdDownloaded(String),
     GetAvailableTickets(ReturnSender<AvailableTicketbooks, AccountCommandError>),
+    ResetVpnApiClient(
+        ReturnSender<(), AccountCommandError>,
+        nym_vpn_api_client::VpnApiClient,
+    ),
 }
 
 impl AccountCommand {

diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/request_zknym/cached_data.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/request_zknym/cached_data.rs
@@ -27,6 +27,10 @@ impl CachedData {
         }
     }
 
+    pub fn update_vpn_api_client(&mut self, vpn_api_client: VpnApiClient) {
+        self.vpn_api_client = vpn_api_client;
+    }
+
     pub async fn get_partial_verification_keys(
         &self,
         epoch_id: u64,

diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/request_zknym/handler.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/request_zknym/handler.rs
@@ -85,6 +85,11 @@ impl WaitingRequestZkNymCommandHandler {
     pub(crate) async fn max_fails_reached(&self) -> bool {
         self.zk_nym_fails_in_a_row.load(Ordering::Relaxed) >= ZK_NYM_MAX_FAILS
     }
+
+    pub(crate) fn update_vpn_api_client(&mut self, vpn_api_client: VpnApiClient) {
+        self.vpn_api_client = vpn_api_client.clone();
+        self.cached_data.update_vpn_api_client(vpn_api_client);
+    }
 }
 
 pub(crate) struct RequestZkNymCommandHandler {

diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/sync_account.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/sync_account.rs
@@ -46,6 +46,13 @@ impl WaitingSyncAccountCommandHandler {
             previous_account_summary_response: self.previous_account_summary_response.clone(),
         }
     }
+
+    pub(crate) fn update_vpn_api_client(
+        &mut self,
+        vpn_api_client: nym_vpn_api_client::VpnApiClient,
+    ) {
+        self.vpn_api_client = vpn_api_client;
+    }
 }
 
 pub(crate) struct SyncStateCommandHandler {

diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/sync_device.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/commands/sync_device.rs
@@ -51,6 +51,13 @@ impl WaitingSyncDeviceCommandHandler {
             previous_devices_response: self.previous_devices_response.clone(),
         }
     }
+
+    pub(crate) fn update_vpn_api_client(
+        &mut self,
+        vpn_api_client: nym_vpn_api_client::VpnApiClient,
+    ) {
+        self.vpn_api_client = vpn_api_client;
+    }
 }
 
 pub(crate) struct SyncDeviceStateCommandHandler {

diff --git a/nym-vpn-core/crates/nym-vpn-account-controller/src/controller.rs b/nym-vpn-core/crates/nym-vpn-account-controller/src/controller.rs
@@ -734,6 +734,16 @@ where
                 let result = self.handle_get_available_tickets().await;
                 result_tx.send(result);
             }
+            AccountCommand::ResetVpnApiClient(result_tx, vpn_api_client) => {
+                self.vpn_api_client = vpn_api_client.clone();
+                self.waiting_sync_account_command_handler
+                    .update_vpn_api_client(vpn_api_client.clone());
+                self.waiting_sync_device_command_handler
+                    .update_vpn_api_client(vpn_api_client.clone());
+                self.waiting_request_zknym_command_handler
+                    .update_vpn_api_client(vpn_api_client);
+                result_tx.send(Ok(()));
+            }
         };
     }