[MCP] [Cleanup] Declare project ID a required string with default if missing (#8646)

Author: fredzqm

src/mcp/index.ts

@@ -184,17 +184,24 @@ export class FirebaseMcpServer {
     const tool = this.getTool(toolName);
     if (!tool) throw new Error(`Tool '${toolName}' could not be found.`);
 
-    const projectId = await this.getProjectId();
-    const accountEmail = await this.getAuthenticatedUser();
     if (
       tool.mcp.name !== "firebase_update_environment" && // allow this tool only, to fix the issue
       (!this.cachedProjectRoot || !existsSync(this.cachedProjectRoot))
-    )
+    ) {
       return mcpError(
         `The current project directory '${this.cachedProjectRoot || "<NO PROJECT DIRECTORY FOUND>"}' does not exist. Please use the 'update_firebase_environment' tool to target a different project directory.`,
       );
-    if (tool.mcp._meta?.requiresAuth && !accountEmail) return mcpAuthError();
-    if (tool.mcp._meta?.requiresProject && !projectId) return NO_PROJECT_ERROR;
+    }
+    let projectId = await this.getProjectId();
+    if (tool.mcp._meta?.requiresProject && !projectId) {
+      return NO_PROJECT_ERROR;
+    }
+    projectId = projectId || "";
+
+    const accountEmail = await this.getAuthenticatedUser();
+    if (tool.mcp._meta?.requiresAuth && !accountEmail) {
+      return mcpAuthError();
+    }
 
     const options = { projectDir: this.cachedProjectRoot, cwd: this.cachedProjectRoot };
     const toolsCtx: ServerToolContext = {

src/mcp/tool.ts

@@ -7,8 +7,8 @@ import { RC } from "../rc";
 import { cleanSchema } from "./util";
 
 export interface ServerToolContext {
-  projectId?: string;
-  accountEmail?: string | null;
+  projectId: string;
+  accountEmail: string | null;
   config: Config;
   host: FirebaseMcpServer;
   rc: RC;

src/mcp/tools/apphosting/fetch_logs.ts

@@ -36,7 +36,6 @@ export const fetch_logs = tool(
     },
   },
   async ({ buildLogs, backendId, location } = {}, { projectId }) => {
-    projectId ||= "";
     location ||= "";
     if (!backendId) {
       return toContent(`backendId must be specified.`);

src/mcp/tools/auth/disable_user.ts

@@ -22,7 +22,7 @@ export const disable_user = tool(
     },
   },
   async ({ uid, disabled }, { projectId }) => {
-    const res = await disableUser(projectId!, uid, disabled);
+    const res = await disableUser(projectId, uid, disabled);
     if (res) {
       return toContent(`User ${uid} as been ${disabled ? "disabled" : "enabled"}`);
     }

src/mcp/tools/auth/get_user.ts

@@ -38,6 +38,6 @@ export const get_user = tool(
     if (email === undefined && phone_number === undefined && uid === undefined) {
       return mcpError(`No user identifier supplied in auth_get_user tool`);
     }
-    return toContent(await findUser(projectId!, email, phone_number, uid));
+    return toContent(await findUser(projectId, email, phone_number, uid));
   },
 );

src/mcp/tools/auth/list_users.ts

@@ -28,7 +28,7 @@ export const list_users = tool(
       limit = 100;
     }
 
-    const users = await listUsers(projectId!, limit);
+    const users = await listUsers(projectId, limit);
     const usersPruned = users.map((user) => {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const { passwordHash, salt, ...prunedUser } = user;

src/mcp/tools/auth/set_claims.ts

@@ -42,6 +42,6 @@ export const set_claim = tool(
         return mcpError(`Provided \`json_value\` was not valid JSON: ${json_value}`);
       }
     }
-    return toContent(await setCustomClaim(projectId!, uid, { [claim]: value }, { merge: true }));
+    return toContent(await setCustomClaim(projectId, uid, { [claim]: value }, { merge: true }));
   },
 );

src/mcp/tools/auth/set_sms_region_policy.ts

@@ -33,8 +33,8 @@ export const set_sms_region_policy = tool(
       return code.toUpperCase();
     });
     if (policy_type === "ALLOW") {
-      return toContent(await setAllowSmsRegionPolicy(projectId!, country_codes));
+      return toContent(await setAllowSmsRegionPolicy(projectId, country_codes));
     }
-    return toContent(await setDenySmsRegionPolicy(projectId!, country_codes));
+    return toContent(await setDenySmsRegionPolicy(projectId, country_codes));
   },
 );

src/mcp/tools/core/consult_assistant.ts

@@ -24,7 +24,7 @@ export const consult_assistant = tool(
     },
   },
   async ({ prompt }, { projectId }) => {
-    const schema = await chatWithFirebase(prompt, projectId!);
+    const schema = await chatWithFirebase(prompt, projectId);
     return toContent(schema);
   },
 );

src/mcp/tools/core/create_android_sha.ts

@@ -35,7 +35,7 @@ export const create_android_sha = tool(
   async ({ app_id, sha_hash }, { projectId }) => {
     // Add the SHA certificate
     const certType = getCertHashType(sha_hash);
-    const shaCertificate = await createAppAndroidSha(projectId!, app_id, {
+    const shaCertificate = await createAppAndroidSha(projectId, app_id, {
       shaHash: sha_hash,
       certType,
     });