Skip to content

Commit 80dfe47

Browse files
MarcoDotIOclaudemaria-rcks
authored
fix(server): Authorized clients names Edge, Firefox and Opera on phones correctly (pingdotgg#23340)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent ebc34da commit 80dfe47

2 files changed

Lines changed: 32 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ function inferBrowser(userAgent: string | undefined): string | undefined {
128128
return undefined;
129129
}
130130
const normalized = userAgent.toLowerCase();
131-
if (/edg\//.test(normalized)) return "Edge";
132-
if (/opr\//.test(normalized)) return "Opera";
133-
if (/firefox\//.test(normalized)) return "Firefox";
131+
if (/edg(?:e|a|ios)?\//.test(normalized)) return "Edge";
132+
if (/opr\/|opios\//.test(normalized)) return "Opera";
133+
if (/firefox\/|fxios\//.test(normalized)) return "Firefox";
134134
if (/electron\//.test(normalized)) return "Electron";
135135
if (/chrome\//.test(normalized) || /crios\//.test(normalized)) return "Chrome";
136136
if (/safari\//.test(normalized) && !/chrome\//.test(normalized)) return "Safari";

0 commit comments

Comments
 (0)