Merge pull request #4229 from alkem-io/develop

Logging

package.json

@@ -1,6 +1,6 @@
 {
   "name": "alkemio-server",
-  "version": "0.83.1",
+  "version": "0.83.2",
   "description": "Alkemio server, responsible for managing the shared Alkemio platform",
   "author": "Alkemio Foundation",
   "private": false,

quickstart-services.yml

@@ -234,7 +234,7 @@ services:
       - 'host.docker.internal:host-gateway'
     container_name: alkemio_dev_matrix_adapter
     hostname: matrix-adapter
-    image: alkemio/matrix-adapter:v0.4.3
+    image: alkemio/matrix-adapter:v0.4.4
     platform: linux/x86_64
     environment:
       - RABBITMQ_HOST

src/common/enums/alkemio.error.status.ts

@@ -2,6 +2,7 @@ export enum AlkemioErrorStatus {
   AUTHORIZATION_INVALID_POLICY = 'AUTHORIZATION_INVALID_POLICY',
   AUTHORIZATION_RESET = 'AUTHORIZATION_RESET',
   BAD_USER_INPUT = 'BAD_USER_INPUT',
+  INPUT_VALIDATION_ERROR = 'INPUT VALIDATION_ERROR',
   GROUP_NOT_INITIALIZED = 'GROUP_NOT_INITIALIZED',
   ENTITY_NOT_INITIALIZED = 'ENTITY_NOT_INITIALIZED',
   RELATION_NOT_LOADED = 'RELATION_NOT_LOADED',

src/common/exceptions/validation.exception.ts

@@ -1,14 +1,13 @@
-import { LogContext } from '@common/enums';
-import { UserInputError } from './user.input.error';
+import { AlkemioErrorStatus, LogContext } from '@common/enums';
+import { BaseException } from './base.exception';
+import { ExceptionDetails } from './exception.details';
 
-export class ValidationException extends UserInputError {
-  private context: LogContext;
-  constructor(error: string, context: LogContext) {
-    super(error);
-    this.context = context;
-  }
-
-  getContext(): string {
-    return this.context;
+export class ValidationException extends BaseException {
+  constructor(
+    message: string,
+    context: LogContext,
+    details?: ExceptionDetails
+  ) {
+    super(message, context, AlkemioErrorStatus.BAD_USER_INPUT, details);
   }
 }

src/core/authorization/authorization.rule.agent.privilege.ts

@@ -36,8 +36,12 @@ export class AuthorizationRuleAgentPrivilege {
       this.privilege
     );
     if (!accessGranted) {
+      let authorizationID = '';
+      if (this.fieldParent.authorization) {
+        authorizationID = this.fieldParent.authorization.id;
+      }
       const fieldParentType = this.fieldParent.__proto__.constructor.name;
-      const errorMsg = `User (${agentInfo.email}) does not have credentials that grant '${this.privilege}' access to ${fieldParentType}.${this.fieldName}`;
+      const errorMsg = `User (${agentInfo.email}) does not have credentials that grant '${this.privilege}' access to ${fieldParentType}.${this.fieldName} on authorization: ${authorizationID}`;
       this.authorizationService.logCredentialCheckFailDetails(
         errorMsg,
         agentInfo,

src/core/error-handling/graphql.exception.filter.ts

@@ -34,6 +34,7 @@ export class GraphqlExceptionFilter implements GqlExceptionFilter {
       return new GraphQLError(exception.message, {
         extensions: {
           errorId: exception.errorId,
+          code: exception.code,
         },
       });
     }

src/domain/collaboration/callout/callout.service.ts

@@ -163,7 +163,9 @@ export class CalloutService {
     }
     if (!callout)
       throw new EntityNotFoundException(
-        `No Callout found with the given id: ${calloutID}`,
+        `No Callout found with the given id: ${calloutID}, using options: ${JSON.stringify(
+          options
+        )}`,
         LogContext.COLLABORATION
       );
     return callout;

src/services/infrastructure/url-generator/url.generator.service.ts

@@ -624,6 +624,12 @@ export class UrlGeneratorService {
         LogContext.URL_GENERATOR
       );
     }
+    if (!result.collaborationId) {
+      throw new EntityNotFoundException(
+        `Unable to find collaboration for callout with id: ${calloutID}`,
+        LogContext.URL_GENERATOR
+      );
+    }
     const collaborationJourneyUrlPath = await this.getJourneyUrlPath(
       'collaborationId',
       result.collaborationId
@@ -635,6 +641,12 @@ export class UrlGeneratorService {
     fieldName: string,
     fieldID: string
   ): Promise<string> {
+    if (!fieldID || fieldID === 'null') {
+      throw new EntityNotFoundException(
+        `Unable to find journey with ${fieldName}: ${fieldID}`,
+        LogContext.URL_GENERATOR
+      );
+    }
     let collaborationJourneyUrlPath = await this.getSubsubspaceUrlPath(
       fieldName,
       fieldID
@@ -653,7 +665,7 @@ export class UrlGeneratorService {
     }
     if (!collaborationJourneyUrlPath) {
       throw new EntityNotFoundException(
-        `Unable to find url path for collaboration: ${fieldID}`,
+        `Unable to find url path for collaboration: ${fieldName} - ${fieldID}`,
         LogContext.URL_GENERATOR
       );
     }