ref: fail gracefully with missing refresh token (#559)

Author: dcramer

packages/mcp-cloudflare/src/server/oauth/helpers.test.ts

@@ -37,7 +37,7 @@ describe("tokenExchangeCallback", () => {
     expect(mockFetch).not.toHaveBeenCalled();
   });
 
-  it("should throw error when no refresh token in props", async () => {
+  it("should return undefined when no refresh token in props", async () => {
     const options: TokenExchangeCallbackOptions = {
       grantType: "refresh_token",
       clientId: "test-client-id",
@@ -51,9 +51,9 @@ describe("tokenExchangeCallback", () => {
       } as WorkerProps,
     };
 
-    await expect(tokenExchangeCallback(options, mockEnv)).rejects.toThrow(
-      "No refresh token available in stored props",
-    );
+    await expect(
+      tokenExchangeCallback(options, mockEnv),
+    ).resolves.toBeUndefined();
     expect(mockFetch).not.toHaveBeenCalled();
   });
 

packages/mcp-cloudflare/src/server/oauth/helpers.ts

@@ -6,6 +6,7 @@ import type { z } from "zod";
 import { logError } from "@sentry/mcp-server/logging";
 import { TokenResponseSchema, SENTRY_TOKEN_URL } from "./constants";
 import type { WorkerProps } from "../types";
+import * as Sentry from "@sentry/cloudflare";
 
 /**
  * Constructs an authorization URL for Sentry.
@@ -223,11 +224,16 @@ export async function tokenExchangeCallback(
     return undefined; // No-op for other grant types
   }
 
+  Sentry.setUser({ id: options.props.id, name: options.props.name });
+
   // Extract the refresh token from the stored props
   const currentRefreshToken = options.props.refreshToken;
-
   if (!currentRefreshToken) {
-    throw new Error("No refresh token available in stored props");
+    Sentry.captureException(
+      new Error("No refresh token available in stored props"),
+    );
+
+    return undefined;
   }
 
   try {