Rename `ApiAccessMethod` to `AccessMethodSetting`

`ApiAccessMethod` was just an app-centric wrapper around `AccessMethod`.

3 files changed, 10 insertions, 7 deletions

diff --git a/mullvad-daemon/src/access_method.rs b/mullvad-daemon/src/access_method.rs
index dc6c06de06..a3ece35ecb 100644
--- a/mullvad-daemon/src/access_method.rs
+++ b/mullvad-daemon/src/access_method.rs
@@ -26,7 +26,10 @@ impl<L> Daemon<L>
 where
     L: EventListener + Clone + Send + 'static,
 {
-    pub async fn add_access_method(&mut self, access_method: ApiAccessMethod) -> Result<(), Error> {
+    pub async fn add_access_method(
+        &mut self,
+        access_method: AccessMethodSetting,
+    ) -> Result<(), Error> {
         self.settings
             .update(|settings| settings.api_access_methods.append(access_method))
             .await
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 8d9980ba42..cac152c843 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -41,7 +41,7 @@ use mullvad_relay_selector::{
 use mullvad_types::{
     access_method::{daemon::ApiAccessMethodUpdate, ApiAccessMethod, ApiAccessMethodId},
     account::{AccountData, AccountToken, VoucherSubmission},
-    api_access::{ApiAccessMethod, ApiAccessMethodId},
+    api_access::{AccessMethodSetting, ApiAccessMethodId},
     auth_failed::AuthFailed,
     custom_list::CustomList,
     device::{Device, DeviceEvent, DeviceEventCause, DeviceId, DeviceState, RemoveDeviceEvent},
@@ -262,9 +262,9 @@ pub enum DaemonCommand {
     /// Update a custom list with a given id
     UpdateCustomList(ResponseTx<(), Error>, CustomList),
     /// Get API access methods
-    GetApiAccessMethods(ResponseTx<Vec<ApiAccessMethod>, Error>),
+    GetApiAccessMethods(ResponseTx<Vec<AccessMethodSetting>, Error>),
     /// Add API access methods
-    AddApiAccessMethod(ResponseTx<(), Error>, ApiAccessMethod),
+    AddApiAccessMethod(ResponseTx<(), Error>, AccessMethodSetting),
     /// Remove an API access method
     RemoveApiAccessMethod(ResponseTx<(), Error>, ApiAccessMethodId),
     /// Set the API access method to use
@@ -2243,7 +2243,7 @@ where
         Self::oneshot_send(tx, result, "update_custom_list response");
     }
 
-    fn on_get_api_access_methods(&mut self, tx: ResponseTx<Vec<ApiAccessMethod>, Error>) {
+    fn on_get_api_access_methods(&mut self, tx: ResponseTx<Vec<AccessMethodSetting>, Error>) {
         let result = Ok(self.settings.api_access_methods.cloned());
         Self::oneshot_send(tx, result, "get_api_access_methods response");
     }
@@ -2251,7 +2251,7 @@ where
     async fn on_add_api_access_method(
         &mut self,
         tx: ResponseTx<(), Error>,
-        method: ApiAccessMethod,
+        method: AccessMethodSetting,
     ) {
         let result = self
             .add_access_method(method)
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 12671a41c7..eabdb11826 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -625,7 +625,7 @@ impl ManagementService for ManagementServiceImpl {
     ) -> ServiceResult<()> {
         log::debug!("add_api_access_method");
         let api_access_method =
-            mullvad_types::api_access::ApiAccessMethod::try_from(request.into_inner())?;
+            mullvad_types::api_access::AccessMethodSetting::try_from(request.into_inner())?;
         let (tx, rx) = oneshot::channel();
         self.send_command_to_daemon(DaemonCommand::AddApiAccessMethod(tx, api_access_method))?;
         self.wait_for_result(rx)