xal: Store XalAppParameters in TokenStore too

Author: tuxuser

xal/src/authenticator.rs

@@ -142,6 +142,10 @@ impl XalAuthenticator {
 }
 
 impl XalAuthenticator {
+    pub fn app_params(&self) -> XalAppParameters {
+        self.app_params.clone()
+    }
+
     pub fn client_params(&self) -> XalClientParameters {
         self.client_params.clone()
     }

xal/src/bin/auth-cli.rs

@@ -129,6 +129,7 @@ When finished, paste the Redirect URL and hit [ENTER]"#,
         println!("Transfer token={:?}", transfer_token);
 
         let ts = TokenStore {
+            app_params: xal.app_params(),
             client_params: xal.client_params(),
             wl_token: wl_token_clone,
             sisu_tokens: auth_response,

xal/src/bin/auth-webview.rs

@@ -64,6 +64,7 @@ async fn continue_auth(
     println!("Transfer token={:?}", transfer_token);
 
     let ts = TokenStore {
+        app_params: xal.app_params(),
         client_params: xal.client_params(),
         wl_token: wl_token_clone,
         sisu_tokens: auth_response,

xal/src/utils.rs

@@ -4,12 +4,13 @@ use std::fs;
 
 use crate::authenticator::SpecialTokenResponse;
 use crate::{
-    app_params::XalClientParameters,
+    app_params::{XalAppParameters, XalClientParameters},
     models::response::{SisuAuthorizationResponse, XCloudTokenResponse, XSTSResponse},
 };
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct TokenStore {
+    pub app_params: XalAppParameters,
     pub client_params: XalClientParameters,
     pub wl_token: SpecialTokenResponse,
     pub sisu_tokens: SisuAuthorizationResponse,