Merge branch 'golang-dev' of https://gitea.piwalker.net/piwalker/FCLauncher into golang-dev

fclauncher/app.go

@@ -56,6 +56,8 @@ func (a *App) CheckPrerequisites() {
 		a.Auth, err = TokenRefresh(*a, a.Auth)
 		if err == nil {
 			authenticated = true
+		} else {
+			fmt.Printf("token reauth failed, requesting device code: %s\n", err)
 		}
 	}
 	if !authenticated {

fclauncher/auth.go

@@ -12,7 +12,6 @@ import (
 	wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
 )
 
-
 type LauncherAuth struct {
 	Id    string
 	Name  string
@@ -150,12 +149,15 @@ func TokenRefresh(app App, auth authenticationResp) (authenticationResp, error)
 	data, _ := io.ReadAll(resp.Body)
 	authResp := authenticationResp{}
 	json.Unmarshal(data, &authResp)
+	if authResp.Error != "" {
+		return authResp, fmt.Errorf("unable to request new token: %s", authResp.Error_description)
+	}
 	return authResp, nil
 }
 
 func MicrosoftAuth(auth authenticationResp) (LauncherAuth, error) {
 	//Xbox Live Auth
-	req, _ := json.Marshal(xboxAuthRequest{Properties: xboxAuthProperties{AuthMethod: "RPS", SiteName: "user.auth.xboxlive.com", RpsTicket: "d="+auth.Access_token}, RelyingParty: "http://auth.xboxlive.com", TokenType: "JWT"})
+	req, _ := json.Marshal(xboxAuthRequest{Properties: xboxAuthProperties{AuthMethod: "RPS", SiteName: "user.auth.xboxlive.com", RpsTicket: "d=" + auth.Access_token}, RelyingParty: "http://auth.xboxlive.com", TokenType: "JWT"})
 	client := http.Client{}
 	httpreq, _ := http.NewRequest("POST", "https://user.auth.xboxlive.com/user/authenticate", bytes.NewBuffer(req))
 	httpreq.Header.Add("x-xbl-contract-version", "1")
@@ -169,7 +171,7 @@ func MicrosoftAuth(auth authenticationResp) (LauncherAuth, error) {
 	if httpResp.StatusCode != 200 {
 		return LauncherAuth{}, fmt.Errorf("unable to obtain xbox live token: %s\n", httpResp.Status)
 	}
-	d,_ := io.ReadAll(httpResp.Body)
+	d, _ := io.ReadAll(httpResp.Body)
 	xblAuth := xboxAuthResponse{}
 	json.Unmarshal(d, &xblAuth)
 	xstsData, _ := json.Marshal(XSTSRequest{Properties: XSTSProperties{SandboxId: "RETAIL", UserTokens: []string{xblAuth.Token}}, RelyingParty: "rp://api.minecraftservices.com/", TokenType: "JWT"})
@@ -186,7 +188,7 @@ func MicrosoftAuth(auth authenticationResp) (LauncherAuth, error) {
 	d, _ = io.ReadAll(httpResp.Body)
 	mcApi := xboxAuthResponse{}
 	json.Unmarshal(d, &mcApi)
-	mcAuthData, _ := json.Marshal(McAuthRequest{Xtoken: "XBL 3.0 x=" + mcApi.DisplayClaims.Xui[0].Uhs+ ";" + mcApi.Token, Platform: "PC_LAUNCHER"})
+	mcAuthData, _ := json.Marshal(McAuthRequest{Xtoken: "XBL 3.0 x=" + mcApi.DisplayClaims.Xui[0].Uhs + ";" + mcApi.Token, Platform: "PC_LAUNCHER"})
 	httpReqMC, _ := http.NewRequest("POST", "https://api.minecraftservices.com/launcher/login", bytes.NewBuffer(mcAuthData))
 	httpReqMC.Header.Add("Content-Type", "application/json")
 	httpReqMC.Header.Add("Accept", "application/json")