Skip to content

Commit d944e2a

Browse files
authored
fix(desktop): open Teams web in the preview browser (pingdotgg#31489)
1 parent 23bdb9e commit d944e2a

2 files changed

Lines changed: 48 additions & 1 deletion

File tree

‎apps/desktop/src/preview/BrowserSession.test.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const { fromPartition, sessions } = vi.hoisted(() => ({
1616
readonly setPermissionRequestHandler: ReturnType<typeof vi.fn>;
1717
readonly setPermissionCheckHandler: ReturnType<typeof vi.fn>;
1818
readonly setUserAgent: ReturnType<typeof vi.fn>;
19+
readonly webRequest: { readonly onBeforeSendHeaders: ReturnType<typeof vi.fn> };
1920
}
2021
>(),
2122
}));
@@ -62,6 +63,7 @@ describe("BrowserSession", () => {
6263
setPermissionRequestHandler: vi.fn(),
6364
setPermissionCheckHandler: vi.fn(),
6465
setUserAgent: vi.fn(),
66+
webRequest: { onBeforeSendHeaders: vi.fn() },
6567
};
6668
sessions.set(partition, browserSession);
6769
return browserSession;
@@ -115,10 +117,12 @@ describe("BrowserSession", () => {
115117
}).pipe(Effect.provide(layer)),
116118
);
117119

118-
it.effect("keeps the guest's effective User-Agent equal to Electron's native one", () =>
120+
it.effect("keeps the native User-Agent except for the Electron token sent to Teams", () =>
119121
Effect.gen(function* () {
120122
const nativeUserAgent =
121123
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) T3Code(Alpha)/0.0.33 Chrome/146.0.7680.216 Electron/41.5.0 Safari/537.36";
124+
const teamsUserAgent =
125+
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) T3Code(Alpha)/0.0.33 Chrome/146.0.7680.216 Safari/537.36";
122126
fromPartition.mockReset();
123127
fromPartition.mockImplementation((partition: string) => {
124128
let userAgent = nativeUserAgent;
@@ -131,6 +135,7 @@ describe("BrowserSession", () => {
131135
setUserAgent: vi.fn((next: string) => {
132136
userAgent = next;
133137
}),
138+
webRequest: { onBeforeSendHeaders: vi.fn() },
134139
};
135140
sessions.set(partition, browserSession);
136141
return browserSession;
@@ -143,6 +148,29 @@ describe("BrowserSession", () => {
143148
const browserSession = sessions.get(partition);
144149
assert.isDefined(browserSession);
145150
assert.strictEqual(browserSession.getUserAgent(), nativeUserAgent);
151+
152+
// Teams redirects Electron to an error page before sign-in; every other host sees the native one.
153+
const calls = browserSession.webRequest.onBeforeSendHeaders.mock.calls;
154+
assert.strictEqual(calls.length, 1);
155+
const [filter, listener] = calls[0] ?? [];
156+
assert.deepStrictEqual(filter, {
157+
urls: ["https://teams.cloud.microsoft/*", "https://teams.microsoft.com/*"],
158+
});
159+
const send = (requestHeaders: Record<string, string>) => {
160+
let response: { requestHeaders?: Record<string, string> } | undefined;
161+
listener({ requestHeaders }, (next: typeof response) => {
162+
response = next;
163+
});
164+
return response;
165+
};
166+
for (const key of ["User-Agent", "user-agent"]) {
167+
const requestHeaders = { [key]: nativeUserAgent, Accept: "*/*" };
168+
assert.deepStrictEqual(send(requestHeaders), {
169+
requestHeaders: { [key]: teamsUserAgent, Accept: "*/*" },
170+
});
171+
assert.strictEqual(requestHeaders[key], nativeUserAgent);
172+
}
173+
assert.deepStrictEqual(send({ Accept: "*/*" }), {});
146174
}).pipe(Effect.provide(layer)),
147175
);
148176

‎apps/desktop/src/preview/BrowserSession.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ const externalProtocolPromptUrl = (rawUrl: string | undefined): string | null =>
5555
}
5656
};
5757

58+
// Teams sends Electron User-Agents to an error page before sign-in. Electron allows one listener per session.
59+
const TEAMS_URL_PATTERNS = ["https://teams.cloud.microsoft/*", "https://teams.microsoft.com/*"];
60+
5861
const MAX_PROMPT_URL_LENGTH = 300;
5962

6063
const truncateForPrompt = (text: string): string =>
@@ -342,6 +345,22 @@ export const make = Effect.gen(function* BrowserSessionMake() {
342345
? clipboardReadDecisions.get(permissionOrigin(requestingOrigin) ?? "") === true
343346
: ALLOWED_PREVIEW_PERMISSIONS.has(permission),
344347
);
348+
browserSession.webRequest.onBeforeSendHeaders(
349+
{ urls: TEAMS_URL_PATTERNS },
350+
({ requestHeaders }, callback) => {
351+
const userAgent = Object.entries(requestHeaders).find(
352+
([name]) => name.toLowerCase() === "user-agent",
353+
);
354+
if (userAgent === undefined) {
355+
callback({});
356+
return;
357+
}
358+
const [name, value] = userAgent;
359+
callback({
360+
requestHeaders: { ...requestHeaders, [name]: value.replace(/ Electron\/\S+/, "") },
361+
});
362+
},
363+
);
345364
const next = new Map(sessions);
346365
next.set(partition, browserSession);
347366
return [browserSession, next] as const;

0 commit comments

Comments
 (0)