Change account_token to an Option

1 files changed, 6 insertions, 6 deletions

diff --git a/mullvad_daemon/src/management_interface.rs b/mullvad_daemon/src/management_interface.rs
index 44765f0ac5..4b5a104d5e 100644
--- a/mullvad_daemon/src/management_interface.rs
+++ b/mullvad_daemon/src/management_interface.rs
@@ -50,11 +50,11 @@ build_rpc_trait! {
 
         /// Set which account to connect with.
         #[rpc(name = "set_account")]
-        fn set_account(&self, AccountToken) -> Result<(), Error>;
+        fn set_account(&self, Option<AccountToken>) -> Result<(), Error>;
 
         /// Get which account is configured.
         #[rpc(async, name = "get_account")]
-        fn get_account(&self) -> BoxFuture<AccountToken, Error>;
+        fn get_account(&self) -> BoxFuture<Option<AccountToken>, Error>;
 
         /// Set which country to connect to
         #[rpc(name = "set_country")]
@@ -118,9 +118,9 @@ pub enum TunnelCommand {
     /// Request the current state.
     GetState(sync::oneshot::Sender<SecurityState>),
     /// Set which account token to use for subsequent connection attempts.
-    SetAccount(AccountToken),
+    SetAccount(Option<AccountToken>),
     /// Request the current account token being used.
-    GetAccount(sync::oneshot::Sender<AccountToken>),
+    GetAccount(sync::oneshot::Sender<Option<AccountToken>>),
 }
 
 #[derive(Default)]
@@ -260,7 +260,7 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem
         Ok(HashMap::new())
     }
 
-    fn set_account(&self, account_token: AccountToken) -> Result<(), Error> {
+    fn set_account(&self, account_token: Option<AccountToken>) -> Result<(), Error> {
         trace!("set_account");
         self.tx
             .lock()
@@ -269,7 +269,7 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem
             .map_err(|_| Error::internal_error())
     }
 
-    fn get_account(&self) -> BoxFuture<AccountToken, Error> {
+    fn get_account(&self) -> BoxFuture<Option<AccountToken>, Error> {
         trace!("get_account");
         let (tx, rx) = sync::oneshot::channel();
         match self.tx.lock().unwrap().send(TunnelCommand::GetAccount(tx)) {