@boarteam/boar-pack-users-backend 5.4.0 → 6.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-users-backend",
-  "version": "5.4.0",
+  "version": "6.0.0-alpha.0",
   "description": "NestJS Users module including permissions system, authentication strategies etc",
   "main": "src/index",
   "files": [
@@ -14,42 +14,44 @@
     "access": "public"
   },
   "dependencies": {
-    "@boarteam/boar-pack-common-backend": "^2.2.0",
-    "@casl/ability": "^6.7.0",
-    "@nestjs/common": "^9.0.0",
-    "@nestjs/config": "^3.2.0",
-    "@nestjs/core": "^9.0.0",
-    "@nestjs/jwt": "^10.2.0",
-    "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^9.0.0",
-    "@nestjs/schedule": "^4.1.1",
-    "@nestjs/swagger": "^7.3.0",
-    "@nestjs/typeorm": "^10.0.2",
+    "@boarteam/boar-pack-common-backend": "^3.0.0-alpha.0",
+    "@casl/ability": "^6.7.3",
+    "@dataui/crud": "^5.3.4",
+    "@dataui/crud-typeorm": "^5.3.4",
+    "@nestjs/common": "^11.0.10",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.10",
+    "@nestjs/jwt": "^11.0.0",
+    "@nestjs/passport": "^11.0.5",
+    "@nestjs/platform-express": "^11.0.10",
+    "@nestjs/schedule": "^5.0.1",
+    "@nestjs/swagger": "^11.0.4",
+    "@nestjs/typeorm": "^11.0.0",
     "@nestjsx/crud": "^5.0.0-alpha.3",
     "@nestjsx/crud-typeorm": "^5.0.0-alpha.3",
     "bcrypt": "^5.1.1",
-    "joi": "^17.12.2",
+    "joi": "^17.13.3",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "moment-timezone": "^0.5.45",
-    "nestjs-joi": "^1.10.0",
+    "moment-timezone": "^0.5.47",
+    "nestjs-joi": "^1.10.1",
     "openapi-typescript-codegen": "^0.29.0",
     "passport": "^0.7.0",
     "passport-http-bearer": "^1.0.1",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "pg": "^8.13.1",
+    "pg": "^8.13.3",
     "typeorm": "^0.3.20",
-    "ws": "^8.16.0"
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@nestjs/platform-express": "^10.4.15",
     "@types/bcrypt": "^5.0.2",
-    "@types/passport-google-oauth20": "^2.0.14",
+    "@types/passport-google-oauth20": "^2.0.16",
     "@types/passport-http-bearer": "^1.0.41",
     "@types/passport-jwt": "^4.0.1",
     "@types/passport-local": "^1.0.38",
-    "@types/ws": "^8.5.10",
+    "@types/ws": "^8.5.14",
     "class-transformer": "^0.5.1",
     "openapi-typescript-codegen": "^0.29.0",
     "passport-azure-ad-oauth2": "^0.0.4",
@@ -60,5 +62,5 @@
     "yalc:push": "yalc push",
     "gen-types": "SWAGGER=true JWT_SECRET=swagger nest start"
   },
-  "gitHead": "acc7ba1cd1fa8a4972efed9ece60a50740370396"
+  "gitHead": "fe24b636ace6e71cc60a3f65126f8520f926aba1"
 }

package/src/event-logs/entities/event-log.entity.ts

@@ -1,4 +1,4 @@
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn, } from 'typeorm';
+import { Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn, } from 'typeorm';
 import { User } from "../../users";
 
 export enum LogType {
@@ -113,7 +113,6 @@ export class EventLog {
   })
   statusCode: number | null;
 
-  @Index()
   @Column({
     default: 'main'
   })

package/src/event-logs/event-logs.controller.ts

@@ -1,6 +1,6 @@
 import { Controller, Get, Query } from '@nestjs/common';
 import { ApiExtraModels, ApiOkResponse, ApiTags, getSchemaPath } from '@nestjs/swagger';
-import { Crud, CrudController } from '@nestjsx/crud';
+import { Crud, CrudController } from '@dataui/crud';
 import { EventLogsService } from './event-logs.service';
 import { EventLog } from './entities/event-log.entity';
 import { EventLogCreateDto } from './dto/event-log-create.dto';
@@ -65,16 +65,4 @@ export class EventLogsController implements CrudController<EventLog>{
     const end = query.endTime ? new Date(query.endTime) : undefined;
     return this.service.getTimeline(start, end, query.timezone);
   }
-
-  @CheckPolicies(new ViewEventLogsPolicy())
-  @Get('service-names')
-  @ApiOkResponse({
-    schema: {
-      type: 'array',
-      items: { type: 'string' },
-    },
-  })
-  async getServiceNames(): Promise<string[]> {
-    return this.service.getServiceNames();
-  }
 }

