Expose play purchase API via gRPC

Author: MarkusPettersson98

mullvad-daemon/src/management_interface.rs

@@ -956,6 +956,60 @@ impl ManagementService for ManagementServiceImpl {
         let blob = self.wait_for_result(rx).await??;
         Ok(Response::new(blob))
     }
+
+    #[cfg(target_os = "android")]
+    async fn init_play_purchase(
+        &self,
+        _request: Request<()>,
+    ) -> ServiceResult<types::PlayPurchasePaymentToken> {
+        log::debug!("init_play_purchase");
+
+        let (tx, rx) = oneshot::channel();
+        self.send_command_to_daemon(DaemonCommand::InitPlayPurchase(tx))?;
+
+        let payment_token = self
+            .wait_for_result(rx)
+            .await?
+            .map(types::PlayPurchasePaymentToken::from)
+            .map_err(map_daemon_error)??;
+
+        Ok(Response::new(payment_token))
+    }
+
+    /// On non-Android platforms, the return value will be useless.
+    #[cfg(not(target_os = "android"))]
+    async fn init_play_purchase(
+        &self,
+        _: Request<()>,
+    ) -> ServiceResult<types::PlayPurchasePaymentToken> {
+        log::error!("Called `init_play_purchase` on non-Android platform");
+        Ok(Response::new(types::PlayPurchasePaymentToken::from(
+            String::default(),
+        )))
+    }
+
+    #[cfg(target_os = "android")]
+    async fn verify_play_purchase(
+        &self,
+        request: Request<types::PlayPurchase>,
+    ) -> ServiceResult<()> {
+        log::debug!("verify_play_purchase");
+
+        let (tx, rx) = oneshot::channel();
+        let play_purchase = mullvad_types::account::PlayPurchase::try_from(config.into_inner())?;
+
+        self.send_command_to_daemon(DaemonCommand::VerifyPlayPurchase(tx, play_purchase))?;
+
+        self.wait_for_result(rx).await?.map_err(map_daemon_error)?;
+
+        Ok(Response::new(()))
+    }
+
+    #[cfg(not(target_os = "android"))]
+    async fn verify_play_purchase(&self, _: Request<types::PlayPurchase>) -> ServiceResult<()> {
+        log::error!("Called `verify_play_purchase` on non-Android platform");
+        Ok(Response::new(()))
+    }
 }
 
 impl ManagementServiceImpl {

mullvad-jni/src/daemon_interface.rs

@@ -1,7 +1,7 @@
 use futures::{channel::oneshot, executor::block_on};
 use mullvad_daemon::{device, settings::patch, DaemonCommand, DaemonCommandSender};
 use mullvad_types::{
-    account::{AccountData, AccountToken, PlayPurchase, VoucherSubmission},
+    account::{AccountData, AccountToken, VoucherSubmission},
     custom_list::CustomList,
     device::{Device, DeviceState},
     relay_constraints::{ObfuscationSettings, RelayOverride, RelaySettings},
@@ -301,26 +301,6 @@ impl DaemonInterface {
             .map_err(Error::from)
     }
 
-    pub fn init_play_purchase(&self) -> Result<String> {
-        let (tx, rx) = oneshot::channel();
-
-        self.send_command(DaemonCommand::InitPlayPurchase(tx))?;
-
-        block_on(rx)
-            .map_err(|_| Error::NoResponse)?
-            .map_err(Error::from)
-    }
-
-    pub fn verify_play_purchase(&self, play_purchase: PlayPurchase) -> Result<()> {
-        let (tx, rx) = oneshot::channel();
-
-        self.send_command(DaemonCommand::VerifyPlayPurchase(tx, play_purchase))?;
-
-        block_on(rx)
-            .map_err(|_| Error::NoResponse)?
-            .map_err(Error::from)
-    }
-
     pub fn set_relay_settings(&self, update: RelaySettings) -> Result<()> {
         let (tx, rx) = oneshot::channel();
 

mullvad-jni/src/lib.rs

@@ -23,7 +23,7 @@ use mullvad_daemon::{
     settings::patch::Error as PatchError, version, Daemon, DaemonCommandChannel,
 };
 use mullvad_types::{
-    account::{AccountData, PlayPurchase, VoucherSubmission},
+    account::{AccountData, VoucherSubmission},
     custom_list::CustomList,
     relay_constraints::RelayOverride,
     settings::DnsOptions,
@@ -1301,62 +1301,6 @@ pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_submitV
     result.into_java(&env).forget()
 }
 
-#[no_mangle]
-#[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_initPlayPurchase<'env>(
-    env: JNIEnv<'env>,
-    _: JObject<'_>,
-    daemon_interface_address: jlong,
-) -> JObject<'env> {
-    let env = JnixEnv::from(env);
-
-    let result =
-        // SAFETY: The address points to an instance valid for the duration of this function call
-        if let Some(daemon_interface) = unsafe { get_daemon_interface(daemon_interface_address) } {
-            let raw_result = daemon_interface.init_play_purchase();
-
-            if let Err(ref error) = &raw_result {
-                log_request_error("init google play purchase", error);
-            }
-
-            PlayPurchaseInitResult::from(raw_result)
-        } else {
-            PlayPurchaseInitResult::Error(PlayPurchaseInitError::OtherError)
-        };
-
-    result.into_java(&env).forget()
-}
-
-#[no_mangle]
-#[allow(non_snake_case)]
-pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_verifyPlayPurchase<
-    'env,
->(
-    env: JNIEnv<'env>,
-    _: JObject<'_>,
-    daemon_interface_address: jlong,
-    play_purchase: JObject<'_>,
-) -> JObject<'env> {
-    let env = JnixEnv::from(env);
-
-    let result =
-        // SAFETY: The address points to an instance valid for the duration of this function call
-        if let Some(daemon_interface) = unsafe { get_daemon_interface(daemon_interface_address) } {
-            let play_purchase = PlayPurchase::from_java(&env, play_purchase);
-            let raw_result = daemon_interface.verify_play_purchase(play_purchase);
-
-            if let Err(ref error) = &raw_result {
-                log_request_error("verify google play purchase", error);
-            }
-
-            PlayPurchaseVerifyResult::from(raw_result)
-        } else {
-            PlayPurchaseVerifyResult::Error(PlayPurchaseVerifyError::OtherError)
-        };
-
-    result.into_java(&env).forget()
-}
-
 #[no_mangle]
 #[allow(non_snake_case)]
 pub extern "system" fn Java_net_mullvad_mullvadvpn_service_MullvadDaemon_setRelaySettings(

mullvad-management-interface/proto/management_interface.proto

@@ -99,6 +99,10 @@ service ManagementService {
   rpc SetSplitTunnelState(google.protobuf.BoolValue) returns (google.protobuf.Empty) {}
   rpc GetExcludedProcesses(google.protobuf.Empty) returns (ExcludedProcessList) {}
 
+  // Play payment (Android)
+  rpc InitPlayPurchase(google.protobuf.Empty) returns (PlayPurchasePaymentToken) {}
+  rpc VerifyPlayPurchase(PlayPurchase) returns (google.protobuf.Empty) {}
+
   // Notify the split tunnel monitor that a volume was mounted or dismounted
   // (Windows).
   rpc CheckVolumes(google.protobuf.Empty) returns (google.protobuf.Empty) {}
@@ -701,3 +705,11 @@ message RemoveDeviceEvent {
   string account_token = 1;
   repeated Device new_device_list = 2;
 }
+
+message PlayPurchase {
+  string product_id = 1;
+  PlayPurchasePaymentToken purchase_token = 2;
+}
+
+message PlayPurchasePaymentToken { string token = 1; }
+

mullvad-management-interface/src/types/conversions/account.rs

@@ -1,6 +1,8 @@
 use crate::types;
 use chrono::TimeZone;
 use mullvad_types::account::{AccountData, VoucherSubmission};
+#[cfg(target_os = "android")]
+use mullvad_types::account::{PlayPurchase, PlayPurchasePaymentToken};
 
 use super::FromProtobufTypeError;
 
@@ -62,3 +64,30 @@ impl TryFrom<types::AccountData> for AccountData {
         })
     }
 }
+
+#[cfg(target_os = "android")]
+impl TryFrom<types::PlayPurchase> for PlayPurchase {
+    type Error = FromProtobufTypeError;
+
+    fn try_from(value: types::PlayPurchase) -> Result<Self, Self::Error> {
+        let product_id = value.product_id;
+        let purchase_token = value
+            .purchase_token
+            .ok_or(FromProtobufTypeError::InvalidArgument(
+                "Missing purchase token",
+            ))?
+            .token;
+
+        Ok(Self {
+            product_id,
+            purchase_token,
+        })
+    }
+}
+
+#[cfg(target_os = "android")]
+impl From<PlayPurchasePaymentToken> for types::PlayPurchasePaymentToken {
+    fn from(value: PlayPurchasePaymentToken) -> Self {
+        Self { token: value }
+    }
+}