Release 0.43.6

- don't log access denied errors
- performance improvements by not returning all mission details on GET
- improve error messages by verifying arguments passed to kleinkram
- update dependencies

Author: wp99cp

backend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kleinkram-backend",
-    "version": "0.43.5",
+    "version": "0.43.6",
     "description": "",
     "author": "",
     "private": true,
@@ -84,7 +84,7 @@
         "@types/express": "^5.0.0",
         "@types/jest": "^29.5.2",
         "@types/node": "^22.13.10",
-        "@types/supertest": "^6.0.0",
+        "@types/supertest": "^6.0.3",
         "@typescript-eslint/eslint-plugin": "^8.28.0",
         "@typescript-eslint/parser": "^8.25.0",
         "eslint": "^9.22.0",
@@ -98,6 +98,6 @@
         "ts-loader": "^9.4.3",
         "ts-node": "^10.9.1",
         "tsconfig-paths": "^4.2.0",
-        "typescript": "5.7.3"
+        "typescript": "5.8.2"
     }
 }

backend/src/endpoints/action/action.controller.ts

@@ -134,13 +134,6 @@ export class ActionController {
         @Query() dto: ActionQuery,
         @AddUser() auth: AuthHeader,
         // TODO: bring back filter options
-        /* @QuerySortBy('sortBy') sortBy: string,
-        @QuerySortDirection('sortDirection') sortDirection: 'ASC' | 'DESC',
-        @QueryOptionalString(
-            'search',
-            'Searchkey in name, state_cause or image_name',
-        )
-        search: string,*/
     ): Promise<ActionsDto> {
         let missionUuid = dto.mission_uuid;
         if (auth.apikey) {
@@ -152,14 +145,9 @@ export class ActionController {
             auth.user.uuid,
             Number.parseInt((dto.skip ?? 0).toString()),
             Number.parseInt((dto.take ?? 0).toString()),
-            'updatedAt',
-            'ASC',
-            '',
-            /*
-            sortBy,
-            sortDirection,
-            search,
-             */
+            dto.sortBy ?? '',
+            (dto.sortDirection as 'ASC' | 'DESC') ?? 'DESC',
+            dto.search ?? '',
         );
     }
 

backend/src/endpoints/project/project.controller.ts

@@ -33,7 +33,6 @@ import { ApiOkResponse, ApiResponse, OutputDto } from '../../decarators';
 import { DefaultRights } from '@common/api/types/access-control/default-rights';
 import { ResentProjectsDto } from '@common/api/types/project/recent-projects.dto';
 import { ProjectsDto } from '@common/api/types/project/projects.dto';
-import { ProjectWithMissionsDto } from '@common/api/types/project/project-with-missions.dto';
 import { AddUser, AuthHeader } from '../auth/parameter-decorator';
 import { DeleteProjectResponseDto } from '@common/api/types/project/delete-project-response.dto';
 import { UpdateTagTypesDto } from '@common/api/types/update-tag-types.dto';
@@ -44,6 +43,8 @@ import {
     ProjectAccessListDto,
 } from '@common/api/types/access-control/project-access.dto';
 import { AccessService } from '../../services/access.service';
+import { ProjectWithRequiredTags } from '@common/api/types/project/project-with-required-tags';
+import { ProjectDto } from '@common/api/types/project/base-project.dto';
 
 @Controller(['project', 'projects']) // TODO: over time we will migrate to 'projects'
 export class ProjectController {
@@ -56,12 +57,12 @@ export class ProjectController {
     @CanCreate()
     @ApiOkResponse({
         description: 'Returns the updated project',
-        type: ProjectWithMissionsDto,
+        type: ProjectDto,
     })
     async createProject(
         @Body() dto: CreateProject,
         @AddUser() user: AuthHeader,
-    ): Promise<ProjectWithMissionsDto> {
+    ): Promise<ProjectDto> {
         return this.projectService.create(dto, user);
     }
 
@@ -70,24 +71,24 @@ export class ProjectController {
     @CanReadProject()
     @ApiOkResponse({
         description: 'Returns the project',
-        type: ProjectWithMissionsDto,
+        type: ProjectWithRequiredTags,
     })
     async getProjectById(
         @ParameterUID('uuid') uuid: string,
-    ): Promise<ProjectWithMissionsDto> {
+    ): Promise<ProjectWithRequiredTags> {
         return this.projectService.findOne(uuid);
     }
 
     @Put(':uuid')
     @CanWriteProject()
     @ApiOkResponse({
         description: 'Returns the updated project',
-        type: ProjectWithMissionsDto,
+        type: ProjectDto,
     })
     async updateProject(
         @ParameterUID('uuid') uuid: string,
         @Body() dto: CreateProject,
-    ): Promise<ProjectWithMissionsDto> {
+    ): Promise<ProjectDto> {
         return this.projectService.update(uuid, dto);
     }
 

backend/src/routing/filters/global-error-filter.ts

@@ -1,6 +1,8 @@
 import {
     ArgumentsHost,
     BadRequestException,
+    ForbiddenException,
+    UnauthorizedException,
     Catch,
     ExceptionFilter,
 } from '@nestjs/common';
@@ -23,8 +25,36 @@ export class GlobalErrorFilter implements ExceptionFilter {
         response.header('kleinkram-version', appVersion);
         response.header('Access-Control-Expose-Headers', 'kleinkram-version');
 
+        //////////////////////////////
+        // Errors that don't get logged
+        //////////////////////////////
+
+        if (exception.name === 'InvalidJwtTokenException') {
+            response.status(401).json({
+                statusCode: 401,
+                message: 'Invalid JWT token. Are you logged in?',
+            });
+            return;
+        }
+
+        if (
+            exception instanceof ForbiddenException ||
+            exception instanceof UnauthorizedException
+        ) {
+            response.status(exception.getStatus()).json({
+                statusCode: exception.getStatus(),
+                message: exception.message,
+            });
+            return;
+        }
+
+        //////////////////////////////
+        // Errors that get logged
+        //////////////////////////////
+
+        const request: Request = host.switchToHttp().getRequest();
         logger.error(
-            `GlobalErrorFilter: ${exception.name} on kleinkram-version ${appVersion}`,
+            `GlobalErrorFilter: ${exception.name} on kleinkram-version ${appVersion} on endpoint ${request.url} with method ${request.method}`,
         );
         logger.error(exception);
         logger.error(exception.stack);
@@ -54,14 +84,6 @@ export class GlobalErrorFilter implements ExceptionFilter {
             return;
         }
 
-        if (exception.name === 'InvalidJwtTokenException') {
-            response.status(401).json({
-                statusCode: 401,
-                message: 'Invalid JWT token. Are you logged in?',
-            });
-            return;
-        }
-
         if (exception.name === 'PayloadTooLargeError') {
             response.status(413).json({
                 statusCode: 413,

backend/src/serialization.ts

@@ -260,6 +260,24 @@ export const projectEntityToDtoWithMissionCount = (
     };
 };
 
+export const projectEntityToDtoWithRequiredTags = (
+    project: Project,
+    missionCount: number,
+): ProjectWithMissionsDto => {
+    if (project.creator === undefined) {
+        throw new Error('Creator can never be undefined');
+    }
+
+    return {
+        ...(projectEntityToDto(project) as ProjectWithMissionsDto),
+        creator: userEntityToDto(project.creator),
+        missionCount: missionCount,
+        requiredTags: project.requiredTags.map((element) =>
+            tagTypeEntityToDto(element),
+        ),
+    };
+};
+
 export const projectEntityToDtoWithMissions = (
     project: Project,
 ): ProjectWithMissionsDto => {

backend/src/services/project.service.ts

@@ -16,7 +16,7 @@ import {
 } from '@common/frontend_shared/enum';
 import {
     projectEntityToDtoWithMissionCount,
-    projectEntityToDtoWithMissions,
+    projectEntityToDtoWithRequiredTags,
 } from '../serialization';
 import TagType from '@common/entities/tagType/tag-type.entity';
 import ProjectAccess from '@common/entities/auth/project-access.entity';
@@ -27,9 +27,10 @@ import { DefaultRights } from '@common/api/types/access-control/default-rights';
 import { ResentProjectDto } from '@common/api/types/project/recent-projects.dto';
 import { DefaultRightDto } from '@common/api/types/access-control/default-right.dto';
 import { ProjectsDto } from '@common/api/types/project/projects.dto';
-import { ProjectWithMissionsDto } from '@common/api/types/project/project-with-missions.dto';
 import { AuthHeader } from '../endpoints/auth/parameter-decorator';
 import { SortOrder } from '@common/api/types/pagination';
+import { ProjectWithRequiredTags } from '@common/api/types/project/project-with-required-tags';
+import { ProjectDto } from '@common/api/types/project/base-project.dto';
 
 const FIND_MANY_SORT_KEYS = {
     projectName: 'project.name',
@@ -188,23 +189,29 @@ export class ProjectService {
         };
     }
 
-    async findOne(uuid: string): Promise<ProjectWithMissionsDto> {
-        const mission = await this.projectRepository
+    async findOne(uuid: string): Promise<ProjectWithRequiredTags> {
+        const missionPromise = this.projectRepository
             .createQueryBuilder('project')
             .where('project.uuid = :uuid', { uuid })
             .leftJoinAndSelect('project.creator', 'creator')
-            .leftJoinAndSelect('project.missions', 'missions')
-            // TODO: remove the following two joins, there are never used in the frontend...
-            .leftJoinAndSelect('missions.creator', 'mission_creator')
-            .leftJoinAndSelect('missions.project', 'mission_project')
             .leftJoinAndSelect('project.requiredTags', 'requiredTags')
             .leftJoinAndSelect('project.project_accesses', 'project_accesses')
             .leftJoinAndSelect('project_accesses.accessGroup', 'accessGroup')
             .leftJoinAndSelect('accessGroup.memberships', 'memberships')
             .leftJoinAndSelect('memberships.user', 'user')
             .getOneOrFail();
 
-        return projectEntityToDtoWithMissions(mission);
+        const missionCountPromise = this.projectRepository
+            .createQueryBuilder('project')
+            .leftJoin('project.missions', 'missions')
+            .where('project.uuid = :uuid', { uuid })
+            .getCount();
+
+        const [mission, missionCount] = await Promise.all([
+            missionPromise,
+            missionCountPromise,
+        ]);
+        return projectEntityToDtoWithRequiredTags(mission, missionCount);
     }
 
     async getRecentProjects(
@@ -339,7 +346,7 @@ export class ProjectService {
     async create(
         project: CreateProject,
         auth: AuthHeader,
-    ): Promise<ProjectWithMissionsDto> {
+    ): Promise<ProjectDto> {
         const exists = await this.projectRepository.exists({
             where: { name: ILike(project.name) },
         });
@@ -424,13 +431,10 @@ export class ProjectService {
         );
         return (await this.projectRepository.findOneOrFail({
             where: { uuid: transactedProject.uuid },
-        })) as unknown as ProjectWithMissionsDto;
+        })) as unknown as ProjectDto;
     }
 
-    async update(
-        uuid: string,
-        project: CreateProject,
-    ): Promise<ProjectWithMissionsDto> {
+    async update(uuid: string, project: CreateProject): Promise<ProjectDto> {
         const exists = await this.projectRepository.exists({
             where: { name: ILike(project.name), uuid: Not(uuid) },
         });
@@ -449,7 +453,7 @@ export class ProjectService {
         });
         return (await this.projectRepository.findOneOrFail({
             where: { uuid },
-        })) as unknown as ProjectWithMissionsDto;
+        })) as unknown as ProjectDto;
     }
 
     async addTagType(uuid: string, tagTypeUUID: string): Promise<void> {

backend/yarn.lock

@@ -3114,10 +3114,10 @@
     "@types/node" "*"
     form-data "^4.0.0"
 
-"@types/supertest@^6.0.0":
-  version "6.0.2"
-  resolved "https://registry.npmjs.org/@types/supertest/-/supertest-6.0.2.tgz"
-  integrity sha512-137ypx2lk/wTQbW6An6safu9hXmajAifU/s7szAHLN/FeIm5w7yR0Wkl9fdJMRSHwOn4HLAI0DaB2TOORuhPDg==
+"@types/supertest@^6.0.3":
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-6.0.3.tgz#d736f0e994b195b63e1c93e80271a2faf927388c"
+  integrity sha512-8WzXq62EXFhJ7QsH3Ocb/iKQ/Ty9ZVWnVzoTKc9tyyFRRF3a74Tk2+TLFgaFFw364Ere+npzHKEJ6ga2LzIL7w==
   dependencies:
     "@types/methods" "^1.1.4"
     "@types/superagent" "^8.1.0"
@@ -7949,6 +7949,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e"
   integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==
 
+[email protected]:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
+  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
+
 [email protected]:
   version "0.0.4"
   resolved "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz"

cli/kleinkram/api/file_transfer.py

@@ -309,10 +309,10 @@ def download_file(
     if path.exists():
         local_hash = b64_md5(path)
         if local_hash != file.hash and not overwrite and file.hash is not None:
-            return DownloadState.SKIPPED_INVALID_HASH
+            return DownloadState.SKIPPED_INVALID_HASH, 0
 
         elif local_hash == file.hash:
-            return DownloadState.SKIPPED_OK
+            return DownloadState.SKIPPED_OK, 0
 
         # this has to be here
         if verbose: