Skip to content
TypeScript

fix(desktop): open Teams web in the preview browser (#31489)

shivamd944e2a396ba
diff --git a/apps/desktop/src/preview/BrowserSession.test.ts b/apps/desktop/src/preview/BrowserSession.test.ts
index 7a339102f19..e68e52961fa 100644
--- a/apps/desktop/src/preview/BrowserSession.test.ts
+++ b/apps/desktop/src/preview/BrowserSession.test.ts
@@ -16,6 +16,7 @@ const { fromPartition, sessions } = vi.hoisted(() => ({
readonly setPermissionRequestHandler: ReturnType<typeof vi.fn>;
readonly setPermissionCheckHandler: ReturnType<typeof vi.fn>;
readonly setUserAgent: ReturnType<typeof vi.fn>;
+ readonly webRequest: { readonly onBeforeSendHeaders: ReturnType<typeof vi.fn> };
}
>(),
}));
@@ -62,6 +63,7 @@ describe("BrowserSession", () => {
setPermissionRequestHandler: vi.fn(),
setPermissionCheckHandler: vi.fn(),
setUserAgent: vi.fn(),
+ webRequest: { onBeforeSendHeaders: vi.fn() },
};
sessions.set(partition, browserSession);
return browserSession;
@@ -115,10 +117,12 @@ describe("BrowserSession", () => {
}).pipe(Effect.provide(layer)),
);
- it.effect("keeps the guest's effective User-Agent equal to Electron's native one", () =>
+ it.effect("keeps the native User-Agent except for the Electron token sent to Teams", () =>
Effect.gen(function* () {
const nativeUserAgent =
"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";
+ const teamsUserAgent =
+ "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";
fromPartition.mockReset();
fromPartition.mockImplementation((partition: string) => {
let userAgent = nativeUserAgent;
@@ -131,6 +135,7 @@ describe("BrowserSession", () => {
setUserAgent: vi.fn((next: string) => {
userAgent = next;
}),
+ webRequest: { onBeforeSendHeaders: vi.fn() },
};
sessions.set(partition, browserSession);
return browserSession;
@@ -143,6 +148,29 @@ describe("BrowserSession", () => {
const browserSession = sessions.get(partition);
assert.isDefined(browserSession);
assert.strictEqual(browserSession.getUserAgent(), nativeUserAgent);
+
+ // Teams redirects Electron to an error page before sign-in; every other host sees the native one.
+ const calls = browserSession.webRequest.onBeforeSendHeaders.mock.calls;
+ assert.strictEqual(calls.length, 1);
+ const [filter, listener] = calls[0] ?? [];
+ assert.deepStrictEqual(filter, {
+ urls: ["https://teams.cloud.microsoft/*", "https://teams.microsoft.com/*"],
+ });
+ const send = (requestHeaders: Record<string, string>) => {
+ let response: { requestHeaders?: Record<string, string> } | undefined;
+ listener({ requestHeaders }, (next: typeof response) => {
+ response = next;
+ });
+ return response;
+ };
+ for (const key of ["User-Agent", "user-agent"]) {
+ const requestHeaders = { [key]: nativeUserAgent, Accept: "*/*" };
+ assert.deepStrictEqual(send(requestHeaders), {
+ requestHeaders: { [key]: teamsUserAgent, Accept: "*/*" },
+ });
+ assert.strictEqual(requestHeaders[key], nativeUserAgent);
+ }
+ assert.deepStrictEqual(send({ Accept: "*/*" }), {});
}).pipe(Effect.provide(layer)),
);
diff --git a/apps/desktop/src/preview/BrowserSession.ts b/apps/desktop/src/preview/BrowserSession.ts
index a780cacf11e..b2523ba62b9 100644
--- a/apps/desktop/src/preview/BrowserSession.ts
+++ b/apps/desktop/src/preview/BrowserSession.ts
@@ -55,6 +55,9 @@ const externalProtocolPromptUrl = (rawUrl: string | undefined): string | null =>
}
};
+// Teams sends Electron User-Agents to an error page before sign-in. Electron allows one listener per session.
+const TEAMS_URL_PATTERNS = ["https://teams.cloud.microsoft/*", "https://teams.microsoft.com/*"];
+
const MAX_PROMPT_URL_LENGTH = 300;
const truncateForPrompt = (text: string): string =>
@@ -342,6 +345,22 @@ export const make = Effect.gen(function* BrowserSessionMake() {
? clipboardReadDecisions.get(permissionOrigin(requestingOrigin) ?? "") === true
: ALLOWED_PREVIEW_PERMISSIONS.has(permission),
);
+ browserSession.webRequest.onBeforeSendHeaders(
+ { urls: TEAMS_URL_PATTERNS },
+ ({ requestHeaders }, callback) => {
+ const userAgent = Object.entries(requestHeaders).find(
+ ([name]) => name.toLowerCase() === "user-agent",
+ );
+ if (userAgent === undefined) {
+ callback({});
+ return;
+ }
+ const [name, value] = userAgent;
+ callback({
+ requestHeaders: { ...requestHeaders, [name]: value.replace(/ Electron\/\S+/, "") },
+ });
+ },
+ );
const next = new Map(sessions);
next.set(partition, browserSession);
return [browserSession, next] as const;