package/src/event-logs/event-logs.interceptor.ts

@@ -57,13 +57,17 @@ export class EventLogInterceptor implements NestInterceptor {
         logEntry.duration = Date.now() - now;
         logEntry.statusCode = response.statusCode;
         logEntry.logLevel = response.statusCode >= 500 ? LogLevel.ERROR : (response.statusCode >= 400 ? LogLevel.WARNING : LogLevel.INFO);
-        this.eventLogService.audit(logEntry, request);
+        this.eventLogService.audit(logEntry, request).catch((error) => {
+          this.logger.error(`Failed to log event: ${error.message}`);
+        });
       }),
       catchError((error: HttpException) => {
         logEntry.duration = Date.now() - now;
         logEntry.statusCode = error?.getStatus?.() || 500;
         logEntry.logLevel = logEntry.statusCode >= 500 ? LogLevel.ERROR : LogLevel.WARNING;
-        this.eventLogService.audit(logEntry, request);
+        this.eventLogService.audit(logEntry, request).catch((error) => {
+          this.logger.error(`Failed to log event: ${error.message}`);
+        });
         return throwError(() => error);
       }),
     );

package/src/event-logs/event-logs.middleware.ts

@@ -50,7 +50,9 @@ export class EventLogMiddleware implements NestMiddleware {
             ? LogLevel.WARNING
             : LogLevel.INFO;
 
-      this.eventLogService.audit(logEntry, req);
+      this.eventLogService.audit(logEntry, req).catch((error) => {
+        this.logger.error(`Failed to log event: ${error.message}`);
+      });
     });
 
     next();

package/src/event-logs/event-logs.module.ts

@@ -12,7 +12,6 @@ import { CONFIGURE_EVENTS_MIDDLEWARE, SERVICE_CONFIG_TOKEN } from "./event-logs.
 import { TEventLogServiceConfig } from "./event-logs.types";
 import { EventLogsLogger } from "./event-logs.logger";
 import { EventLogMiddleware } from "./event-logs.middleware";
