Trim headerCommand and defaultUrl settings and their env variables

Author: EhabY

src/commands.ts

@@ -102,10 +102,13 @@ export class Commands {
 	 * CODER_URL or enter a new one.  Undefined means the user aborted.
 	 */
 	private async askURL(selection?: string): Promise<string | undefined> {
-		const defaultURL =
-			vscode.workspace.getConfiguration().get<string>("coder.defaultUrl") ?? "";
+		const defaultURL = vscode.workspace
+			.getConfiguration()
+			.get<string>("coder.defaultUrl")
+			?.trim();
 		const quickPick = vscode.window.createQuickPick();
-		quickPick.value = selection || defaultURL || process.env.CODER_URL || "";
+		quickPick.value =
+			selection || defaultURL || process.env.CODER_URL?.trim() || "";
 		quickPick.placeholder = "https://example.coder.com";
 		quickPick.title = "Enter the URL of your Coder deployment.";
 

src/extension.ts

@@ -423,7 +423,9 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 		// Handle autologin, if not already logged in.
 		const cfg = vscode.workspace.getConfiguration();
 		if (cfg.get("coder.autologin") === true) {
-			const defaultUrl = cfg.get("coder.defaultUrl") || process.env.CODER_URL;
+			const defaultUrl =
+				cfg.get<string>("coder.defaultUrl")?.trim() ||
+				process.env.CODER_URL?.trim();
 			if (defaultUrl) {
 				vscode.commands.executeCommand(
 					"coder.login",

src/headers.test.ts

@@ -123,9 +123,9 @@ describe("getHeaderCommand", () => {
 		expect(getHeaderCommand(config)).toBeUndefined();
 	});
 
-	it("should return undefined if coder.headerCommand is not a string", () => {
+	it("should return undefined if coder.headerCommand is a blank string", () => {
 		const config = {
-			get: () => 1234,
+			get: () => "   ",
 		} as unknown as WorkspaceConfiguration;
 
 		expect(getHeaderCommand(config)).toBeUndefined();

src/headers.ts

@@ -19,11 +19,10 @@ export function getHeaderCommand(
 	config: WorkspaceConfiguration,
 ): string | undefined {
 	const cmd =
-		config.get("coder.headerCommand") || process.env.CODER_HEADER_COMMAND;
-	if (!cmd || typeof cmd !== "string") {
-		return undefined;
-	}
-	return cmd;
+		config.get<string>("coder.headerCommand")?.trim() ||
+		process.env.CODER_HEADER_COMMAND?.trim();
+
+	return cmd ? cmd : undefined;
 }
 
 export function getHeaderArgs(config: WorkspaceConfiguration): string[] {