@vercel/connect 2.3.6 → 2.4.0

package/dist/authorization.js

@@ -1,6 +1,6 @@
 import { getVercelOidcToken } from '@vercel/oidc';
 import { isDetachedInteractiveAuth, validateCallbackUrl, validateWebhookUrl, } from './internal/url-validation.js';
-import { withDefaultScopes } from './internal/default-scopes.js';
+import { normalizeTokenParams } from './internal/normalize-token-params.js';
 import { resolveBaseUrl } from './internal/base-url.js';
 import { createConnectErrorFromResponse, } from './token.js';
 export async function startAuthorization(connector, params, options) {
@@ -22,7 +22,7 @@ export async function startAuthorization(connector, params, options) {
         ? { returnUrl: options.callbackUrl }
         : {};
     const body = {
-        ...withDefaultScopes(params),
+        ...normalizeTokenParams(params),
         ...returnUrl,
         ...(options?.webhook !== undefined && { webhook: options.webhook }),
         ...(deviceCode !== undefined && {

package/dist/internal/normalize-token-params.d.ts

@@ -0,0 +1,3 @@
+import type { ConnectTokenParams, ConnectTokenSubject } from '../token.js';
+export declare function normalizeTokenSubject(subject: ConnectTokenSubject): ConnectTokenSubject;
+export declare function normalizeTokenParams(params: ConnectTokenParams): ConnectTokenParams;

package/dist/internal/normalize-token-params.js

@@ -0,0 +1,14 @@
+export function normalizeTokenSubject(subject) {
+    if ((subject.type === undefined || subject.type === 'token') &&
+        typeof subject.token === 'string') {
+        return { type: 'token', token: subject.token };
+    }
+    return subject;
+}
+export function normalizeTokenParams(params) {
+    return {
+        ...params,
+        subject: normalizeTokenSubject(params.subject),
+        scopes: params.scopes === undefined ? ['*'] : params.scopes,
+    };
+}

package/dist/token.d.ts

@@ -28,7 +28,8 @@ export interface ConnectJwtBearerTokenSubject {
     additionalClaims?: Record<string, unknown>;
 }
 export interface ConnectTokenExchangeSubject {
-    type: 'token';
+    /** Inferred as `'token'` when omitted. */
+    type?: 'token';
     token: string;
 }
 export interface ConnectTokenParams {

package/dist/token.js

@@ -1,6 +1,6 @@
 import { getVercelOidcToken } from '@vercel/oidc';
 import { resolveBaseUrl } from './internal/base-url.js';
-import { withDefaultScopes } from './internal/default-scopes.js';
+import { normalizeTokenParams, normalizeTokenSubject, } from './internal/normalize-token-params.js';
 export class ConnectError extends Error {
     code;
     status;
@@ -38,7 +38,7 @@ export async function getToken(connector, params, options) {
     return token;
 }
 export async function getTokenResponse(connector, params, options) {
-    const requestParams = withDefaultScopes(params);
+    const requestParams = normalizeTokenParams(params);
     const bufferMs = requestParams.validityBufferMs ?? DEFAULT_VALIDITY_BUFFER_MS;
     const cacheKey = tokenCacheKey(connector, requestParams);
     if (options?.forceRefresh) {
@@ -88,7 +88,10 @@ export async function revokeToken(connector, params, options) {
             'Content-Type': 'application/json',
             Authorization: `Bearer ${vercelToken}`,
         },
-        body: JSON.stringify(params),
+        body: JSON.stringify({
+            ...params,
+            subject: normalizeTokenSubject(params.subject),
+        }),
     });
     if (!response.ok) {
         throw await createConnectErrorFromResponse(response, 'Failed to revoke token');
@@ -113,7 +116,7 @@ export async function revokeToken(connector, params, options) {
  * call. No-op when no matching entry exists.
  */
 export function deleteTokenCacheEntry(connector, params) {
-    cache.delete(tokenCacheKey(connector, withDefaultScopes(params)));
+    cache.delete(tokenCacheKey(connector, normalizeTokenParams(params)));
 }
 const DEFAULT_VALIDITY_BUFFER_MS = 30_000;
 const MAX_CACHE_SIZE = 100;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/connect",
-  "version": "2.3.6",
+  "version": "2.4.0",
   "license": "Apache-2.0",
   "type": "module",
   "repository": {
@@ -50,7 +50,7 @@
     "dist"
   ],
   "dependencies": {
-    "@vercel/oidc": "3.8.10"
+    "@vercel/oidc": "4.0.0"
   },
   "peerDependencies": {
     "@ai-sdk/mcp": "^1 || ^2",

package/dist/internal/default-scopes.d.ts

@@ -1,2 +0,0 @@
-import type { ConnectTokenParams } from '../token.js';
-export declare function withDefaultScopes(params: ConnectTokenParams): ConnectTokenParams;

package/dist/internal/default-scopes.js

@@ -1,3 +0,0 @@
-export function withDefaultScopes(params) {
-    return params.scopes === undefined ? { ...params, scopes: ['*'] } : params;
-}