Rebase fallout

Author: EhabY

src/login/loginCoordinator.ts

@@ -155,7 +155,9 @@ export class LoginCoordinator implements vscode.Disposable {
 		executeFn: () => Promise<LoginResult>,
 	): Promise<LoginResult> {
 		const result = this.loginQueue.then(executeFn);
-		this.loginQueue = result.catch(() => {}); // Keep chain going on error
+		this.loginQueue = result.catch(() => {
+			/* Keep chain going on error */
+		});
 		return result;
 	}
 
@@ -389,7 +391,7 @@ export class LoginCoordinator implements vscode.Disposable {
 			const title = "OAuth authentication failed";
 			this.logger.error(title, error);
 			if (error instanceof CertificateError) {
-				error.showNotification(title);
+				void error.showNotification(title);
 			} else {
 				vscode.window.showErrorMessage(
 					`${title}: ${getErrorMessage(error, "Unknown error")}`,

src/oauth/errors.ts

@@ -116,7 +116,7 @@ export function parseOAuthError(error: unknown): OAuthError | null {
 		return null;
 	}
 
-	const data = error.response?.data;
+	const data: unknown = error.response?.data;
 
 	if (!isOAuthErrorResponse(data)) {
 		return null;

test/mocks/testHelpers.ts

@@ -1,4 +1,10 @@
-import axios, { AxiosError, AxiosHeaders } from "axios";
+import axios, {
+	AxiosError,
+	AxiosHeaders,
+	type AxiosAdapter,
+	type AxiosResponse,
+	type InternalAxiosRequestConfig,
+} from "axios";
 import { vi } from "vitest";
 import * as vscode from "vscode";
 
@@ -559,7 +565,7 @@ export class MockOAuthSessionManager {
 		.mockResolvedValue({ access_token: "test-token" });
 	readonly refreshIfAlmostExpired = vi.fn().mockResolvedValue(undefined);
 	readonly revokeRefreshToken = vi.fn().mockResolvedValue(undefined);
-	readonly isLoggedInWithOAuth = vi.fn().mockReturnValue(false);
+	readonly isLoggedInWithOAuth = vi.fn().mockResolvedValue(false);
 	readonly clearOAuthState = vi.fn().mockResolvedValue(undefined);
 	readonly showReAuthenticationModal = vi.fn().mockResolvedValue(undefined);
 	readonly dispose = vi.fn();
@@ -618,7 +624,7 @@ export function createAxiosError(
 	return error;
 }
 
-type MockAdapterFn = ReturnType<typeof vi.fn>;
+type MockAdapterFn = ReturnType<typeof vi.fn<AxiosAdapter>>;
 
 const AXIOS_MOCK_SETUP_EXAMPLE = `
 vi.mock("axios", async () => {
@@ -680,40 +686,44 @@ export function setupAxiosMockRoutes(
 	mockAdapter: MockAdapterFn,
 	routes: Record<string, unknown>,
 ): void {
-	mockAdapter.mockImplementation(async (config: { url?: string }) => {
-		for (const [pattern, value] of Object.entries(routes)) {
-			if (config.url?.includes(pattern)) {
-				if (value instanceof Error) {
-					throw value;
+	mockAdapter.mockImplementation(
+		async (
+			config: InternalAxiosRequestConfig,
+		): Promise<AxiosResponse<unknown>> => {
+			for (const [pattern, value] of Object.entries(routes)) {
+				if (config.url?.includes(pattern)) {
+					if (value instanceof Error) {
+						throw value;
+					}
+					const data = typeof value === "function" ? await value() : value;
+					return {
+						data,
+						status: 200,
+						statusText: "OK",
+						headers: new AxiosHeaders(),
+						config,
+					};
 				}
-				const data = typeof value === "function" ? await value() : value;
-				return {
-					data,
-					status: 200,
-					statusText: "OK",
-					headers: {},
-					config,
-				};
 			}
-		}
-		const error = new AxiosError(
-			`Request failed with status code 404`,
-			"ERR_BAD_REQUEST",
-			undefined,
-			undefined,
-			{
-				status: 404,
-				statusText: "Not Found",
-				headers: {},
-				config: { headers: new AxiosHeaders() },
-				data: {
-					message: "Not found",
-					detail: `No route matched: ${config.url}`,
+			const error = new AxiosError(
+				`Request failed with status code 404`,
+				"ERR_BAD_REQUEST",
+				undefined,
+				undefined,
+				{
+					status: 404,
+					statusText: "Not Found",
+					headers: new AxiosHeaders(),
+					config,
+					data: {
+						message: "Not found",
+						detail: `No route matched: ${config.url}`,
+					},
 				},
-			},
-		);
-		throw error;
-	});
+			);
+			throw error;
+		},
+	);
 }
 
 /**

test/unit/oauth/authorizer.test.ts

@@ -20,14 +20,16 @@ import {
 	TEST_URL,
 } from "./testUtils";
 
+import type { CreateAxiosDefaults } from "axios";
+
 vi.mock("axios", async () => {
 	const actual = await vi.importActual<typeof import("axios")>("axios");
 	const mockAdapter = vi.fn();
 	return {
 		...actual,
 		default: {
 			...actual.default,
-			create: vi.fn((config) =>
+			create: vi.fn((config?: CreateAxiosDefaults) =>
 				actual.default.create({ ...config, adapter: mockAdapter }),
 			),
 			__mockAdapter: mockAdapter,

test/unit/oauth/axiosInterceptor.test.ts

@@ -32,7 +32,11 @@ function createMockAxiosInstance(): AxiosInstance & {
 	vi.spyOn(instance.interceptors.response, "use").mockImplementation(
 		(_onFulfilled, onRejected) => {
 			interceptorCount++;
-			lastRejectedHandler = onRejected ?? ((e) => Promise.reject(e));
+			lastRejectedHandler =
+				onRejected ??
+				((e): never => {
+					throw e;
+				});
 			return interceptorCount;
 		},
 	);
@@ -47,7 +51,7 @@ function createMockAxiosInstance(): AxiosInstance & {
 	return Object.assign(instance, {
 		triggerResponseError: (error: unknown): Promise<unknown> => {
 			if (!lastRejectedHandler) {
-				return Promise.reject(error);
+				return Promise.reject(new Error(String(error)));
 			}
 			return Promise.resolve(lastRejectedHandler(error));
 		},
@@ -81,12 +85,10 @@ function createTestContext() {
 	const mockOAuthManager = new MockOAuthSessionManager();
 
 	// Make isLoggedInWithOAuth check actual storage instead of returning a fixed value
-	vi.spyOn(mockOAuthManager, "isLoggedInWithOAuth").mockImplementation(
-		async () => {
-			const auth = await secretsManager.getSessionAuth(TEST_HOSTNAME);
-			return auth?.oauth !== undefined;
-		},
-	);
+	mockOAuthManager.isLoggedInWithOAuth.mockImplementation(async () => {
+		const auth = await secretsManager.getSessionAuth(TEST_HOSTNAME);
+		return auth?.oauth !== undefined;
+	});
 
 	/** Sets up OAuth tokens and creates interceptor */
 	const setupOAuthInterceptor = async () => {

test/unit/oauth/sessionManager.test.ts

@@ -19,6 +19,8 @@ import {
 	TEST_URL,
 } from "./testUtils";
 
+import type { AxiosRequestConfig } from "axios";
+
 import type { ServiceContainer } from "@/core/container";
 import type { Deployment } from "@/deployment/types";
 import type { LoginCoordinator } from "@/login/loginCoordinator";
@@ -30,7 +32,7 @@ vi.mock("axios", async () => {
 		...actual,
 		default: {
 			...actual.default,
-			create: vi.fn((config) =>
+			create: vi.fn((config?: AxiosRequestConfig) =>
 				actual.default.create({ ...config, adapter: mockAdapter }),
 			),
 			__mockAdapter: mockAdapter,

test/unit/uri/uriHandler.test.ts

@@ -323,11 +323,11 @@ describe("uriHandler", () => {
 	});
 
 	describe(CALLBACK_PATH, () => {
-		type CallbackData = {
+		interface CallbackData {
 			state: string;
 			code: string | null;
 			error: string | null;
-		};
+		}
 
 		it("stores OAuth callback with code and state", async () => {
 			const { handleUri, secretsManager } = createTestContext();