feat(core): Share OAuth device polling intervals

Co-Authored-By: GPT-6 Sol <agent@openai.com>

Author: BYK

packages/cli/src/lib/oauth.ts

@@ -9,6 +9,7 @@ import {
   deviceCodeRequestBody,
   deviceTokenRequestBody,
 } from "@sentry/toolkit-core/oauth-device";
+import { nextDevicePollInterval } from "@sentry/toolkit-core/oauth-poll";
 import { safeParse } from "valibot";
 import type { TokenResponse } from "../types/index.js";
 import {
@@ -372,7 +373,7 @@ function pollForToken(deviceCode: string): Promise<TokenResponse> {
 
 type PollResult =
   | { status: "success"; token: TokenResponse }
-  | { status: "pending" }
+  | { status: "authorization_pending" }
   | { status: "slow_down" }
   | { status: "error"; message: string };
 
@@ -390,7 +391,7 @@ async function attemptPoll(deviceCode: string): Promise<PollResult> {
 
     switch (error.code) {
       case "authorization_pending":
-        return { status: "pending" };
+        return { status: "authorization_pending" };
       case "slow_down":
         return { status: "slow_down" };
       case "expired_token":
@@ -460,10 +461,9 @@ export async function performDeviceFlow(
     switch (result.status) {
       case "success":
         return result.token;
-      case "pending":
-        continue;
+      case "authorization_pending":
       case "slow_down":
-        pollInterval += 5;
+        pollInterval = nextDevicePollInterval(pollInterval, result.status);
         continue;
       case "error":
         throw new DeviceFlowError("authorization_failed", result.message);

packages/cli/test/lib/oauth.test.ts

@@ -14,14 +14,66 @@ import {
   property,
   uniqueArray,
 } from "fast-check";
-import { describe, expect, test } from "vitest";
+import { afterEach, describe, expect, test, vi } from "vitest";
 import { SENTRY_SCOPES } from "../../src/lib/api-scope.js";
 import { ValidationError } from "../../src/lib/errors.js";
-import { OAUTH_SCOPES, resolveOAuthScopeString } from "../../src/lib/oauth.js";
+import {
+  OAUTH_SCOPES,
+  performDeviceFlow,
+  resolveOAuthScopeString,
+} from "../../src/lib/oauth.js";
 import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js";
 
 const knownScopeArb = constantFrom(...SENTRY_SCOPES);
 
+afterEach(() => {
+  vi.useRealTimers();
+  vi.unstubAllGlobals();
+});
+
+describe("performDeviceFlow polling", () => {
+  test("keeps the interval for pending responses and adds five seconds after slow_down", async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(0);
+
+    const token = {
+      access_token: "test-token",
+      token_type: "Bearer",
+      expires_in: 3600,
+    };
+    const fetchMock = vi
+      .fn()
+      .mockResolvedValueOnce(
+        Response.json({
+          device_code: "test-code",
+          user_code: "ABCD",
+          verification_uri: "https://sentry.example/oauth/device/",
+          interval: 1,
+          expires_in: 30,
+        })
+      )
+      .mockResolvedValueOnce(
+        Response.json({ error: "authorization_pending" }, { status: 400 })
+      )
+      .mockResolvedValueOnce(
+        Response.json({ error: "slow_down" }, { status: 400 })
+      )
+      .mockResolvedValueOnce(Response.json(token));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const result = performDeviceFlow({ onUserCode: vi.fn() });
+    await vi.advanceTimersByTimeAsync(1000);
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    await vi.advanceTimersByTimeAsync(1000);
+    expect(fetchMock).toHaveBeenCalledTimes(3);
+    await vi.advanceTimersByTimeAsync(5999);
+    expect(fetchMock).toHaveBeenCalledTimes(3);
+    await vi.advanceTimersByTimeAsync(1);
+    await expect(result).resolves.toEqual(token);
+    expect(fetchMock).toHaveBeenCalledTimes(4);
+  });
+});
+
 describe("resolveOAuthScopeString", () => {
   test("default scopes include Team Admin for project creation", () => {
     expect(OAUTH_SCOPES).toContain("team:admin");

packages/mcp-server/src/auth/constants.ts

@@ -15,9 +15,6 @@ export const DEVICE_CODE_ENDPOINT = "/oauth/device/code/";
 export const TOKEN_ENDPOINT = "/oauth/token/";
 export const DEVICE_CODE_SCOPES = Object.keys(SCOPES).join(" ");
 
-/** Interval increment on slow_down response (RFC 8628). */
-export const SLOW_DOWN_INCREMENT_SEC = 5;
-
 /**
  * Whether device code auth is available for this host.
  * Supports sentry.io and regional subdomains (us.sentry.io, eu.sentry.io).

packages/mcp-server/src/auth/device-code-flow.ts

@@ -5,10 +5,10 @@ import {
   deviceCodeRequestBody,
   deviceTokenRequestBody,
 } from "@sentry/toolkit-core/oauth-device";
+import { nextDevicePollInterval } from "@sentry/toolkit-core/oauth-poll";
 import {
   DEVICE_CODE_ENDPOINT,
   DEVICE_CODE_SCOPES,
-  SLOW_DOWN_INCREMENT_SEC,
   TOKEN_ENDPOINT,
 } from "./constants";
 import {
@@ -102,10 +102,8 @@ export async function pollForToken({
 
     switch (errorCode) {
       case "authorization_pending":
-        // Keep polling at current interval
-        continue;
       case "slow_down":
-        pollInterval += SLOW_DOWN_INCREMENT_SEC;
+        pollInterval = nextDevicePollInterval(pollInterval, errorCode);
         continue;
       case "access_denied":
         throw new DeviceCodeError(

packages/toolkit-core/README.md

@@ -3,6 +3,7 @@
 Pure authentication protocol helpers shared by the CLI and MCP. Both product
 builds bundle this private workspace package into their artifacts.
 
-The shared code validates opaque bearer tokens and constructs OAuth device-flow
-form bodies. Each product retains its own credential storage, host trust checks,
-HTTP transport, response validation, and user-facing error types.
+The shared code validates opaque bearer tokens, constructs OAuth device-flow
+form bodies, and applies the RFC 8628 polling interval rule. Each product
+retains its own credential storage, host trust checks, polling deadline, HTTP
+transport, response validation, and user-facing error types.

packages/toolkit-core/package.json

@@ -14,6 +14,10 @@
     "./oauth-device": {
       "types": "./src/oauth-device.ts",
       "default": "./src/oauth-device.ts"
+    },
+    "./oauth-poll": {
+      "types": "./src/oauth-poll.ts",
+      "default": "./src/oauth-poll.ts"
     }
   },
   "scripts": {

packages/toolkit-core/src/oauth-poll.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect, it } from "vitest";
+import { nextDevicePollInterval } from "./oauth-poll";
+
+describe("nextDevicePollInterval", () => {
+  it.each([1, 5, 30])(
+    "keeps a %is interval while authorization is pending",
+    (interval) => {
+      expect(nextDevicePollInterval(interval, "authorization_pending")).toBe(
+        interval,
+      );
+    },
+  );
+
+  it.each([1, 5, 30])(
+    "adds five seconds to a %is interval on slow_down",
+    (interval) => {
+      expect(nextDevicePollInterval(interval, "slow_down")).toBe(interval + 5);
+    },
+  );
+
+  it("accumulates repeated slow_down responses", () => {
+    const first = nextDevicePollInterval(1, "slow_down");
+    expect(nextDevicePollInterval(first, "slow_down")).toBe(11);
+  });
+});

packages/toolkit-core/src/oauth-poll.ts

@@ -0,0 +1,10 @@
+/** RFC 8628 retry responses. The caller owns the polling deadline and errors. */
+export type DevicePollRetry = "authorization_pending" | "slow_down";
+
+/** RFC 8628 section 3.5 requires five additional seconds after slow_down. */
+export function nextDevicePollInterval(
+  intervalSeconds: number,
+  response: DevicePollRetry,
+): number {
+  return response === "slow_down" ? intervalSeconds + 5 : intervalSeconds;
+}