Skip to content

Commit 5521405

Browse files
MarcoDotIOclaude
andcommitted
fix(server): Authorized clients names Edge, Firefox and Opera on phones correctly
The server labels a session's browser from its User-Agent, but only knew the desktop tokens. Edge on Android (EdgA) showed as Chrome, and Edge, Firefox and Opera on iOS (EdgiOS, FxiOS, OPiOS) showed as Safari. Match the same tokens the web client already recognizes. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent defb7e6 commit 5521405

2 files changed

Lines changed: 34 additions & 3 deletions

File tree

‎apps/server/src/auth/utils.test.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,35 @@ describe("deriveAuthClientMetadata", () => {
2424
});
2525
});
2626

27+
it.each([
28+
[
29+
"Edge on Android",
30+
"Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Mobile Safari/537.36 EdgA/129.0.0.0",
31+
"Edge",
32+
],
33+
[
34+
"Edge on iOS",
35+
"Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 EdgiOS/129.0.2792.84 Mobile/15E148 Safari/605.1.15",
36+
"Edge",
37+
],
38+
[
39+
"Firefox on iOS",
40+
"Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/131.0 Mobile/15E148 Safari/605.1.15",
41+
"Firefox",
42+
],
43+
[
44+
"Opera on iOS",
45+
"Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 OPiOS/5.0.0 Mobile/15E148 Safari/605.1.15",
46+
"Opera",
47+
],
48+
])("labels %s by its own browser token", (_name, userAgent, browser) => {
49+
const metadata = deriveAuthClientMetadata({
50+
request: { headers: { "user-agent": userAgent }, source: {} } as never,
51+
});
52+
53+
expect(metadata.browser).toBe(browser);
54+
});
55+
2756
it("applies client-presented display identity without replacing transport metadata", () => {
2857
const metadata = deriveAuthClientMetadata({
2958
request: {

‎apps/server/src/auth/utils.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,11 @@ function inferBrowser(userAgent: string | undefined): string | undefined {
133133
return undefined;
134134
}
135135
const normalized = userAgent.toLowerCase();
136-
if (/edg\//.test(normalized)) return "Edge";
137-
if (/opr\//.test(normalized)) return "Opera";
138-
if (/firefox\//.test(normalized)) return "Firefox";
136+
// Mobile builds name themselves with their own tokens (EdgA, EdgiOS, OPiOS,
137+
// FxiOS) and still carry Chrome/ or Safari/, so check those first.
138+
if (/edg(?:e|a|ios)?\//.test(normalized)) return "Edge";
139+
if (/opr\/|opios\//.test(normalized)) return "Opera";
140+
if (/firefox\/|fxios\//.test(normalized)) return "Firefox";
139141
if (/electron\//.test(normalized)) return "Electron";
140142
if (/chrome\//.test(normalized) || /crios\//.test(normalized)) return "Chrome";
141143
if (/safari\//.test(normalized) && !/chrome\//.test(normalized)) return "Safari";

0 commit comments

Comments
 (0)