Fix uriHandler for OAuth flow

Author: EhabY

src/oauth/authorizer.ts

@@ -155,7 +155,7 @@ export class OAuthAuthorizer implements vscode.Disposable {
 			application_type: "web",
 			grant_types: ["authorization_code"],
 			response_types: ["code"],
-			client_name: "VS Code Coder Extension",
+			client_name: `Coder for ${vscode.env.appName}`,
 			token_endpoint_auth_method: "client_secret_post",
 		};
 

src/uri/uriHandler.ts

@@ -4,6 +4,7 @@ import { errToStr } from "../api/api-helper";
 import { type Commands } from "../commands";
 import { type ServiceContainer } from "../core/container";
 import { type DeploymentManager } from "../deployment/deploymentManager";
+import { CALLBACK_PATH } from "../oauth/utils";
 import { maybeAskUrl } from "../promptUtils";
 import { toSafeHost } from "../util";
 
@@ -16,10 +17,10 @@ interface UriRouteContext {
 
 type UriRouteHandler = (ctx: UriRouteContext) => Promise<void>;
 
-const routes: Record<string, UriRouteHandler> = {
+const routes: Readonly<Record<string, UriRouteHandler>> = {
 	"/open": handleOpen,
 	"/openDevContainer": handleOpenDevContainer,
-	CALLBACK_PATH: handleOAuthCallback,
+	[CALLBACK_PATH]: handleOAuthCallback,
 };
 
 /**

test/unit/oauth/testUtils.ts

@@ -91,7 +91,7 @@ export function createBaseTestContext() {
 	vi.mocked(getHeaders).mockResolvedValue({});
 
 	// Constructor sets up vscode.workspace mock
-	new MockConfigurationProvider();
+	const _configurationProvider = new MockConfigurationProvider();
 
 	const secretStorage = new InMemorySecretStorage();
 	const memento = new InMemoryMemento();

test/unit/uri/uriHandler.test.ts

@@ -3,6 +3,7 @@ import * as vscode from "vscode";
 
 import { MementoManager } from "@/core/mementoManager";
 import { SecretsManager } from "@/core/secretsManager";
+import { CALLBACK_PATH } from "@/oauth/utils";
 import { maybeAskUrl } from "@/promptUtils";
 import { registerUriHandler } from "@/uri/uriHandler";
 
@@ -318,4 +319,66 @@ describe("uriHandler", () => {
 			);
 		});
 	});
+
+	describe(CALLBACK_PATH, () => {
+		type CallbackData = {
+			state: string;
+			code: string | null;
+			error: string | null;
+		};
+
+		it("stores OAuth callback with code and state", async () => {
+			const { handleUri, secretsManager } = createTestContext();
+
+			const callbackPromise = new Promise<CallbackData>((resolve) => {
+				secretsManager.onDidChangeOAuthCallback(resolve);
+			});
+
+			await handleUri(
+				createMockUri(CALLBACK_PATH, "code=auth-code&state=test-state"),
+			);
+
+			const callbackData = await callbackPromise;
+			expect(callbackData).toEqual({
+				state: "test-state",
+				code: "auth-code",
+				error: null,
+			});
+		});
+
+		it("stores OAuth callback with error", async () => {
+			const { handleUri, secretsManager } = createTestContext();
+
+			const callbackPromise = new Promise<CallbackData>((resolve) => {
+				secretsManager.onDidChangeOAuthCallback(resolve);
+			});
+
+			await handleUri(
+				createMockUri(CALLBACK_PATH, "state=test-state&error=access_denied"),
+			);
+
+			const callbackData = await callbackPromise;
+			expect(callbackData).toEqual({
+				state: "test-state",
+				code: null,
+				error: "access_denied",
+			});
+		});
+
+		it("does not store callback when state is missing", async () => {
+			const { handleUri, secretsManager } = createTestContext();
+
+			let callbackReceived = false;
+			secretsManager.onDidChangeOAuthCallback(() => {
+				callbackReceived = true;
+			});
+
+			await handleUri(createMockUri(CALLBACK_PATH, "code=auth-code"));
+
+			// Flush microtask queue to ensure any async callback would have fired
+			await Promise.resolve();
+
+			expect(callbackReceived).toBe(false);
+		});
+	});
 });