Rename `ApiAccessMethod` to `AccessMethodSetting`

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

3 files changed, 28 insertions, 28 deletions

diff --git a/mullvad-management-interface/src/client.rs b/mullvad-management-interface/src/client.rs
index 2503d6d55c..a7de6ae55f 100644
--- a/mullvad-management-interface/src/client.rs
+++ b/mullvad-management-interface/src/client.rs
@@ -5,7 +5,7 @@ use futures::{Stream, StreamExt};
 use mullvad_types::{
     access_method::{daemon::ApiAccessMethodUpdate, ApiAccessMethod, ApiAccessMethodId},
     account::{AccountData, AccountToken, VoucherSubmission},
-    api_access::{ApiAccessMethod, ApiAccessMethodId},
+    api_access::{AccessMethodSetting, ApiAccessMethodId},
     custom_list::{CustomList, Id},
     device::{Device, DeviceEvent, DeviceId, DeviceState, RemoveDeviceEvent},
     location::GeoIpLocation,
@@ -165,7 +165,7 @@ impl MullvadProxyClient {
         mullvad_types::relay_list::RelayList::try_from(list).map_err(Error::InvalidResponse)
     }
 
-    pub async fn get_api_access_methods(&mut self) -> Result<Vec<ApiAccessMethod>> {
+    pub async fn get_api_access_methods(&mut self) -> Result<Vec<AccessMethodSetting>> {
         self.0
             .get_settings(())
             .await
@@ -176,7 +176,7 @@ impl MullvadProxyClient {
             .api_access_methods
             .into_iter()
             .map(|api_access_method| {
-                ApiAccessMethod::try_from(api_access_method).map_err(Error::InvalidResponse)
+                AccessMethodSetting::try_from(api_access_method).map_err(Error::InvalidResponse)
             })
             .collect()
     }
@@ -184,7 +184,7 @@ impl MullvadProxyClient {
     pub async fn get_api_access_method(
         &mut self,
         id: &ApiAccessMethodId,
-    ) -> Result<ApiAccessMethod> {
+    ) -> Result<AccessMethodSetting> {
         self.get_api_access_methods()
             .await?
             .into_iter()
@@ -491,7 +491,10 @@ impl MullvadProxyClient {
         Ok(())
     }
 
-    pub async fn add_access_method(&mut self, api_access_method: ApiAccessMethod) -> Result<()> {
+    pub async fn add_access_method(
+        &mut self,
+        api_access_method: AccessMethodSetting,
+    ) -> Result<()> {
         self.0
             .add_api_access_method(types::ApiAccessMethod::from(api_access_method))
             .await
diff --git a/mullvad-management-interface/src/types/conversions/api_access_method.rs b/mullvad-management-interface/src/types/conversions/api_access_method.rs
index fa0d346788..0fd29f4b93 100644
--- a/mullvad-management-interface/src/types/conversions/api_access_method.rs
+++ b/mullvad-management-interface/src/types/conversions/api_access_method.rs
@@ -31,8 +31,8 @@ mod settings {
                 api_access_methods: settings
                     .api_access_methods
                     .iter()
-                    .map(api_access::ApiAccessMethod::try_from)
-                    .collect::<Result<Vec<api_access::ApiAccessMethod>, _>>()?,
+                    .map(api_access::AccessMethodSetting::try_from)
+                    .collect::<Result<Vec<api_access::AccessMethodSetting>, _>>()?,
             })
         }
     }
@@ -55,7 +55,7 @@ mod settings {
                 .ok_or(FromProtobufTypeError::InvalidArgument(
                     "Could not convert Access Method from protobuf",
                 ))
-                .and_then(api_access::ApiAccessMethod::try_from)?;
+                .and_then(api_access::AccessMethodSetting::try_from)?;
 
             let id = value
                 .id
@@ -78,23 +78,23 @@ mod settings {
 mod data {
     use crate::types::{proto, FromProtobufTypeError};
     use mullvad_types::api_access::{
-        AccessMethod, ApiAccessMethod, ApiAccessMethodId, BuiltInAccessMethod, CustomAccessMethod,
-        Shadowsocks, Socks5, Socks5Local, Socks5Remote,
+        AccessMethod, AccessMethodSetting, ApiAccessMethodId, BuiltInAccessMethod,
+        CustomAccessMethod, Shadowsocks, Socks5, Socks5Local, Socks5Remote,
     };
 
-    impl TryFrom<proto::ApiAccessMethods> for Vec<ApiAccessMethod> {
+    impl TryFrom<proto::ApiAccessMethods> for Vec<AccessMethodSetting> {
         type Error = FromProtobufTypeError;
 
         fn try_from(value: proto::ApiAccessMethods) -> Result<Self, Self::Error> {
             value
                 .api_access_methods
                 .iter()
-                .map(ApiAccessMethod::try_from)
+                .map(AccessMethodSetting::try_from)
                 .collect()
         }
     }
 
-    impl TryFrom<proto::ApiAccessMethod> for ApiAccessMethod {
+    impl TryFrom<proto::ApiAccessMethod> for AccessMethodSetting {
         type Error = FromProtobufTypeError;
 
         fn try_from(value: proto::ApiAccessMethod) -> Result<Self, Self::Error> {
@@ -185,7 +185,12 @@ mod data {
                 }
             };
 
-            Ok(ApiAccessMethod::with_id(id, name, enabled, access_method))
+            Ok(AccessMethodSetting::with_id(
+                id,
+                name,
+                enabled,
+                access_method,
+            ))
         }
     }
 
@@ -207,8 +212,8 @@ mod data {
         }
     }
 
-    impl From<ApiAccessMethod> for proto::ApiAccessMethod {
-        fn from(value: ApiAccessMethod) -> Self {
+    impl From<AccessMethodSetting> for proto::ApiAccessMethod {
+        fn from(value: AccessMethodSetting) -> Self {
             let id = proto::Uuid::from(value.get_id());
             let name = value.get_name();
             let enabled = value.enabled();
@@ -265,16 +270,16 @@ mod data {
         }
     }
 
-    impl TryFrom<&proto::ApiAccessMethod> for ApiAccessMethod {
+    impl TryFrom<&proto::ApiAccessMethod> for AccessMethodSetting {
         type Error = FromProtobufTypeError;
 
         fn try_from(value: &proto::ApiAccessMethod) -> Result<Self, Self::Error> {
-            ApiAccessMethod::try_from(value.clone())
+            AccessMethodSetting::try_from(value.clone())
         }
     }
 
-    impl From<Vec<ApiAccessMethod>> for proto::ApiAccessMethods {
-        fn from(value: Vec<ApiAccessMethod>) -> proto::ApiAccessMethods {
+    impl From<Vec<AccessMethodSetting>> for proto::ApiAccessMethods {
+        fn from(value: Vec<AccessMethodSetting>) -> proto::ApiAccessMethods {
             proto::ApiAccessMethods {
                 api_access_methods: value.iter().map(|method| method.clone().into()).collect(),
             }
diff --git a/mullvad-management-interface/src/types/rpc/api_access_method_update.rs b/mullvad-management-interface/src/types/rpc/api_access_method_update.rs
deleted file mode 100644
index b270893102..0000000000
--- a/mullvad-management-interface/src/types/rpc/api_access_method_update.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-/// A short-lived datastructure used in the `ApiAccessMethodUpdate` RPC call.
-use mullvad_types::api_access::{ApiAccessMethod, ApiAccessMethodId};
-/// Argument to gRPC call `UpdateApiAccessMethod`.
-#[derive(Debug, Clone, PartialEq)]
-pub struct ApiAccessMethodUpdate {
-    pub id: ApiAccessMethodId,
-    pub access_method: ApiAccessMethod,
-}