mcp-remote 0.0.10-3 → 0.0.10

package/dist/react/index.js

@@ -121,18 +121,21 @@ var BrowserOAuthClientProvider = class {
    * Extended popup-based authorization method specific to browser environments
    */
   async openAuthorizationPopup(authorizationUrl, metadata) {
-    const state = Math.random().toString(36).substring(2);
-    const stateKey = `${this.storageKeyPrefix}:state_${state}`;
-    localStorage.setItem(
-      stateKey,
-      JSON.stringify({
-        authorizationUrl: authorizationUrl.toString(),
-        metadata,
-        serverUrlHash: this.serverUrlHash,
-        expiry: +/* @__PURE__ */ new Date() + 1e3 * 60 * 5
-      })
-    );
-    authorizationUrl.searchParams.set("state", state);
+    const existingState = authorizationUrl.searchParams.get("state");
+    if (!existingState) {
+      const state = Math.random().toString(36).substring(2);
+      const stateKey = `${this.storageKeyPrefix}:state_${state}`;
+      localStorage.setItem(
+        stateKey,
+        JSON.stringify({
+          authorizationUrl: authorizationUrl.toString(),
+          metadata,
+          serverUrlHash: this.serverUrlHash,
+          expiry: +/* @__PURE__ */ new Date() + 1e3 * 60 * 5
+        })
+      );
+      authorizationUrl.searchParams.set("state", state);
+    }
     const authUrl = authorizationUrl.toString();
     localStorage.setItem(this.getKey("auth_url"), authUrl);
     try {
@@ -193,6 +196,7 @@ var McpClient = class {
   // Authentication state
   metadata;
   authUrlRef;
+  authState;
   codeVerifier;
   connecting = false;
   // Update callbacks
@@ -442,6 +446,19 @@ var McpClient = class {
     });
     await this.authProvider.saveCodeVerifier(codeVerifier);
     this.codeVerifier = codeVerifier;
+    const state = Math.random().toString(36).substring(2);
+    const stateKey = `${this.options.storageKeyPrefix}:state_${state}`;
+    localStorage.setItem(
+      stateKey,
+      JSON.stringify({
+        authorizationUrl: authorizationUrl.toString(),
+        metadata: this.metadata,
+        serverUrlHash: this.authProvider.serverUrlHash,
+        expiry: +/* @__PURE__ */ new Date() + 1e3 * 60 * 5
+      })
+    );
+    authorizationUrl.searchParams.set("state", state);
+    this.authState = state;
     this.authUrlRef = authorizationUrl;
     this.setAuthUrl(authorizationUrl.toString());
     return authorizationUrl;
@@ -583,13 +600,32 @@ var McpClient = class {
    * Manually trigger authentication
    */
   async authenticate() {
-    if (!this.authUrlRef) {
-      await this.startAuthFlow();
+    if (!this.authProvider) {
+      try {
+        this.addLog("info", "Discovering OAuth metadata...");
+        this.metadata = await discoverOAuthMetadata(this.url);
+        this.addLog("debug", `OAuth metadata: ${this.metadata ? "Found" : "Not available"}`);
+        if (!this.metadata) {
+          throw new Error("No OAuth metadata available");
+        }
+        this.initAuthProvider();
+      } catch (err) {
+        this.addLog("error", `Failed to discover OAuth metadata: ${err instanceof Error ? err.message : String(err)}`);
+        return void 0;
+      }
     }
-    if (this.authUrlRef) {
+    try {
+      if (!this.authUrlRef || !this.authUrlRef.searchParams.get("state")) {
+        await this.startAuthFlow();
+      }
+      if (!this.authUrlRef) {
+        throw new Error("Failed to create authorization URL");
+      }
       return this.authUrlRef.toString();
+    } catch (err) {
+      this.addLog("error", `Error preparing manual authentication: ${err instanceof Error ? err.message : String(err)}`);
+      return void 0;
     }
-    return void 0;
   }
   /**
    * Clear all localStorage items for this server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-remote",
-  "version": "0.0.10-3",
+  "version": "0.0.10",
   "type": "module",
   "bin": {
     "mcp-remote": "dist/cli/proxy.js"