feat: Use AsyncHandler

Author: joachimvh

packages/uma/src/index.ts

@@ -54,7 +54,6 @@ export * from './views/ScopeDescription';
 
 // HTTP
 export * from './util/http/identifier/BaseTargetExtractor';
-export * from './util/http/models/Handler';
 export * from './util/http/models/HttpHandler';
 export * from './util/http/models/HttpHandlerContext';
 export * from './util/http/models/HttpHandlerController';

packages/uma/src/routes/Introspection.ts

@@ -16,7 +16,7 @@ import { verifyRequest } from '../util/HttpMessageSignatures';
 /**
  * An HTTP handler that provides introspection into opaque access tokens.
  */
-export class IntrospectionHandler implements HttpHandler {
+export class IntrospectionHandler extends HttpHandler {
   protected readonly logger = getLoggerFor(this);
 
   /**
@@ -29,7 +29,9 @@ export class IntrospectionHandler implements HttpHandler {
     private readonly tokenStore: KeyValueStorage<string, AccessToken>,
     private readonly jwtTokenFactory: JwtTokenFactory,
     private readonly keyGen: JwkGenerator,
-  ) {}
+  ) {
+    super();
+  }
 
   /**
   * Handle incoming requests for token introspection

packages/uma/src/routes/Jwks.ts

@@ -7,7 +7,7 @@ import { getLoggerFor, JwkGenerator } from '@solid/community-server';
  * An HttpHandler used for returning the configuration
  * of the UMA Authorization Service.
  */
-export class JwksRequestHandler implements HttpHandler {
+export class JwksRequestHandler extends HttpHandler {
   protected readonly logger = getLoggerFor(this);
 
   /**
@@ -16,7 +16,9 @@ export class JwksRequestHandler implements HttpHandler {
    */
   public constructor(
     private readonly generator: JwkGenerator
-  ) {}
+  ) {
+    super();
+  }
 
   /**
      * Returns the JSON Web KeySet for specified keyholder

packages/uma/src/routes/ResourceRegistration.ts

@@ -24,15 +24,17 @@ type ErrorConstructor = { new(msg: string): Error };
  *
  * It provides an endpoint to a Resource Server for registering its resources.
  */
-export class ResourceRegistrationRequestHandler implements HttpHandler {
+export class ResourceRegistrationRequestHandler extends HttpHandler {
   protected readonly logger = getLoggerFor(this);
 
   /**
    * @param {RequestingPartyRegistration[]} resourceServers - Pod Servers to be registered with the UMA AS
    */
   constructor(
     private readonly resourceStore: KeyValueStorage<string, ResourceDescription>,
-  ) {}
+  ) {
+    super();
+  }
 
   /**
   * Handle incoming requests for resource registration

packages/uma/src/routes/Ticket.ts

@@ -22,7 +22,7 @@ type ErrorConstructor = { new(msg: string): Error };
  *
  * It provides an endpoint to a Resource Server for requesting UMA tickets.
  */
-export class TicketRequestHandler implements HttpHandler {
+export class TicketRequestHandler extends HttpHandler {
   protected readonly logger = getLoggerFor(this);
 
   /**
@@ -33,7 +33,9 @@ export class TicketRequestHandler implements HttpHandler {
   constructor(
     private readonly ticketingStrategy: TicketingStrategy,
     private readonly ticketStore: KeyValueStorage<string, Ticket>,
-  ) {}
+  ) {
+    super();
+  }
 
   /**
   * Handle incoming requests for permission registration

packages/uma/src/routes/Token.ts

@@ -15,12 +15,14 @@ import { NeedInfoError } from '../errors/NeedInfoError';
 /**
  * The TokenRequestHandler implements the interface of the UMA Token Endpoint.
  */
-export class TokenRequestHandler implements HttpHandler {
+export class TokenRequestHandler extends HttpHandler {
   protected readonly logger = getLoggerFor(this);
 
   constructor(
     protected negotiator: Negotiator,
-  ) {}
+  ) {
+    super();
+  }
 
   /**
    * Handles an incoming token request.

packages/uma/src/util/http/models/Handler.ts

@@ -1,7 +1,7 @@
-import { Handler } from './Handler';
+import { AsyncHandler } from '@solid/community-server';
 import { HttpHandlerResponse } from './HttpHandlerResponse';
 import { HttpHandlerContext } from './HttpHandlerContext';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export abstract class HttpHandler<C extends HttpHandlerContext = HttpHandlerContext>
-  extends Handler<C, HttpHandlerResponse> { }
+  extends AsyncHandler<C, HttpHandlerResponse> { }

packages/uma/src/util/http/models/HttpHandler.ts

@@ -1,4 +1,4 @@
-import { Handler } from './Handler';
+import { AsyncHandler } from '@solid/community-server';
 import { HttpHandlerContext } from './HttpHandlerContext';
 import { HttpHandlerRoute } from './HttpHandlerRoute';
 
@@ -7,7 +7,7 @@ export class HttpHandlerController<C extends HttpHandlerContext = HttpHandlerCon
   constructor(
     public label: string,
     public routes: HttpHandlerRoute<C>[],
-    public preResponseHandler?: Handler<HttpHandlerContext, C>,
+    public preResponseHandler?: AsyncHandler<HttpHandlerContext, C>,
   ) { }
 
 }

packages/uma/src/util/http/models/HttpHandlerController.ts

@@ -49,7 +49,7 @@ export const statusCodes: { [code: number]: string } = {
 /**
  * Handler class that properly processes the HttpErrors from handlersjs-http
  */
-export class JsonHttpErrorHandler implements HttpHandler {
+export class JsonHttpErrorHandler extends HttpHandler {
   protected readonly logger = getLoggerFor(this);
 
   /**
@@ -58,6 +58,7 @@ export class JsonHttpErrorHandler implements HttpHandler {
   constructor(
     private nestedHandler: HttpHandler,
   ) {
+    super();
   }
 
   /**