Expose dev subscription headers without HWID

src-tauri/src/subscription.rs

@@ -54,6 +54,30 @@ impl SubscriptionFetchIdentity {
             ..Self::default()
         }
     }
+
+    pub fn request_headers_without_device_hwid(&self) -> Vec<(&'static str, String)> {
+        let mut headers = vec![
+            ("User-Agent", self.user_agent.clone()),
+            ("X-App-Name", self.app_name.clone()),
+            ("X-Device-OS", self.device_os.clone()),
+            ("X-Device-Model", self.device_model.clone()),
+        ];
+
+        if let Some(device_os_version) = self
+            .device_os_version
+            .as_deref()
+            .map(str::trim)
+            .filter(|value| !value.is_empty())
+        {
+            let header_value = sanitize_header_value(device_os_version);
+            if !header_value.is_empty() {
+                headers.push(("X-Device-OS-Version", header_value.clone()));
+                headers.push(("X-Ver-OS", header_value));
+            }
+        }
+
+        headers
+    }
 }
 
 impl Default for SubscriptionFetchIdentity {
@@ -119,23 +143,10 @@ pub fn fetch_subscription_with_identity(
         ));
     }
 
-    let mut request = reqwest::blocking::Client::new()
-        .get(parsed_url)
-        .header("user-agent", identity.user_agent.as_str())
-        .header("x-app-name", identity.app_name.as_str())
-        .header("x-device-os", identity.device_os.as_str())
-        .header("x-device-model", identity.device_model.as_str());
+    let mut request = reqwest::blocking::Client::new().get(parsed_url);
 
-    if let Some(device_os_version) = identity
-        .device_os_version
-        .as_deref()
-        .map(str::trim)
-        .filter(|value| !value.is_empty())
-    {
-        let header_value = sanitize_header_value(device_os_version);
-        if !header_value.is_empty() {
-            request = request.header("x-device-os-version", header_value);
-        }
+    for (name, value) in identity.request_headers_without_device_hwid() {
+        request = request.header(name, value);
     }
 
     if let Some(device_hwid) = identity