steam auth on playtest

Author: hry-gh

.github/workflows/steam.yml

@@ -16,8 +16,10 @@ jobs:
         include:
           - variant: production
             steam_app_id: "4313790"
+            steam_app_name: "production"
           - variant: playtest
             steam_app_id: "4313850"
+            steam_app_name: "playtest"
     steps:
       - uses: actions/checkout@v4
 
@@ -56,6 +58,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STEAM_APP_ID: ${{ matrix.steam_app_id }}
+          STEAM_APP_NAME: ${{ matrix.steam_app_name }}
         with:
           args: --features steam --config src-tauri/tauri.steam.conf.json
 
@@ -80,8 +83,11 @@ jobs:
         include:
           - variant: production
             steam_app_id: "4313790"
+            steam_app_name: "production"
+
           - variant: playtest
             steam_app_id: "4313850"
+            steam_app_name: "playtest"
     steps:
       - uses: actions/checkout@v4
 
@@ -126,6 +132,8 @@ jobs:
           APPIMAGE_EXTRACT_AND_RUN: 1
           LD_LIBRARY_PATH: /usr/lib
           STEAM_APP_ID: ${{ matrix.steam_app_id }}
+          STEAM_APP_NAME: ${{ matrix.steam_app_name }}
+
         with:
           args: --features steam --config src-tauri/tauri.steam.conf.json
 
@@ -149,8 +157,11 @@ jobs:
         include:
           - variant: production
             steam_app_id: "4313790"
+            steam_app_name: "production"
+
           - variant: playtest
             steam_app_id: "4313850"
+            steam_app_name: "playtest"
     steps:
       - uses: actions/checkout@v4
 
@@ -188,6 +199,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STEAM_APP_ID: ${{ matrix.steam_app_id }}
+          STEAM_APP_NAME: ${{ matrix.steam_app_name }}
+
         with:
           args: --features steam --target universal-apple-darwin --config src-tauri/tauri.steam.conf.json
 
@@ -219,6 +232,7 @@ jobs:
         with:
           variant: production
           steam_app_id: "4313790"
+          steam_app_name: "production"
           steam_username: ${{ secrets.STEAM_USERNAME }}
           steam_password: ${{ secrets.STEAM_PASSWORD }}
           steam_shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
@@ -234,6 +248,7 @@ jobs:
         with:
           variant: playtest
           steam_app_id: "4313850"
+          steam_app_name: "playtest"
           steam_username: ${{ secrets.STEAM_USERNAME }}
           steam_password: ${{ secrets.STEAM_PASSWORD }}
           steam_shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}

src-tauri/src/lib.rs

@@ -8,6 +8,7 @@ mod settings;
 mod steam;
 
 pub const DEFAULT_STEAM_ID: u32 = 4313790;
+pub const DEFAULT_STEAM_NAME: &str = "production";
 
 mod webview2;
 

src-tauri/src/steam/commands.rs

@@ -3,6 +3,8 @@ use std::sync::Arc;
 use serde::{Deserialize, Serialize};
 use tauri::State;
 
+use crate::steam::get_steam_app_name;
+
 use super::SteamState;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -31,6 +33,7 @@ pub struct SteamAuthResult {
 struct SteamAuthRequest {
     ticket: String,
     steam_id: String,
+    instance: String,
     display_name: String,
     create_account_if_missing: bool,
 }
@@ -92,6 +95,7 @@ pub async fn authenticate_with_steam(
     let request = SteamAuthRequest {
         ticket,
         steam_id,
+        instance: get_steam_app_name(),
         display_name,
         create_account_if_missing,
     };

src-tauri/src/steam/mod.rs

@@ -10,7 +10,7 @@ pub use commands::{
 pub use presence::SteamPresence;
 pub use state::SteamState;
 
-use crate::DEFAULT_STEAM_ID;
+use crate::{DEFAULT_STEAM_ID, DEFAULT_STEAM_NAME};
 
 pub fn get_steam_app_id() -> u32 {
     if let Some(env) = option_env!("STEAM_APP_ID") {
@@ -19,3 +19,11 @@ pub fn get_steam_app_id() -> u32 {
         DEFAULT_STEAM_ID
     }
 }
+
+pub fn get_steam_app_name() -> String {
+    if let Some(env) = option_env!("STEAM_APP_NAME") {
+        env.to_string()
+    } else {
+        DEFAULT_STEAM_NAME.to_string()
+    }
+}