fix(clientgen): fix setting user agent in ts client

encoredev · Feb 13, 2024 · 838e87b · 838e87b
1 parent 7588ddc
commit 838e87b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/internal/clientgen/testdata/expected_baseauth_typescript.ts b/internal/clientgen/testdata/expected_baseauth_typescript.ts
@@ -166,8 +166,14 @@ class BaseClient {
         this.baseURL = baseURL
         this.headers = {
             "Content-Type": "application/json",
-            "User-Agent":   "app-Generated-TS-Client (Encore/devel)",
         }
+
+        // Add User-Agent header if the script is running in the server
+        // because browsers do not allow setting User-Agent headers to requests
+        if (typeof window === "undefined") {
+            this.headers["User-Agent"] = "app-Generated-TS-Client (Encore/devel)";
+        }
+
         this.requestInit = options.requestInit ?? {};
 
         // Setup what fetch function we'll be using in the base client

diff --git a/internal/clientgen/testdata/expected_noauth_typescript.ts b/internal/clientgen/testdata/expected_noauth_typescript.ts
@@ -131,8 +131,14 @@ class BaseClient {
         this.baseURL = baseURL
         this.headers = {
             "Content-Type": "application/json",
-            "User-Agent":   "app-Generated-TS-Client (Encore/devel)",
         }
+
+        // Add User-Agent header if the script is running in the server
+        // because browsers do not allow setting User-Agent headers to requests
+        if (typeof window === "undefined") {
+            this.headers["User-Agent"] = "app-Generated-TS-Client (Encore/devel)";
+        }
+
         this.requestInit = options.requestInit ?? {};
 
         // Setup what fetch function we'll be using in the base client

diff --git a/internal/clientgen/testdata/expected_typescript.ts b/internal/clientgen/testdata/expected_typescript.ts
@@ -458,8 +458,14 @@ class BaseClient {
         this.baseURL = baseURL
         this.headers = {
             "Content-Type": "application/json",
-            "User-Agent":   "app-Generated-TS-Client (Encore/devel)",
         }
+
+        // Add User-Agent header if the script is running in the server
+        // because browsers do not allow setting User-Agent headers to requests
+        if (typeof window === "undefined") {
+            this.headers["User-Agent"] = "app-Generated-TS-Client (Encore/devel)";
+        }
+
         this.requestInit = options.requestInit ?? {};
 
         // Setup what fetch function we'll be using in the base client

diff --git a/internal/clientgen/typescript.go b/internal/clientgen/typescript.go
@@ -699,8 +699,14 @@ class BaseClient {
         this.baseURL = baseURL
         this.headers = {
             "Content-Type": "application/json",
-            "User-Agent":   "` + userAgent + `",
         }
+
+        // Add User-Agent header if the script is running in the server
+        // because browsers do not allow setting User-Agent headers to requests
+        if (typeof window === "undefined") {
+            this.headers["User-Agent"] = "` + userAgent + `";
+        }
+
         this.requestInit = options.requestInit ?? {};
 
         // Setup what fetch function we'll be using in the base client