Address comments and make ProjectId reference optional.

Author: visumickey

src/crashlytics/getIssueDetails.spec.ts

@@ -10,9 +10,8 @@ chai.use(chaiAsPromised);
 const expect = chai.expect;
 
 describe("getIssueDetails", () => {
-  const projectId = "my-project";
   const appId = "1:1234567890:android:abcdef1234567890";
-  const requestProjectId = "1234567890";
+  const requestProjectNumber = "1234567890";
   const issueId = "test_issue_id";
 
   afterEach(() => {
@@ -23,21 +22,21 @@ describe("getIssueDetails", () => {
     const mockResponse = { id: issueId, title: "Crash" };
 
     nock(crashlyticsApiOrigin())
-      .get(`/v1alpha/projects/${requestProjectId}/apps/${appId}/issues/${issueId}`)
+      .get(`/v1alpha/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}`)
       .reply(200, mockResponse);
 
-    const result = await getIssueDetails(projectId, appId, issueId);
+    const result = await getIssueDetails(appId, issueId);
 
     expect(result).to.deep.equal(mockResponse);
     expect(nock.isDone()).to.be.true;
   });
 
   it("should throw a FirebaseError if the API call fails", async () => {
     nock(crashlyticsApiOrigin())
-      .get(`/v1alpha/projects/${requestProjectId}/apps/${appId}/issues/${issueId}`)
+      .get(`/v1alpha/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}`)
       .reply(500, { error: "Internal Server Error" });
 
-    await expect(getIssueDetails(projectId, appId, issueId)).to.be.rejectedWith(
+    await expect(getIssueDetails(appId, issueId)).to.be.rejectedWith(
       FirebaseError,
       /Failed to fetch the issue details/,
     );
@@ -46,7 +45,7 @@ describe("getIssueDetails", () => {
   it("should throw a FirebaseError if the appId is invalid", async () => {
     const invalidAppId = "invalid-app-id";
 
-    await expect(getIssueDetails(projectId, invalidAppId, issueId)).to.be.rejectedWith(
+    await expect(getIssueDetails(invalidAppId, issueId)).to.be.rejectedWith(
       FirebaseError,
       "Unable to get the projectId from the AppId.",
     );

src/crashlytics/getIssueDetails.ts

@@ -10,14 +10,10 @@ const apiClient = new Client({
   apiVersion: "v1alpha",
 });
 
-export async function getIssueDetails(
-  projectId: string,
-  appId: string,
-  issueId: string,
-): Promise<string> {
+export async function getIssueDetails(appId: string, issueId: string): Promise<string> {
   try {
-    const requestProjectId = parseProjectId(appId);
-    if (requestProjectId === undefined) {
+    const requestProjectNumber = parseProjectNumber(appId);
+    if (requestProjectNumber === undefined) {
       throw new FirebaseError("Unable to get the projectId from the AppId.");
     }
 
@@ -26,21 +22,21 @@ export async function getIssueDetails(
       headers: {
         "Content-Type": "application/json",
       },
-      path: `/projects/${requestProjectId}/apps/${appId}/issues/${issueId}`,
+      path: `/projects/${requestProjectNumber}/apps/${appId}/issues/${issueId}`,
       timeout: TIMEOUT,
     });
 
     return response.body;
   } catch (err: any) {
     logger.debug(err.message);
     throw new FirebaseError(
-      `Failed to fetch the issue details for the Firebase Project ${projectId}, AppId ${appId}, IssueId ${issueId}. Error: ${err}.`,
+      `Failed to fetch the issue details for the Firebase AppId ${appId}, IssueId ${issueId}. Error: ${err}.`,
       { original: err },
     );
   }
 }
 
-function parseProjectId(appId: string): string | undefined {
+function parseProjectNumber(appId: string): string | undefined {
   const appIdParts = appId.split(":");
   if (appIdParts.length > 1) {
     return appIdParts[1];

src/crashlytics/getSampleCrash.spec.ts

@@ -10,9 +10,8 @@ chai.use(chaiAsPromised);
 const expect = chai.expect;
 
 describe("getSampleCrash", () => {
-  const projectId = "my-project";
   const appId = "1:1234567890:android:abcdef1234567890";
-  const requestProjectId = "1234567890";
+  const requestProjectNumber = "1234567890";
   const issueId = "test_issue_id";
   const variantId = "test_variant_id";
   const sampleCount = 10;
@@ -25,14 +24,14 @@ describe("getSampleCrash", () => {
     const mockResponse = { events: [{ event_id: "1" }] };
 
     nock(crashlyticsApiOrigin())
-      .get(`/v1alpha/projects/${requestProjectId}/apps/${appId}/events`)
+      .get(`/v1alpha/projects/${requestProjectNumber}/apps/${appId}/events`)
       .query({
         "filter.issue.id": issueId,
         page_size: String(sampleCount),
       })
       .reply(200, mockResponse);
 
-    const result = await getSampleCrash(projectId, appId, issueId, undefined, sampleCount);
+    const result = await getSampleCrash(appId, issueId, sampleCount, undefined);
 
     expect(result).to.deep.equal(mockResponse);
     expect(nock.isDone()).to.be.true;
@@ -42,39 +41,41 @@ describe("getSampleCrash", () => {
     const mockResponse = { events: [{ event_id: "1" }] };
 
     nock(crashlyticsApiOrigin())
-      .get(`/v1alpha/projects/${requestProjectId}/apps/${appId}/events`)
+      .get(`/v1alpha/projects/${requestProjectNumber}/apps/${appId}/events`)
       .query({
         "filter.issue.id": issueId,
         "filter.issue.variant_id": variantId,
         page_size: String(sampleCount),
       })
       .reply(200, mockResponse);
 
-    const result = await getSampleCrash(projectId, appId, issueId, variantId, sampleCount);
+    const result = await getSampleCrash(appId, issueId, sampleCount, variantId);
 
     expect(result).to.deep.equal(mockResponse);
     expect(nock.isDone()).to.be.true;
   });
 
   it("should throw a FirebaseError if the API call fails", async () => {
     nock(crashlyticsApiOrigin())
-      .get(`/v1alpha/projects/${requestProjectId}/apps/${appId}/events`)
+      .get(`/v1alpha/projects/${requestProjectNumber}/apps/${appId}/events`)
       .query({
         "filter.issue.id": issueId,
         page_size: String(sampleCount),
       })
       .reply(500, { error: "Internal Server Error" });
 
-    await expect(
-      getSampleCrash(projectId, appId, issueId, undefined, sampleCount),
-    ).to.be.rejectedWith(FirebaseError, /Failed to fetch the same crash/);
+    await expect(getSampleCrash(appId, issueId, sampleCount, undefined)).to.be.rejectedWith(
+      FirebaseError,
+      /Failed to fetch the same crash/,
+    );
   });
 
   it("should throw a FirebaseError if the appId is invalid", async () => {
     const invalidAppId = "invalid-app-id";
 
-    await expect(
-      getSampleCrash(projectId, invalidAppId, issueId, undefined, sampleCount),
-    ).to.be.rejectedWith(FirebaseError, "Unable to get the projectId from the AppId.");
+    await expect(getSampleCrash(invalidAppId, issueId, sampleCount, undefined)).to.be.rejectedWith(
+      FirebaseError,
+      "Unable to get the projectId from the AppId.",
+    );
   });
 });

src/crashlytics/getSampleCrash.ts

@@ -11,22 +11,21 @@ const apiClient = new Client({
 });
 
 export async function getSampleCrash(
-  projectId: string,
   appId: string,
   issueId: string,
+  sampleCount: number,
   variantId?: string,
-  sampleCount?: number,
 ): Promise<string> {
   try {
     const queryParams = new URLSearchParams();
-    queryParams.set("filter.issue.id", `${issueId}`);
-    queryParams.set("page_size", String(sampleCount!));
+    queryParams.set("filter.issue.id", issueId);
+    queryParams.set("page_size", String(sampleCount));
     if (variantId) {
-      queryParams.set("filter.issue.variant_id", `${variantId!}`);
+      queryParams.set("filter.issue.variant_id", variantId);
     }
 
-    const requestProjectId = parseProjectId(appId);
-    if (requestProjectId === undefined) {
+    const requestProjectNumber = parseProjectNumber(appId);
+    if (requestProjectNumber === undefined) {
       throw new FirebaseError("Unable to get the projectId from the AppId.");
     }
 
@@ -35,7 +34,7 @@ export async function getSampleCrash(
       headers: {
         "Content-Type": "application/json",
       },
-      path: `/projects/${requestProjectId}/apps/${appId}/events`,
+      path: `/projects/${requestProjectNumber}/apps/${appId}/events`,
       queryParams: queryParams,
       timeout: TIMEOUT,
     });
@@ -44,13 +43,13 @@ export async function getSampleCrash(
   } catch (err: any) {
     logger.debug(err.message);
     throw new FirebaseError(
-      `Failed to fetch the same crash for the Firebase Project ${projectId}, AppId ${appId}, IssueId ${issueId}. Error: ${err}.`,
+      `Failed to fetch the same crash for the Firebase AppId ${appId}, IssueId ${issueId}. Error: ${err}.`,
       { original: err },
     );
   }
 }
 
-function parseProjectId(appId: string): string | undefined {
+function parseProjectNumber(appId: string): string | undefined {
   const appIdParts = appId.split(":");
   if (appIdParts.length > 1) {
     return appIdParts[1];

src/mcp/tools/crashlytics/get_issue_details.ts

@@ -11,7 +11,7 @@ export const get_issue_details = tool(
       app_id: z
         .string()
         .describe(
-          "AppId for which the issues list should be fetched. For an Android application, read the mobilesdk_app_id value specified in the google-services.json file for the current package name. For an iOS Application, read the GOOGLE_APP_ID from GoogleService-Info.plist. If neither is available, use the `firebase_list_apps` tool to find an app_id to pass to this tool.",
+          "The AppID for which the issues list should be fetched. For an Android application, read the mobilesdk_app_id value specified in the google-services.json file for the current package name. For an iOS Application, read the GOOGLE_APP_ID from GoogleService-Info.plist. If neither is available, use the `firebase_list_apps` tool to find an app_id to pass to this tool.",
         ),
       issue_id: z
         .string()
@@ -25,13 +25,13 @@ export const get_issue_details = tool(
     },
     _meta: {
       requiresAuth: true,
-      requiresProject: true,
+      requiresProject: false,
     },
   },
-  async ({ app_id, issue_id }, { projectId }) => {
+  async ({ app_id, issue_id }) => {
     if (!app_id) return mcpError(`Must specify 'app_id' parameter.`);
     if (!issue_id) return mcpError(`Must specify 'issue_id' parameter.`);
 
-    return toContent(await getIssueDetails(projectId, app_id, issue_id));
+    return toContent(await getIssueDetails(app_id, issue_id));
   },
 );

src/mcp/tools/crashlytics/get_sample_crash.ts

@@ -24,7 +24,6 @@ export const get_sample_crash = tool(
         .describe("The issue variant Id used as a filter to get sample issues."),
       sample_count: z
         .number()
-        .optional()
         .describe("Number of samples that needs to be fetched. Maximum value is 3. Defaults to 1.")
         .default(1),
     }),
@@ -34,15 +33,15 @@ export const get_sample_crash = tool(
     },
     _meta: {
       requiresAuth: true,
-      requiresProject: true,
+      requiresProject: false,
     },
   },
-  async ({ app_id, issue_id, variant_id, sample_count }, { projectId }) => {
+  async ({ app_id, issue_id, variant_id, sample_count }) => {
     if (!app_id) return mcpError(`Must specify 'app_id' parameter.`);
     if (!issue_id) return mcpError(`Must specify 'issue_id' parameter.`);
 
     if (sample_count > 3) sample_count = 3;
 
-    return toContent(await getSampleCrash(projectId, app_id, issue_id, variant_id, sample_count));
+    return toContent(await getSampleCrash(app_id, issue_id, sample_count, variant_id));
   },
 );