Bug 1925091 - Make Android FxaAccountManager supply comma-separate list of values for service=sync

Author: AadityaDhingra

components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/FxaClient.kt

@@ -113,9 +113,10 @@ class FxaClient(inner: FirefoxAccount, persistCallback: PersistCallback?) : Auto
     fun beginOAuthFlow(
         scopes: Array<String>,
         entrypoint: String,
+        services: List<String> = listOf("sync"),
     ): String {
         return withMetrics {
-            this.inner.beginOauthFlow(scopes.toList(), entrypoint, listOf("sync"))
+            this.inner.beginOauthFlow(scopes.toList(), entrypoint, services)
         }
     }
 
@@ -133,9 +134,10 @@ class FxaClient(inner: FirefoxAccount, persistCallback: PersistCallback?) : Auto
         pairingUrl: String,
         scopes: Array<String>,
         entrypoint: String,
+        services: List<String> = listOf("sync"),
     ): String {
         return withMetrics {
-            this.inner.beginPairingFlow(pairingUrl, scopes.toList(), entrypoint, listOf("sync"))
+            this.inner.beginPairingFlow(pairingUrl, scopes.toList(), entrypoint, services)
         }
     }
 

components/fxa-client/src/auth.rs

@@ -80,6 +80,7 @@ impl FirefoxAccount {
     ///   - `metrics` - optionally, additional metrics tracking parameters.
     ///       - These will be included as query parameters in the resulting URL.
     #[handle_error(Error)]
+    #[uniffi::method(default(service = &["sync"]))]
     pub fn begin_oauth_flow<T: AsRef<str>>(
         &self,
         // Allow both &[String] and &[&str] since UniFFI can't represent `&[&str]` yet,
@@ -130,6 +131,7 @@ impl FirefoxAccount {
     ///   - `metrics` - optionally, additional metrics tracking parameters.
     ///       - These will be included as query parameters in the resulting URL.
     #[handle_error(Error)]
+    #[uniffi::method(default(service = &["sync"]))]
     pub fn begin_pairing_flow(
         &self,
         pairing_url: &str,

components/fxa-client/src/internal/oauth.rs

@@ -130,6 +130,7 @@ impl FirefoxAccount {
     /// * `entrypoint` - The entrypoint to be used for data collection
     /// *  `service` - Space-separated list of requested services.
     /// * `metrics` - Optional parameters for metrics
+    #[uniffi::method(default(service = &["sync"]))]
     pub fn begin_pairing_flow(
         &mut self,
         pairing_url: &str,
@@ -160,6 +161,7 @@ impl FirefoxAccount {
     /// * `entrypoint` - The entrypoint to be used for metrics
     /// *  `service` - Space-separated list of requested services.
     /// * `metrics` - Optional metrics parameters
+    #[uniffi::method(default(service = &["sync"]))]
     pub fn begin_oauth_flow(
         &mut self,
         scopes: &[&str],