fix: Minor fixes

� Conflicts:
�	packages/uma/src/routes/Ticket.ts

Author: joachimvh

packages/uma/src/errors/NeedInfoError.ts

@@ -31,4 +31,8 @@ export class NeedInfoError extends ForbiddenHttpError {
     this.ticket = ticket;
     this.additionalParams = additionalParams;
   }
+
+  public static isInstance(error: unknown): error is NeedInfoError {
+    return ForbiddenHttpError.isInstance(error) && typeof (error as NeedInfoError).ticket === 'string';
+  }
 }

packages/uma/src/routes/ResourceRegistration.ts

@@ -3,7 +3,7 @@ import {
   createErrorMessage,
   getLoggerFor,
   KeyValueStorage,
-  MethodNotAllowedHttpError,
+  MethodNotAllowedHttpError, NotFoundHttpError,
   UnauthorizedHttpError
 } from '@solid/community-server';
 import { randomUUID } from 'node:crypto';
@@ -55,7 +55,7 @@ export class ResourceRegistrationRequestHandler extends HttpHandler {
       reType(body, ResourceDescription);
     } catch (e) {
       this.logger.warn(`Syntax error: ${createErrorMessage(e)}, ${body}`);
-      throw new BadRequestHttpError(`Request has bad syntax${e instanceof Error ? ': ' + e.message : ''}`)
+      throw new BadRequestHttpError(`Request has bad syntax: ${createErrorMessage(e)}`);
     }
 
     const resource = randomUUID();
@@ -75,8 +75,8 @@ export class ResourceRegistrationRequestHandler extends HttpHandler {
   private async handleDelete({ parameters }: HttpHandlerRequest): Promise<HttpHandlerResponse<any>> {
     if (typeof parameters?.id !== 'string') throw new Error('URI for DELETE operation should include an id.');
 
-    if (!await this.resourceStore.has(parameters.id)) {
-      throw new Error('Registration to be deleted does not exist (id unknown).');
+    if (!await this.resourceStore.delete(parameters.id)) {
+      throw new NotFoundHttpError('Registration to be deleted does not exist (id unknown).');
     }
 
     this.logger.info(`Deleted resource ${parameters.id}.`);

packages/uma/src/routes/Ticket.ts

@@ -2,7 +2,6 @@ import {
   BadRequestHttpError,
   createErrorMessage,
   getLoggerFor,
-  HttpErrorClass,
   KeyValueStorage,
   UnauthorizedHttpError
 } from '@solid/community-server';
@@ -34,17 +33,11 @@ export class TicketRequestHandler extends HttpHandler {
     this.logger.info(`Received permission registration request.`);
     if (!await verifyRequest(request)) throw new UnauthorizedHttpError();
 
-    if (!request.body || !Array.isArray(request.body)) {
-      this.error(BadRequestHttpError, 'Request body must be a JSON array.');
-    }
-
     try {
       reType(request.body, array(Permission));
     } catch (e) {
-      this.logger.debug(`Syntax error: ${createErrorMessage(e)}, ${request.body}`);
-      e instanceof Error
-        ? this.error(BadRequestHttpError, 'Request has bad syntax: ' + e.message)
-        : this.error(BadRequestHttpError, 'Request has bad syntax');
+      this.logger.warn(`Syntax error: ${createErrorMessage(e)}, ${request.body}`);
+      throw new BadRequestHttpError(`Request has bad syntax: ${createErrorMessage(e)}`);
     }
 
     const ticket = await this.ticketingStrategy.initializeTicket(request.body);
@@ -60,15 +53,4 @@ export class TicketRequestHandler extends HttpHandler {
       body: { ticket: id },
     };
   }
-
-  /**
-   * Logs and throws an error
-   *
-   * @param {HttpErrorClass} constructor - the error constructor
-   * @param {string} message - the error message
-   */
-  private error(constructor: HttpErrorClass, message: string): never {
-    this.logger.warn(message);
-    throw new constructor(message);
-  }
 }

packages/uma/src/routes/Token.ts

@@ -41,11 +41,11 @@ export class TokenRequestHandler extends HttpHandler {
         body: tokenResponse
       };
     } catch (e) {
-      if (ForbiddenHttpError.isInstance(e)) return ({
+      if (NeedInfoError.isInstance(e)) return ({
         status: 403,
         body: {
-          ticket: (e as NeedInfoError).ticket,
-          ...(e as NeedInfoError).additionalParams
+          ticket: e.ticket,
+          ...e.additionalParams
         }
       });
       throw e; // TODO: distinguish other errors

packages/uma/src/util/http/server/NodeHttpRequestResponseHandler.ts

@@ -68,7 +68,12 @@ export class NodeHttpRequestResponseHandler extends NodeHttpStreamsHandler {
 
     const context: HttpHandlerContext<Buffer> = { request: httpHandlerRequest };
 
-    this.logger.info(`Domestic request: ${JSON.stringify({ eventType: 'domestic_request', context })}`);
+    this.logger.info(`Domestic request: ${JSON.stringify({ eventType: 'domestic_request', context: {
+      request: {
+        ...context.request,
+        ...context.request.body && { body: context.request.body.toString() }
+      }
+      } })}`);
 
     let response = await this.httpHandler.handleSafe(context);