refactor: Separate into XalAppParameters and XalClientParameters

Author: tuxuser

xal/src/app_params.rs

@@ -36,72 +36,79 @@ impl ToString for DeviceType {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct XalClientParameters {
-    pub user_agent: String,
+pub struct XalAppParameters {
     pub app_id: String,
-    pub device_type: DeviceType,
-    pub client_version: String,
     pub title_id: String,
     pub redirect_uri: String,
-    pub query_display: String,
 }
 
-impl XalClientParameters {
-    pub fn ios_xboxbeta_params() -> Self {
+impl XalAppParameters {
+    pub fn xbox_app_beta() -> Self {
         Self {
-            user_agent: "XAL iOS 2020.07.20200714.000".into(),
             app_id: "000000004415494b".into(),
-            device_type: DeviceType::IOS,
-            client_version: "14.0.1".into(),
             title_id: "177887386".into(),
             redirect_uri: "ms-xal-000000004415494b://auth".into(),
-            query_display: "ios_phone".into(),
         }
     }
 
-    pub fn ios_xbox_params() -> Self {
+    pub fn xbox_app() -> Self {
         Self {
-            user_agent: "XAL iOS 2021.11.20211021.000".into(),
             app_id: "000000004c12ae6f".into(),
-            device_type: DeviceType::IOS,
-            client_version: "15.6.1".into(),
             title_id: "328178078".into(),
             redirect_uri: "ms-xal-000000004c12ae6f://auth".into(),
-            query_display: "ios_phone".into(),
         }
     }
 
-    pub fn android_xboxbeta_params() -> Self {
+    pub fn gamepass_beta() -> Self {
         Self {
-            user_agent: "XAL Android 2020.07.20200714.000".into(),
-            app_id: "000000004415494b".into(),
-            device_type: DeviceType::ANDROID,
-            client_version: "8.0.0".into(),
-            title_id: "177887386".into(),
-            redirect_uri: "ms-xal-000000004415494b://auth".into(),
-            query_display: "android_phone".into(),
+            app_id: "000000004c20a908".into(),
+            title_id: "1016898439".into(),
+            redirect_uri: "ms-xal-public-beta-000000004c20a908://auth".into(),
+        }
+    }
+}
+
+impl Default for XalAppParameters {
+    fn default() -> Self {
+        Self::gamepass_beta()
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct XalClientParameters {
+    pub user_agent: String,
+    pub device_type: DeviceType,
+    pub client_version: String,
+    pub query_display: String,
+}
+
+impl XalClientParameters {
+    pub fn ios() -> Self {
+        Self {
+            user_agent: "XAL iOS 2021.11.20211021.000".into(),
+            device_type: DeviceType::IOS,
+            client_version: "15.6.1".into(),
+            query_display: "ios_phone".into(),
         }
     }
 
-    pub fn android_gamepass_beta_params() -> Self {
+    pub fn android() -> Self {
         Self {
             user_agent: "XAL Android 2020.07.20200714.000".into(),
-            app_id: "000000004c20a908".into(),
             device_type: DeviceType::ANDROID,
             client_version: "8.0.0".into(),
-            title_id: "1016898439".into(),
-            redirect_uri: "ms-xal-public-beta-000000004c20a908://auth".into(),
             query_display: "android_phone".into(),
         }
     }
 }
 
 impl Default for XalClientParameters {
     fn default() -> Self {
-        Self::android_gamepass_beta_params()
+        Self::android()
     }
 }
 
+
 #[cfg(test)]
 mod tests {
     use super::*;

xal/src/authenticator.rs

@@ -1,3 +1,5 @@
+use crate::app_params::XalAppParameters;
+
 use super::{
     app_params::{DeviceType, XalClientParameters},
     models::request,
@@ -89,6 +91,7 @@ where
 #[derive(Debug)]
 pub struct XalAuthenticator {
     device_id: uuid::Uuid,
+    app_params: XalAppParameters,
     client_params: XalClientParameters,
     ms_cv: cvlib::CorrelationVector,
     client: reqwest::Client,
@@ -98,7 +101,8 @@ pub struct XalAuthenticator {
 
 impl Default for XalAuthenticator {
     fn default() -> Self {
-        let app_params = XalClientParameters::default();
+        let client_params = XalClientParameters::default();
+        let app_params = XalAppParameters::default();
         let client_id = ClientId::new(app_params.app_id.clone());
         let client_secret = None;
 
@@ -115,7 +119,8 @@ impl Default for XalAuthenticator {
 
         Self {
             device_id: uuid::Uuid::new_v4(),
-            client_params: app_params,
+            app_params,
+            client_params,
             ms_cv: cvlib::CorrelationVector::new(),
             client: reqwest::Client::new(),
             client2,
@@ -172,7 +177,7 @@ impl XalAuthenticator {
         refresh_token: &RefreshToken,
     ) -> Result<response::XCloudTokenResponse> {
         let form_body = request::WindowsLiveTokenRequest {
-            client_id: &self.client_params.app_id.clone(),
+            client_id: &self.app_params.app_id.clone(),
             grant_type: "refresh_token",
             scope:
                 "service::http://Passport.NET/purpose::PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN",
@@ -284,9 +289,9 @@ impl XalAuthenticator {
         headers.insert("MS-CV", self.next_cv().parse()?);
 
         let json_body = request::SisuAuthenticationRequest {
-            app_id: &self.client_params.app_id,
-            title_id: &self.client_params.title_id,
-            redirect_uri: &self.client_params.redirect_uri,
+            app_id: &self.app_params.app_id,
+            title_id: &self.app_params.title_id,
+            redirect_uri: &self.app_params.redirect_uri,
             device_token,
             sandbox: "RETAIL",
             token_type: "code",
@@ -328,7 +333,7 @@ impl XalAuthenticator {
     ) -> Result<response::SisuAuthorizationResponse> {
         let json_body = request::SisuAuthorizationRequest {
             access_token: &format!("t={}", access_token),
-            app_id: &self.client_params.app_id.clone(),
+            app_id: &self.app_params.app_id.clone(),
             device_token,
             sandbox: "RETAIL",
             site_name: "user.auth.xboxlive.com",