Merge remote-tracking branch 'upstream/main' into auth-client

src/client/auth.ts

@@ -84,7 +84,14 @@ export class UnauthorizedError extends Error {
  */
 export async function auth(
   provider: OAuthClientProvider,
-  { resourceServerUrl, authorizationCode, protectedResourceMetadata }: { resourceServerUrl: string | URL, authorizationCode?: string, protectedResourceMetadata?: OAuthProtectedResourceMetadata }): Promise<AuthResult> {
+  { resourceServerUrl,
+    authorizationCode,
+    scope,
+  protectedResourceMetadata }: {
+    resourceServerUrl: string | URL;
+    authorizationCode?: string;
+    scope?: string;
+    protectedResourceMetadata?: OAuthProtectedResourceMetadata }): Promise<AuthResult> {
 
   let resourceMetadata = protectedResourceMetadata ?? await discoverOAuthProtectedResourceMetadata(resourceServerUrl);
 
@@ -333,7 +340,7 @@ export async function startAuthorization(
     codeChallengeMethod,
   );
   authorizationUrl.searchParams.set("redirect_uri", String(redirectUrl));
-  
+
   if (scope) {
     authorizationUrl.searchParams.set("scope", scope);
   }

src/client/sse.test.ts

@@ -618,22 +618,6 @@ describe("SSEClientTransport", () => {
             return;
           }
 
-          if (auth === "Bearer new-token") {
-            res.writeHead(200, {
-              "Content-Type": "text/event-stream",
-              "Cache-Control": "no-cache, no-transform",
-              Connection: "keep-alive",
-            });
-            res.write("event: endpoint\n");
-            res.write(`data: ${baseUrl.href}\n\n`);
-            connectionAttempts++;
-            return;
-          }
-
-          res.writeHead(401).end();
-          return;
-        }
-
         if (auth === "Bearer new-token") {
           res.writeHead(200, {
             "Content-Type": "text/event-stream",
@@ -646,7 +630,7 @@ describe("SSEClientTransport", () => {
           return;
         }
 
-        res.writeHead(401).end();
+          res.writeHead(401).end();
       });
 
       await new Promise<void>(resolve => {