-import { ScheduleModule } from "@nestjs/schedule";
 
 @Module({})
 export class EventLogsModule implements NestModule {
@@ -50,7 +49,6 @@ export class EventLogsModule implements NestModule {
       module: EventLogsModule,
       imports: [
         CaslModule.forFeature(),
-        ScheduleModule.forRoot(),
         TypeOrmModule.forFeature([EventLog], config.dataSourceName),
       ],
       providers: [

package/src/event-logs/event-logs.service.ts

@@ -1,11 +1,10 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { TypeOrmCrudService } from '@nestjsx/crud-typeorm';
+import { TypeOrmCrudService } from '@dataui/crud-typeorm';
 import { EventLog, LogLevel, LogType, UserRole } from './entities/event-log.entity';
 import { DataSource, Repository } from 'typeorm';
 import { Request } from 'express';
 import { Roles } from "../users";
 import { EventLogTimelineDto } from "./dto/event-log-timeline.dto";
-import { Cron, CronExpression } from "@nestjs/schedule";
 import moment from "moment";
 import 'moment-timezone';
 
@@ -14,7 +13,6 @@ type TInterval = 'second' | 'minute' | 'hour' | 'day' | 'week';
 @Injectable()
 export class EventLogsService extends TypeOrmCrudService<EventLog> {
   private static requestHandled = Symbol('requestHandled');
-  private logsStore: Partial<EventLog>[] = [];
 
   private readonly logger = new Logger(EventLogsService.name);
 
@@ -30,37 +28,7 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
     super(repo);
   }
 
-  @Cron(CronExpression.EVERY_10_SECONDS)
-  private async saveAccumulatedLogs(): Promise<void> {
-    if (this.logsStore.length > 0) {
-      const logs = [...this.logsStore];
-      this.logger.verbose('Reset event logs store variable');
-      this.logsStore = [];
-
-      await this.repo.save(logs).catch(e => {
-        // DO NOT USE LOGGER HERE - it will cause infinite loop
-        console.error('Error while saving logs');
-        console.error(e);
-      });
-    }
-  }
-
-  @Cron(CronExpression.EVERY_WEEK)
-  private async deleteOldEventLogs() {
-    const threeMonthsAgo = new Date();
-    threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 2);
-
-    const result = await this.repo
-      .createQueryBuilder()
-      .delete()
-      .from(EventLog)
-      .where('created_at <= :threeMonthsAgo', { threeMonthsAgo })
-      .execute();
-
-    this.logger.debug(`Removed ${result.affected} expired records from event_logs table.`);
-  }
-
-  audit(eventLog: Partial<EventLog>, request?: Request): void {
+  async audit(eventLog: Partial<EventLog>, request?: Request): Promise<void> {
     // @ts-ignore
     if (request?.[EventLogsService.requestHandled]) {
       this.logger.debug('Request already handled');
@@ -86,7 +54,7 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
       request[EventLogsService.requestHandled] = true;
     }
 
-    this.logsStore.push({
+    await this.repo.save({
       ...logPartial,
       ...eventLog,
       logType: LogType.AUDIT,
@@ -98,9 +66,8 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
     return request?.[EventLogsService.requestHandled];
   }
 
-  // TODO: Remove async in the next major version (breaking change)
   async operationalLog(eventLog: Partial<EventLog>): Promise<void> {
-    this.logsStore.push({
+    await this.repo.save({
       logLevel: LogLevel.INFO,
       userRole: UserRole.SYSTEM,
       ...eventLog,
@@ -109,11 +76,15 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
   }
 
   public applicationLog(eventLog: Partial<EventLog>): void {
-    this.logsStore.push({
+    this.repo.save({
       logLevel: LogLevel.INFO,
       userRole: UserRole.SYSTEM,
       ...eventLog,
       logType: LogType.APPLICATION,
+    }).catch(e => {
+      // DO NOT USE LOGGER HERE - it will cause infinite loop
+      console.error('Error while saving application log');
+      console.error(e);
     });
   }
 
@@ -163,15 +134,6 @@ export class EventLogsService extends TypeOrmCrudService<EventLog> {
     ]);
   }
 
-  async getServiceNames(): Promise<string[]> {
-    const result = await this.repo
-      .createQueryBuilder('event_logs')
-      .select('event_logs.service')
-      .distinctOn(['service'])
-      .getMany();
-    return result.map((data) => data.service);
-  }
-
   private async getOldestLogDate(): Promise<Date> {
     const oldestLog = await this.repo.createQueryBuilder('event_log')
       .select('MIN(event_log.createdAt)', 'min')

package/src/tokens/my-tokens.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Req } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { Crud, CrudAuth, CrudController, type CrudRequest, Override, ParsedRequest } from '@nestjsx/crud';
+import { Crud, CrudAuth, CrudController, type CrudRequest, Override, ParsedRequest } from '@dataui/crud';
 import { TokensService } from './tokens.service';
 import { Token } from './entities/token.entity';
 import { ManageMyTokensPolicy } from "./policies/manage-my-tokens.policy";

package/src/tokens/tokens.controller.ts

@@ -1,6 +1,6 @@
 import { Controller } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { Crud, CrudController } from '@nestjsx/crud';
+import { Crud, CrudController } from '@dataui/crud';
 import { TokensService } from './tokens.service';
 import { Token } from './entities/token.entity';
 import { TokenUpdateDto } from "./dto/token-update.dto";

package/src/tokens/tokens.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { TypeOrmCrudService } from '@nestjsx/crud-typeorm';
+import { TypeOrmCrudService } from '@dataui/crud-typeorm';
 import { Token } from './entities/token.entity';
 import { Repository } from 'typeorm';
 

package/src/users/me.controller.ts

@@ -1,4 +1,4 @@
-import { Crud, CrudAuth, CrudController, type CrudRequest, Override, ParsedRequest, } from '@nestjsx/crud';
+import { Crud, CrudAuth, CrudController, type CrudRequest, Override, ParsedRequest, } from '@dataui/crud';
 import { TUser, User } from './entities/user.entity';
 import { Controller, Req } from '@nestjs/common';
 import type { Request } from 'express';

package/src/users/users-editing.guard.ts

@@ -7,7 +7,7 @@ import {
   Logger,
 } from '@nestjs/common';
 import { Request } from 'express';
-import { getAction } from "@nestjsx/crud";
+import { getAction } from "@dataui/crud";
 import { isEqual } from 'lodash';
 
 @Injectable()

package/src/users/users.controller.ts

@@ -1,6 +1,6 @@
 import { Controller, UseFilters, UseGuards } from '@nestjs/common';
 import { UsersService } from './users.service';
-import { Crud } from '@nestjsx/crud';
+import { Crud } from '@dataui/crud';
 import { User } from './entities/user.entity';
 import { CheckPolicies, ManageAllPolicy } from '../casl';
 import { UserCreateDto } from './dto/user-create.dto';

package/src/users/users.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { TypeOrmCrudService } from '@nestjsx/crud-typeorm';
+import { TypeOrmCrudService } from '@dataui/crud-typeorm';
 import { User } from './entities/user.entity';
 import { Repository } from 'typeorm';