Skip to content

Commit 526eb4b

Browse files
mattzcareymattzcarey
committed
chore: strip .js from relative TS imports in files added on main
Cover server-legacy, e2e tests, and jsonSchemaValidatorOverride tests that were added after the branch diverged.
1 parent 57a930b commit 526eb4b

62 files changed

Lines changed: 203 additions & 203 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/client/test/client/jsonSchemaValidatorOverride.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { JSONRPCMessage, JsonSchemaType, JsonSchemaValidatorResult, jsonSchemaValidator } from '@modelcontextprotocol/core';
22
import { InMemoryTransport, LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/core';
3-
import { Client } from '../../src/client/client.js';
4-
import { fromJsonSchema } from '../../src/fromJsonSchema.js';
3+
import { Client } from '../../src/client/client';
4+
import { fromJsonSchema } from '../../src/fromJsonSchema';
55

66
class RecordingValidator implements jsonSchemaValidator {
77
schemas: JsonSchemaType[] = [];

‎packages/server-legacy/src/auth/handlers/authorize.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import type { Options as RateLimitOptions } from 'express-rate-limit';
44
import { rateLimit } from 'express-rate-limit';
55
import * as z from 'zod/v4';
66

7-
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors.js';
8-
import { allowedMethods } from '../middleware/allowedMethods.js';
9-
import type { OAuthServerProvider } from '../provider.js';
7+
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors';
8+
import { allowedMethods } from '../middleware/allowedMethods';
9+
import type { OAuthServerProvider } from '../provider';
1010

1111
export type AuthorizationHandlerOptions = {
1212
provider: OAuthServerProvider;

‎packages/server-legacy/src/auth/handlers/metadata.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import cors from 'cors';
33
import type { RequestHandler } from 'express';
44
import express from 'express';
55

6-
import { allowedMethods } from '../middleware/allowedMethods.js';
6+
import { allowedMethods } from '../middleware/allowedMethods';
77

88
export function metadataHandler(metadata: OAuthMetadata | OAuthProtectedResourceMetadata): RequestHandler {
99
// Nested router so we can configure middleware and restrict HTTP method

‎packages/server-legacy/src/auth/handlers/register.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import express from 'express';
88
import type { Options as RateLimitOptions } from 'express-rate-limit';
99
import { rateLimit } from 'express-rate-limit';
1010

11-
import type { OAuthRegisteredClientsStore } from '../clients.js';
12-
import { InvalidClientMetadataError, OAuthError, ServerError, TooManyRequestsError } from '../errors.js';
13-
import { allowedMethods } from '../middleware/allowedMethods.js';
11+
import type { OAuthRegisteredClientsStore } from '../clients';
12+
import { InvalidClientMetadataError, OAuthError, ServerError, TooManyRequestsError } from '../errors';
13+
import { allowedMethods } from '../middleware/allowedMethods';
1414

1515
export type ClientRegistrationHandlerOptions = {
1616
/**

‎packages/server-legacy/src/auth/handlers/revoke.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import express from 'express';
55
import type { Options as RateLimitOptions } from 'express-rate-limit';
66
import { rateLimit } from 'express-rate-limit';
77

8-
import { InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors.js';
9-
import { allowedMethods } from '../middleware/allowedMethods.js';
10-
import { authenticateClient } from '../middleware/clientAuth.js';
11-
import type { OAuthServerProvider } from '../provider.js';
8+
import { InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors';
9+
import { allowedMethods } from '../middleware/allowedMethods';
10+
import { authenticateClient } from '../middleware/clientAuth';
11+
import type { OAuthServerProvider } from '../provider';
1212

1313
export type RevocationHandlerOptions = {
1414
provider: OAuthServerProvider;

‎packages/server-legacy/src/auth/handlers/token.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import {
1313
ServerError,
1414
TooManyRequestsError,
1515
UnsupportedGrantTypeError
16-
} from '../errors.js';
17-
import { allowedMethods } from '../middleware/allowedMethods.js';
18-
import { authenticateClient } from '../middleware/clientAuth.js';
19-
import type { OAuthServerProvider } from '../provider.js';
16+
} from '../errors';
17+
import { allowedMethods } from '../middleware/allowedMethods';
18+
import { authenticateClient } from '../middleware/clientAuth';
19+
import type { OAuthServerProvider } from '../provider';
2020

2121
export type TokenHandlerOptions = {
2222
provider: OAuthServerProvider;

‎packages/server-legacy/src/auth/index.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
// Core router
2-
export type { AuthMetadataOptions, AuthRouterOptions } from './router.js';
3-
export { createOAuthMetadata, getOAuthProtectedResourceMetadataUrl, mcpAuthMetadataRouter, mcpAuthRouter } from './router.js';
2+
export type { AuthMetadataOptions, AuthRouterOptions } from './router';
3+
export { createOAuthMetadata, getOAuthProtectedResourceMetadataUrl, mcpAuthMetadataRouter, mcpAuthRouter } from './router';
44

55
// Provider interfaces
6-
export type { AuthorizationParams, OAuthServerProvider, OAuthTokenVerifier } from './provider.js';
6+
export type { AuthorizationParams, OAuthServerProvider, OAuthTokenVerifier } from './provider';
77

88
// Proxy provider
9-
export type { ProxyEndpoints, ProxyOptions } from './providers/proxyProvider.js';
10-
export { ProxyOAuthServerProvider } from './providers/proxyProvider.js';
9+
export type { ProxyEndpoints, ProxyOptions } from './providers/proxyProvider';
10+
export { ProxyOAuthServerProvider } from './providers/proxyProvider';
1111

1212
// Client store
13-
export type { OAuthRegisteredClientsStore } from './clients.js';
13+
export type { OAuthRegisteredClientsStore } from './clients';
1414

1515
// Handlers
16-
export type { AuthorizationHandlerOptions } from './handlers/authorize.js';
17-
export { authorizationHandler, redirectUriMatches } from './handlers/authorize.js';
18-
export { metadataHandler } from './handlers/metadata.js';
19-
export type { ClientRegistrationHandlerOptions } from './handlers/register.js';
20-
export { clientRegistrationHandler } from './handlers/register.js';
21-
export type { RevocationHandlerOptions } from './handlers/revoke.js';
22-
export { revocationHandler } from './handlers/revoke.js';
23-
export type { TokenHandlerOptions } from './handlers/token.js';
24-
export { tokenHandler } from './handlers/token.js';
16+
export type { AuthorizationHandlerOptions } from './handlers/authorize';
17+
export { authorizationHandler, redirectUriMatches } from './handlers/authorize';
18+
export { metadataHandler } from './handlers/metadata';
19+
export type { ClientRegistrationHandlerOptions } from './handlers/register';
20+
export { clientRegistrationHandler } from './handlers/register';
21+
export type { RevocationHandlerOptions } from './handlers/revoke';
22+
export { revocationHandler } from './handlers/revoke';
23+
export type { TokenHandlerOptions } from './handlers/token';
24+
export { tokenHandler } from './handlers/token';
2525

2626
// Middleware
27-
export { allowedMethods } from './middleware/allowedMethods.js';
28-
export type { BearerAuthMiddlewareOptions } from './middleware/bearerAuth.js';
29-
export { requireBearerAuth } from './middleware/bearerAuth.js';
30-
export type { ClientAuthenticationMiddlewareOptions } from './middleware/clientAuth.js';
31-
export { authenticateClient } from './middleware/clientAuth.js';
27+
export { allowedMethods } from './middleware/allowedMethods';
28+
export type { BearerAuthMiddlewareOptions } from './middleware/bearerAuth';
29+
export { requireBearerAuth } from './middleware/bearerAuth';
30+
export type { ClientAuthenticationMiddlewareOptions } from './middleware/clientAuth';
31+
export { authenticateClient } from './middleware/clientAuth';
3232

3333
// Error classes
34-
export * from './errors.js';
34+
export * from './errors';
3535

3636
// Types
37-
export type { AuthInfo } from './types.js';
37+
export type { AuthInfo } from './types';

‎packages/server-legacy/src/auth/middleware/allowedMethods.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { RequestHandler } from 'express';
22

3-
import { MethodNotAllowedError } from '../errors.js';
3+
import { MethodNotAllowedError } from '../errors';
44

55
/**
66
* Middleware to handle unsupported HTTP methods with a 405 Method Not Allowed response.

‎packages/server-legacy/src/auth/middleware/bearerAuth.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { RequestHandler } from 'express';
22

3-
import { InsufficientScopeError, InvalidTokenError, OAuthError, ServerError } from '../errors.js';
4-
import type { OAuthTokenVerifier } from '../provider.js';
5-
import type { AuthInfo } from '../types.js';
3+
import { InsufficientScopeError, InvalidTokenError, OAuthError, ServerError } from '../errors';
4+
import type { OAuthTokenVerifier } from '../provider';
5+
import type { AuthInfo } from '../types';
66

77
export type BearerAuthMiddlewareOptions = {
88
/**

‎packages/server-legacy/src/auth/middleware/clientAuth.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { OAuthClientInformationFull } from '@modelcontextprotocol/core';
22
import type { RequestHandler } from 'express';
33
import * as z from 'zod/v4';
44

5-
import type { OAuthRegisteredClientsStore } from '../clients.js';
6-
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError } from '../errors.js';
5+
import type { OAuthRegisteredClientsStore } from '../clients';
6+
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError } from '../errors';
77

88
export type ClientAuthenticationMiddlewareOptions = {
99
/**

0 commit comments

Comments
 (0)