FxaServer::China now points at FxaServer::Release

Author: mhammond

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

@@ -7,10 +7,9 @@ package mozilla.appservices.fxaclient
 fun FxaServer.isCustom() = this is FxaServer.Custom
 
 fun FxaServer.contentUrl() = when (this) {
-    is FxaServer.Release -> "https://accounts.firefox.com"
+    is FxaServer.Release, FxaServer.China -> "https://accounts.firefox.com"
     is FxaServer.Stable -> "https://stable.dev.lcip.org"
     is FxaServer.Stage -> "https://accounts.stage.mozaws.net"
-    is FxaServer.China -> "https://accounts.firefox.com.cn"
     is FxaServer.LocalDev -> "http://127.0.0.1:3030"
     is FxaServer.Custom -> this.url
 }

components/fxa-client/src/fxa_client.udl

@@ -752,7 +752,7 @@ interface FxaServer {
     Release();
     Stable();
     Stage();
-    China();
+    China(); // deprecaed, same as Release
     LocalDev();
     Custom(string url);
 };

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

@@ -40,7 +40,6 @@ pub struct RemoteConfig {
 }
 
 pub(crate) const CONTENT_URL_RELEASE: &str = "https://accounts.firefox.com";
-pub(crate) const CONTENT_URL_CHINA: &str = "https://accounts.firefox.com.cn";
 
 impl Config {
     fn remote_config(&self) -> Result<Arc<RemoteConfig>> {
@@ -211,10 +210,6 @@ impl Config {
         Self::new("https://stable.dev.lcip.org", client_id, redirect_uri)
     }
 
-    pub fn china(client_id: &str, redirect_uri: &str) -> Self {
-        Self::new(CONTENT_URL_CHINA, client_id, redirect_uri)
-    }
-
     pub fn new(content_url: &str, client_id: &str, redirect_uri: &str) -> Self {
         Self {
             content_url: content_url.to_string(),

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

@@ -138,12 +138,6 @@ impl FirefoxAccount {
         if self.state.config().content_url()? == content_url_release {
             return Ok("https://firefox.com/pair".to_owned());
         }
-        // Similarly special case for the China server.
-        let content_url_china = Url::parse(config::CONTENT_URL_CHINA)
-            .expect("hardcoded CONTENT_URL_CHINA failed to parse");
-        if self.state.config().content_url()? == content_url_china {
-            return Ok("https://firefox.com.cn/pair".to_owned());
-        }
         Ok(self.state.config().pair_url()?.into())
     }
 
@@ -616,12 +610,5 @@ mod tests {
             fxa.get_pairing_authority_url().unwrap().as_str(),
             "https://firefox.com/pair"
         );
-
-        let config = Config::china("12345678", "https://foo.bar");
-        let fxa = FirefoxAccount::with_config(config);
-        assert_eq!(
-            fxa.get_pairing_authority_url().unwrap().as_str(),
-            "https://firefox.com.cn/pair"
-        )
     }
 }

components/fxa-client/src/lib.rs

@@ -137,10 +137,9 @@ pub enum FxaServer {
 impl FxaServer {
     fn content_url(&self) -> &str {
         match self {
-            Self::Release => "https://accounts.firefox.com",
+            Self::Release | Self::China => "https://accounts.firefox.com",
             Self::Stable => "https://stable.dev.lcip.org",
             Self::Stage => "https://accounts.stage.mozaws.net",
-            Self::China => "https://accounts.firefox.com.cn",
             Self::LocalDev => "http://127.0.0.1:3030",
             Self::Custom { url } => url,
         }
@@ -159,7 +158,7 @@ impl From<&Url> for FxaServer {
         } else if origin == Url::parse(Self::Stage.content_url()).unwrap().origin() {
             Self::Stage
         } else if origin == Url::parse(Self::China.content_url()).unwrap().origin() {
-            Self::China
+            unreachable!("china is release.")
         } else if origin == Url::parse(Self::LocalDev.content_url()).unwrap().origin() {
             Self::LocalDev
         } else {
@@ -216,15 +215,6 @@ impl FxaConfig {
         }
     }
 
-    pub fn china(client_id: impl ToString, redirect_uri: impl ToString) -> Self {
-        Self {
-            server: FxaServer::China,
-            client_id: client_id.to_string(),
-            redirect_uri: redirect_uri.to_string(),
-            token_server_url_override: None,
-        }
-    }
-
     pub fn dev(client_id: impl ToString, redirect_uri: impl ToString) -> Self {
         Self {
             server: FxaServer::LocalDev,
@@ -247,7 +237,6 @@ mod tests {
             ("https://accounts.firefox.com", FxaServer::Release),
             ("https://stable.dev.lcip.org", FxaServer::Stable),
             ("https://accounts.stage.mozaws.net", FxaServer::Stage),
-            ("https://accounts.firefox.com.cn", FxaServer::China),
             ("http://127.0.0.1:3030", FxaServer::LocalDev),
             (
                 "http://my-fxa-server.com",