Skip to content

Commit

Permalink
app_params: Rename XalAppParameters.app_id to client_id
Browse files Browse the repository at this point in the history
  • Loading branch information
@tuxuser
tuxuser committed Dec 21, 2023
1 parent a98c9fd commit f5b0ea4
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion examples/src/bin/auth_azure.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ async fn main() -> Result<(), Error> {
eprintln!("NOTE: --flow authorization-code required!");
auth_main(
XalAppParameters {
app_id: CLIENT_ID.into(),
client_id: CLIENT_ID.into(),
title_id: None,
auth_scopes: vec![
Scope::new("Xboxlive.signin".into()),
Expand Down
8 changes: 4 additions & 4 deletions src/authenticator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ impl XalAuthenticator {
/// Refer to [`oauth2`] crate for it's usage
pub fn oauth_client(&self) -> Result<BasicClient, Error> {
let client = OAuthClient::new(
ClientId::new(self.app_params.app_id.to_string()),
ClientId::new(self.app_params.client_id.to_string()),
self.app_params
.client_secret
.clone()
Expand Down Expand Up @@ -441,7 +441,7 @@ impl XalAuthenticator {
/// # async fn demo_code() {
/// let mut authenticator = XalAuthenticator::new(
/// XalAppParameters {
/// app_id: "388ea51c-0b25-4029-aae2-17df49d23905".into(),
/// client_id: "388ea51c-0b25-4029-aae2-17df49d23905".into(),
/// title_id: None,
/// auth_scopes: vec![
/// Scope::new("Xboxlive.signin".into()),
Expand Down Expand Up @@ -795,7 +795,7 @@ impl XalAuthenticator {
))?;

let json_body = request::SisuAuthenticationRequest {
app_id: &self.app_params.app_id,
app_id: &self.app_params.client_id,
title_id: &title_id,
redirect_uri: self.app_params.redirect_uri.as_deref().ok_or(
Error::InvalidRedirectUrl("sisu_authenticate requires Redirect URL".to_string()),
Expand Down Expand Up @@ -896,7 +896,7 @@ impl XalAuthenticator {
) -> Result<response::SisuAuthorizationResponse, Error> {
let json_body = request::SisuAuthorizationRequest {
access_token: &format!("t={}", access_token.access_token().secret()),
app_id: &self.app_params.app_id,
app_id: &self.app_params.client_id,
device_token: &device_token.token,
sandbox: &self.sandbox_id.clone(),
site_name: "user.auth.xboxlive.com",
Expand Down
26 changes: 13 additions & 13 deletions src/models.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ impl ToString for DeviceType {
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
pub struct XalAppParameters {
/// App Id (For authorization/permission scope)
pub app_id: String,
pub client_id: String,
/// App Title-Id (For TitleToken)
pub title_id: Option<String>,
/// Scopes
Expand Down Expand Up @@ -546,7 +546,7 @@ pub mod app_params {
/// Xbox Beta App
pub fn APP_XBOX_BETA() -> XalAppParameters {
XalAppParameters {
app_id: "000000004415494b".into(),
client_id: "000000004415494b".into(),
title_id: Some("177887386".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
// Originally "ms-xal-000000004415494b://auth"
Expand All @@ -560,7 +560,7 @@ pub mod app_params {
/// Xbox App
pub fn APP_XBOX() -> XalAppParameters {
XalAppParameters {
app_id: "000000004c12ae6f".into(),
client_id: "000000004c12ae6f".into(),
title_id: Some("328178078".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
// Originally "ms-xal-000000004c12ae6f://auth"
Expand All @@ -574,7 +574,7 @@ pub mod app_params {
/// Gamepass App
pub fn APP_GAMEPASS() -> XalAppParameters {
XalAppParameters {
app_id: "000000004c20a908".into(),
client_id: "000000004c20a908".into(),
title_id: Some("1016898439".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
// Originally "ms-xal-000000004c20a908://auth"
Expand All @@ -588,7 +588,7 @@ pub mod app_params {
/// Gamepass Beta App
pub fn APP_GAMEPASS_BETA() -> XalAppParameters {
XalAppParameters {
app_id: "000000004c20a908".into(),
client_id: "000000004c20a908".into(),
title_id: Some("1016898439".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
// Originally "ms-xal-public-beta-000000004c20a908://auth"
Expand All @@ -604,7 +604,7 @@ pub mod app_params {
/// Uses default `oauth20_desktop.srf` redirect uri
pub fn APP_FAMILY_SETTINGS() -> XalAppParameters {
XalAppParameters {
app_id: "00000000482C8F49".into(),
client_id: "00000000482C8F49".into(),
title_id: Some("1618633878".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: Some(
Expand All @@ -617,7 +617,7 @@ pub mod app_params {
/// Old Xbox App (non-sisu-flow)
pub fn APP_OLD_XBOX_APP() -> XalAppParameters {
XalAppParameters {
app_id: "0000000048093EE3".into(),
client_id: "0000000048093EE3".into(),
title_id: None,
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: Some(
Expand All @@ -630,7 +630,7 @@ pub mod app_params {
/// Minecraft for Windows (JAVA)
pub fn MC_JAVA_WIN32() -> XalAppParameters {
XalAppParameters {
app_id: "00000000402b5328".into(),
client_id: "00000000402b5328".into(),
title_id: None,
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: Some(
Expand All @@ -643,7 +643,7 @@ pub mod app_params {
/// Minecraft Bedrock (Nintendo Switch)
pub fn MC_BEDROCK_SWITCH() -> XalAppParameters {
XalAppParameters {
app_id: "00000000441cc96b".into(),
client_id: "00000000441cc96b".into(),
title_id: Some("2047319603".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: Some(
Expand All @@ -656,7 +656,7 @@ pub mod app_params {
/// Minecraft Bedrock (Android)
pub fn MC_BEDROCK_ANDROID() -> XalAppParameters {
XalAppParameters {
app_id: "0000000048183522".into(),
client_id: "0000000048183522".into(),
title_id: Some("1739947436".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: Some(
Expand All @@ -669,7 +669,7 @@ pub mod app_params {
/// Minecraft Bedrock (iOS)
pub fn MC_BEDROCK_IOS() -> XalAppParameters {
XalAppParameters {
app_id: "000000004c17c01a".into(),
client_id: "000000004c17c01a".into(),
title_id: Some("1810924247".into()),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: Some(
Expand All @@ -682,14 +682,14 @@ pub mod app_params {
/*
/// Minecraft Bedrock (Win32))
pub const MC_BEDROCK_WIN32: XalAppParameters = XalAppParameters {
app_id: "".into(),
client_id: "".into(),
title_id: "896928775".into(),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: None,
};
pub const MC_BEDROCK_PLAYSTATION: XalAppParameters = XalAppParameters {
app_id: "".into(),
client_id: "".into(),
title_id: "2044456598".into(),
auth_scopes: vec![Scope::new(Constants::SCOPE_SERVICE_USER_AUTH.to_string())],
redirect_uri: None,
Expand Down
4 changes: 2 additions & 2 deletions src/tokenstore.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ mod tests {

#[test]
fn read_from_string() {
let tokens_str = r#"{"app_params":{"app_id":"00000000441cc96b","title_id":"42","auth_scopes":["service::user.auth.xboxlive.com::MBI_SSL"],"redirect_uri":"https://login.live.com/oauth20_desktop.srf"},"client_params":{"user_agent":"XAL","device_type":"NINTENDO","client_version":"0.0.0","query_display":"touch"},"sandbox_id":"RETAIL","live_token":{"access_token":"accessTokenABC","token_type":"bearer","expires_in":86400,"refresh_token":"refreshTokenABC","scope":"service::user.auth.xboxlive.com::MBI_SSL"}}"#;
let tokens_str = r#"{"app_params":{"client_id":"00000000441cc96b","title_id":"42","auth_scopes":["service::user.auth.xboxlive.com::MBI_SSL"],"redirect_uri":"https://login.live.com/oauth20_desktop.srf"},"client_params":{"user_agent":"XAL","device_type":"NINTENDO","client_version":"0.0.0","query_display":"touch"},"sandbox_id":"RETAIL","live_token":{"access_token":"accessTokenABC","token_type":"bearer","expires_in":86400,"refresh_token":"refreshTokenABC","scope":"service::user.auth.xboxlive.com::MBI_SSL"}}"#;
let ts = TokenStore::deserialize_from_string(tokens_str).unwrap();

assert_eq!(ts.app_params.app_id, "00000000441cc96b");
assert_eq!(ts.app_params.client_id, "00000000441cc96b");
assert_eq!(ts.app_params.title_id, Some("42".into()));
assert_eq!(
ts.app_params.auth_scopes.first().unwrap().as_str(),
Expand Down

0 comments on commit f5b0ea4

Please sign in to comment.