@cloudflare/workers-oauth-provider 0.0.3 → 0.0.4-0

package/README.md

@@ -43,6 +43,16 @@ export default new OAuthProvider({
   // You can provide either an object with a fetch method (ExportedHandler)
   // or a class extending WorkerEntrypoint.
   apiHandler: ApiHandler, // Using a WorkerEntrypoint class
+  
+  // For multi-handler setups, you can use apiHandlers instead of apiRoute+apiHandler.
+  // This allows you to use different handlers for different API routes.
+  // Note: You must use either apiRoute+apiHandler (single-handler) OR apiHandlers (multi-handler), not both.
+  // Example:
+  // apiHandlers: {
+  //   "/api/users/": UsersApiHandler,
+  //   "/api/documents/": DocumentsApiHandler,
+  //   "https://api.example.com/": ExternalApiHandler,
+  // },
 
   // Any requests which aren't API request will be passed to the default handler instead.
   // Again, this can be either an object or a WorkerEntrypoint.

package/dist/oauth-provider.d.ts

@@ -67,14 +67,31 @@ interface OAuthProviderOptions {
      * URL(s) for API routes. Requests with URLs starting with any of these prefixes
      * will be treated as API requests and require a valid access token.
      * Can be a single route or an array of routes. Each route can be a full URL or just a path.
+     *
+     * Used with `apiHandler` for the single-handler configuration. This is incompatible with
+     * the `apiHandlers` property. You must use either `apiRoute` + `apiHandler` OR `apiHandlers`, not both.
      */
-    apiRoute: string | string[];
+    apiRoute?: string | string[];
     /**
      * Handler for API requests that have a valid access token.
      * This handler will receive the authenticated user properties in ctx.props.
      * Can be either an ExportedHandler object with a fetch method or a class extending WorkerEntrypoint.
+     *
+     * Used with `apiRoute` for the single-handler configuration. This is incompatible with
+     * the `apiHandlers` property. You must use either `apiRoute` + `apiHandler` OR `apiHandlers`, not both.
+     */
+    apiHandler?: ExportedHandlerWithFetch | (new (ctx: ExecutionContext, env: any) => WorkerEntrypointWithFetch);
+    /**
+     * Map of API routes to their corresponding handlers for the multi-handler configuration.
+     * The keys are the API routes (strings only, not arrays), and the values are the handlers.
+     * Each route can be a full URL or just a path, and each handler can be either an ExportedHandler
+     * object with a fetch method or a class extending WorkerEntrypoint.
+     *
+     * This is incompatible with the `apiRoute` and `apiHandler` properties. You must use either
+     * `apiRoute` + `apiHandler` (single-handler configuration) OR `apiHandlers` (multi-handler
+     * configuration), not both.
      */
-    apiHandler: ExportedHandlerWithFetch | (new (ctx: ExecutionContext, env: any) => WorkerEntrypointWithFetch);
+    apiHandlers?: Record<string, ExportedHandlerWithFetch | (new (ctx: ExecutionContext, env: any) => WorkerEntrypointWithFetch)>;
     /**
      * Handler for all non-API requests or API requests without a valid token.
      * Can be either an ExportedHandler object with a fetch method or a class extending WorkerEntrypoint.

package/dist/oauth-provider.js

@@ -37,14 +37,36 @@ var OAuthProviderImpl = class {
    * @param options - Configuration options for the provider
    */
   constructor(options) {
-    this.typedApiHandler = this.validateHandler(options.apiHandler, "apiHandler");
+    this.typedApiHandlers = /* @__PURE__ */ new Map();
+    const hasSingleHandlerConfig = !!(options.apiRoute && options.apiHandler);
+    const hasMultiHandlerConfig = !!options.apiHandlers;
+    if (hasSingleHandlerConfig && hasMultiHandlerConfig) {
+      throw new TypeError(
+        "Cannot use both apiRoute/apiHandler and apiHandlers. Use either apiRoute + apiHandler OR apiHandlers, not both."
+      );
+    }
+    if (!hasSingleHandlerConfig && !hasMultiHandlerConfig) {
+      throw new TypeError(
+        "Must provide either apiRoute + apiHandler OR apiHandlers. No API route configuration provided."
+      );
+    }
     this.typedDefaultHandler = this.validateHandler(options.defaultHandler, "defaultHandler");
-    if (Array.isArray(options.apiRoute)) {
-      options.apiRoute.forEach((route, index) => {
-        this.validateEndpoint(route, `apiRoute[${index}]`);
-      });
+    if (hasSingleHandlerConfig) {
+      const apiHandler = this.validateHandler(options.apiHandler, "apiHandler");
+      if (Array.isArray(options.apiRoute)) {
+        options.apiRoute.forEach((route, index) => {
+          this.validateEndpoint(route, `apiRoute[${index}]`);
+          this.typedApiHandlers.set(route, apiHandler);
+        });
+      } else {
+        this.validateEndpoint(options.apiRoute, "apiRoute");
+        this.typedApiHandlers.set(options.apiRoute, apiHandler);
+      }
     } else {
-      this.validateEndpoint(options.apiRoute, "apiRoute");
+      for (const [route, handler] of Object.entries(options.apiHandlers)) {
+        this.validateEndpoint(route, `apiHandlers key: ${route}`);
+        this.typedApiHandlers.set(route, this.validateHandler(handler, `apiHandlers[${route}]`));
+      }
     }
     this.validateEndpoint(options.authorizeEndpoint, "authorizeEndpoint");
     this.validateEndpoint(options.tokenEndpoint, "tokenEndpoint");
@@ -204,11 +226,25 @@ var OAuthProviderImpl = class {
    * @returns True if the URL matches any of the API routes
    */
   isApiRequest(url) {
-    if (Array.isArray(this.options.apiRoute)) {
-      return this.options.apiRoute.some((route) => this.matchApiRoute(url, route));
-    } else {
-      return this.matchApiRoute(url, this.options.apiRoute);
+    for (const route of this.typedApiHandlers.keys()) {
+      if (this.matchApiRoute(url, route)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  /**
+   * Finds the appropriate API handler for a URL
+   * @param url - The URL to find a handler for
+   * @returns The TypedHandler for the URL, or undefined if no handler matches
+   */
+  findApiHandlerForUrl(url) {
+    for (const [route, handler] of this.typedApiHandlers.entries()) {
+      if (this.matchApiRoute(url, route)) {
+        return handler;
+      }
     }
+    return void 0;
   }
   /**
    * Gets the full URL for an endpoint, using the provided request URL's
@@ -799,10 +835,15 @@ var OAuthProviderImpl = class {
     if (!env.OAUTH_PROVIDER) {
       env.OAUTH_PROVIDER = this.createOAuthHelpers(env);
     }
-    if (this.typedApiHandler.type === 0 /* EXPORTED_HANDLER */) {
-      return this.typedApiHandler.handler.fetch(request, env, ctx);
+    const url = new URL(request.url);
+    const apiHandler = this.findApiHandlerForUrl(url);
+    if (!apiHandler) {
+      return this.createErrorResponse("invalid_request", "No handler found for API route", 404);
+    }
+    if (apiHandler.type === 0 /* EXPORTED_HANDLER */) {
+      return apiHandler.handler.fetch(request, env, ctx);
     } else {
-      const handler = new this.typedApiHandler.handler(ctx, env);
+      const handler = new apiHandler.handler(ctx, env);
       return handler.fetch(request);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/workers-oauth-provider",
-  "version": "0.0.3",
+  "version": "0.0.4-0",
   "description": "OAuth provider for Cloudflare Workers",
   "main": "dist/oauth-provider.js",
   "types": "dist/oauth-provider.d.ts",