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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-users-backend",
-  "version": "5.4.0",
+  "version": "6.0.0-alpha.1",
   "description": "NestJS Users module including permissions system, authentication strategies etc",
   "main": "src/index",
   "files": [
@@ -14,51 +14,54 @@
     "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",
     "passport-google-oauth20": "^2.0.0",
+    "passport-yandex": "^0.0.5",
     "pg": "^8.13.1"
   },
   "scripts": {
     "yalc:push": "yalc push",
     "gen-types": "SWAGGER=true JWT_SECRET=swagger nest start"
   },
-  "gitHead": "acc7ba1cd1fa8a4972efed9ece60a50740370396"
+  "gitHead": "79ab6a32f78e67d21f2cc485ecc165861f5c4b8d"
 }

package/src/auth/auth-manage.controller.ts

@@ -3,7 +3,7 @@ import { AuthService } from './auth.service';
 import { tokenName } from './auth.constants';
 import { ApiTags } from '@nestjs/swagger';
 import type { Request, Response } from 'express';
-import { LocalAuthTokenDto } from "./local-auth.dto";
+import { LocalAuthTokenDto } from "./local-auth/local-auth.dto";
 import { CheckPolicies, ManageAllPolicy } from "../casl";
 import { UsersService } from "../users";
 

package/src/auth/auth-strategies.constants.ts

@@ -2,3 +2,5 @@ export const LOCAL_AUTH = 'local';
 export const JWT_AUTH = 'jwt';
 export const GOOGLE_AUTH = 'google';
 export const MS_AUTH = 'azure-ad';
+
+export const YANDEX_AUTH = 'yandex';

package/src/auth/auth.controller.ts

@@ -1,37 +1,17 @@
-import { Body, Controller, Get, Post, Req, Res, UnauthorizedException, UseFilters, UseGuards, } from '@nestjs/common';
-import { LocalAuthGuard } from './local-auth.guard';
+import { Controller, Post, Req, Res, UnauthorizedException, UseGuards } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import type { Request, Response } from 'express';
 import { AuthService } from './auth.service';
 import { tokenName } from './auth.constants';
 import { JwtAuthGuard, SkipJWTGuard } from '../jwt-auth/jwt-auth.guard';
 import { SkipPoliciesGuard } from '../casl/policies.guard';
-import { GoogleAuthGuard } from './google-auth.guard';
-import { AuthExceptionFilter } from './google-auth.filter';
-import { ApiExtraModels, ApiTags } from '@nestjs/swagger';
-import type { Request, Response } from 'express';
-import { LocalAuthLoginDto, LocalAuthTokenDto } from "./local-auth.dto";
-import { MSAuthGuard } from "./ms-auth.guard";
+import { LocalAuthTokenDto } from "./local-auth/local-auth.dto";
 
 @SkipPoliciesGuard()
 @ApiTags('Authentication')
-@ApiExtraModels(LocalAuthTokenDto)
 @Controller('auth')
 export default class AuthController {
-  constructor(private authService: AuthService) {}
-
-  @SkipJWTGuard()
-  @UseGuards(LocalAuthGuard)
-  @Post('login')
-  async login(
-    @Req() req: Request,
-    @Res({ passthrough: true }) res: Response,
-    @Body() body: LocalAuthLoginDto,
-  ): Promise<LocalAuthTokenDto> {
-    if (!req.user) {
-      throw new UnauthorizedException(`User is not authorized`);
-    }
-    const loginResult = await this.authService.login(req.user);
-    res.cookie(tokenName, loginResult.accessToken);
-    return loginResult;
+  constructor(private authService: AuthService) {
   }
 
   @Post('token')
@@ -45,50 +25,6 @@ export default class AuthController {
     return this.authService.login(req.user);
   }
 
-  @SkipJWTGuard()
-  @UseGuards(GoogleAuthGuard)
-  @Get('google')
-  async loginGoogle() {}
-
-  @SkipJWTGuard()
-  @UseGuards(GoogleAuthGuard)
-  @UseFilters(AuthExceptionFilter)
-  @Get('google/callback')
-  async loginGoogleCallback(
-    @Req() req: Request,
-    @Res({ passthrough: true }) res: Response,
-  ) {
-    if (!req.user) {
-      throw new UnauthorizedException(`User is not authorized`);
-    }
-
-    const loginResult = await this.authService.login(req.user);
-    res.cookie(tokenName, loginResult.accessToken);
-    res.redirect('/');
-  }
-
-  @SkipJWTGuard()
-  @UseGuards(MSAuthGuard)
-  @Get('ms')
-  async loginMS() {}
-
-  @SkipJWTGuard()
-  @UseGuards(MSAuthGuard)
-  @UseFilters(AuthExceptionFilter)
-  @Get('ms/callback')
-  async loginMSCallback(
-    @Req() req: Request,
-    @Res({ passthrough: true }) res: Response,
-  ) {
-    if (!req.user) {
-      throw new UnauthorizedException(`User is not authorized`);
-    }
-
-    const loginResult = await this.authService.login(req.user);
-    res.cookie(tokenName, loginResult.accessToken);
-    res.redirect('/');
-  }
-
   @SkipJWTGuard()
   @Post('logout')
   async logout(

package/src/auth/auth.module.ts

@@ -1,26 +1,33 @@
 import { DynamicModule, Module } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { UsersModule } from '../users/users.module';
-import { LocalAuthStrategy } from './local-auth.strategy';
+import { LocalAuthStrategy } from './local-auth/local-auth.strategy';
 import { PassportModule } from '@nestjs/passport';
 import AuthController from './auth.controller';
 import { ConfigModule } from '@nestjs/config';
-import { GoogleAuthStrategy } from './google-auth.strategy';
-import { GoogleAuthConfigService } from "./google-auth.config";
-import { MSAuthStrategy } from './ms-auth.strategy';
-import { MSAuthConfigService } from "./ms-auth.config";
+import { GoogleAuthStrategy } from './google/google-auth.strategy';
+import { GoogleAuthConfigService } from "./google/google-auth.config";
+import { MSAuthStrategy } from './microsoft/ms-auth.strategy';
+import { MSAuthConfigService } from "./microsoft/ms-auth.config";
 import { JwtAuthModule } from "../jwt-auth/jwt-auth.module";
 import { APP_GUARD } from "@nestjs/core";
 import { JwtAuthGuard } from "../jwt-auth/jwt-auth.guard";
 import AuthManageController from "./auth-manage.controller";
+import GoogleAuthController from "./google/google-auth.controller";
+import MsAuthController from "./microsoft/ms-auth.controller";
+import LocalAuthController from "./local-auth/local-auth.controller";
+import { YandexAuthStrategy } from "./yandex/yandex-auth.strategy";
+import { YandexAuthConfigService } from "./yandex/yandex-auth.config";
+import YandexAuthController from "./yandex/yandex-auth.controller";
 
 @Module({})
 export class AuthModule {
   static forRoot(config: {
-    googleAuth: boolean,
-    msAuth: boolean,
-    localAuth: boolean,
-    withControllers: boolean,
+    googleAuth?: boolean,
+    msAuth?: boolean,
+    yandexAuth?: boolean,
+    localAuth?: boolean,
+    withControllers?: boolean,
     dataSourceName?: string;
   }): DynamicModule {
     const dynamicModule: DynamicModule = {
@@ -47,20 +54,30 @@ export class AuthModule {
       exports: [],
     };
 
+    const controllers = [];
     if (config.googleAuth) {
       dynamicModule.providers!.push(GoogleAuthConfigService, GoogleAuthStrategy);
+      controllers.push(GoogleAuthController);
     }
 
     if (config.msAuth) {
       dynamicModule.providers!.push(MSAuthConfigService, MSAuthStrategy);
+      controllers.push(MsAuthController);
+    }
+
+    if (config.yandexAuth) {
+      dynamicModule.providers!.push(YandexAuthConfigService, YandexAuthStrategy);
+      controllers.push(YandexAuthController);
     }
 
     if (config.localAuth) {
       dynamicModule.providers!.push(LocalAuthStrategy);
+      controllers.push(LocalAuthController);
     }
 
     if (config.withControllers) {
       dynamicModule.controllers = [
+        ...controllers,
         AuthController,
         AuthManageController,
       ];

package/src/auth/auth.service.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { TUser, UsersService } from '../users';
 import { JWTAuthService, TJWTPayload } from '../jwt-auth';
 import bcrypt from 'bcrypt';
-import { LocalAuthTokenDto } from "./local-auth.dto";
+import { LocalAuthTokenDto } from "./local-auth/local-auth.dto";
 
 declare global {
   namespace Express {

package/src/auth/google/google-auth.config.ts

@@ -0,0 +1,26 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+export type TGoogleAuthConfig = {
+  clientId: string;
+  clientSecret: string;
+  callbackURL: string;
+};
+
+@Injectable()
+export class GoogleAuthConfigService {
+  constructor(private configService: ConfigService) {
+  }
+
+  get config(): TGoogleAuthConfig {
+    const clientId = this.configService.getOrThrow<string>('GOOGLE_CLIENT_ID');
+    const clientSecret = this.configService.getOrThrow<string>('GOOGLE_SECRET_ID');
+    const callbackURL = this.configService.getOrThrow<string>('GOOGLE_CALLBACK_URL');
+
+    return {
+      clientId,
+      clientSecret,
+      callbackURL,
+    };
+  }
+}

package/src/auth/google/google-auth.controller.ts

@@ -0,0 +1,40 @@
+import { Controller, Get, Req, Res, UnauthorizedException, UseFilters, UseGuards } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import type { Request, Response } from 'express';
+import { AuthService } from '../auth.service';
+import { tokenName } from '../auth.constants';
+import { SkipJWTGuard } from '../../jwt-auth/jwt-auth.guard';
+import { SkipPoliciesGuard } from '../../casl/policies.guard';
+import { GoogleAuthGuard } from './google-auth.guard';
+import { AuthExceptionFilter } from '../auth.exception-filter';
+
+@SkipPoliciesGuard()
+@ApiTags('Authentication')
+@Controller('auth/google')
+export default class GoogleAuthController {
+  constructor(private authService: AuthService) {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(GoogleAuthGuard)
+  @Get('')
+  async loginGoogle() {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(GoogleAuthGuard)
+  @UseFilters(AuthExceptionFilter)
+  @Get('callback')
+  async loginGoogleCallback(
+    @Req() req: Request,
+    @Res({ passthrough: true }) res: Response,
+  ) {
+    if (!req.user) {
+      throw new UnauthorizedException(`User is not authorized`);
+    }
+
+    const loginResult = await this.authService.login(req.user);
+    res.cookie(tokenName, loginResult.accessToken);
+    res.redirect('/');
+  }
+}

package/src/auth/{google-auth.guard.ts → google/google-auth.guard.ts}

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { GOOGLE_AUTH } from './auth-strategies.constants';
+import { GOOGLE_AUTH } from '../auth-strategies.constants';
 
 @Injectable()
 export class GoogleAuthGuard extends AuthGuard(GOOGLE_AUTH) {}

package/src/auth/{google-auth.strategy.ts → google/google-auth.strategy.ts}

@@ -6,8 +6,8 @@ import {
   Logger,
   UnauthorizedException,
 } from '@nestjs/common';
-import { AuthService } from './auth.service';
-import { GOOGLE_AUTH } from './auth-strategies.constants';
+import { AuthService } from '../auth.service';
+import { GOOGLE_AUTH } from '../auth-strategies.constants';
 import { GoogleAuthConfigService } from "./google-auth.config";
 
 @Injectable()

package/src/auth/index.ts

@@ -3,13 +3,13 @@ export * from './auth.controller';
 export * from './auth.module';
 export * from './auth.service';
 export * from './auth-strategies.constants';
-export * from './google-auth.config';
-export * from './google-auth.filter';
-export * from './google-auth.guard';
-export * from './google-auth.strategy';
-export * from './local-auth.dto';
-export * from './local-auth.guard';
-export * from './local-auth.strategy';
-export * from './ms-auth.config';
-export * from './ms-auth.guard';
-export * from './ms-auth.strategy';
+export * from './google/google-auth.config';
+export * from './auth.exception-filter';
+export * from './google/google-auth.guard';
+export * from './google/google-auth.strategy';
+export * from './local-auth/local-auth.dto';
+export * from './local-auth/local-auth.guard';
+export * from './local-auth/local-auth.strategy';
+export * from './microsoft/ms-auth.config';
+export * from './microsoft/ms-auth.guard';
+export * from './microsoft/ms-auth.strategy';

package/src/auth/local-auth/local-auth.controller.ts

@@ -0,0 +1,34 @@
+import { Body, Controller, Post, Req, Res, UnauthorizedException, UseGuards } from '@nestjs/common';
+import { ApiExtraModels, ApiTags } from '@nestjs/swagger';
+import type { Request, Response } from 'express';
+import { LocalAuthGuard } from './local-auth.guard';
+import { AuthService } from '../auth.service';
+import { tokenName } from '../auth.constants';
+import { SkipJWTGuard } from '../../jwt-auth/jwt-auth.guard';
+import { SkipPoliciesGuard } from '../../casl/policies.guard';
+import { LocalAuthLoginDto, LocalAuthTokenDto } from "./local-auth.dto";
+
+@SkipPoliciesGuard()
+@ApiTags('Authentication')
+@ApiExtraModels(LocalAuthTokenDto)
+@Controller('auth')
+export default class LocalAuthController {
+  constructor(private authService: AuthService) {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(LocalAuthGuard)
+  @Post('login')
+  async login(
+    @Req() req: Request,
+    @Res({ passthrough: true }) res: Response,
+    @Body() body: LocalAuthLoginDto,
+  ): Promise<LocalAuthTokenDto> {
+    if (!req.user) {
+      throw new UnauthorizedException(`User is not authorized`);
+    }
+    const loginResult = await this.authService.login(req.user);
+    res.cookie(tokenName, loginResult.accessToken);
+    return loginResult;
+  }
+}

package/src/auth/{local-auth.guard.ts → local-auth/local-auth.guard.ts}

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { LOCAL_AUTH } from './auth-strategies.constants';
+import { LOCAL_AUTH } from '../auth-strategies.constants';
 
 @Injectable()
 export class LocalAuthGuard extends AuthGuard(LOCAL_AUTH) {}

package/src/auth/{local-auth.strategy.ts → local-auth/local-auth.strategy.ts}

@@ -1,9 +1,9 @@
 import { Strategy } from 'passport-local';
 import { PassportStrategy } from '@nestjs/passport';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
-import { AuthService } from './auth.service';
-import { TUser } from '../users';
-import { LOCAL_AUTH } from './auth-strategies.constants';
+import { AuthService } from '../auth.service';
+import { TUser } from '../../users';
+import { LOCAL_AUTH } from '../auth-strategies.constants';
 
 @Injectable()
 export class LocalAuthStrategy extends PassportStrategy(Strategy, LOCAL_AUTH) {

package/src/auth/microsoft/ms-auth.config.ts

@@ -0,0 +1,29 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+export type TMSAuthConfig = {
+  clientId: string;
+  tenantId: string;
+  clientSecret: string;
+  callbackURL: string;
+};
+
+@Injectable()
+export class MSAuthConfigService {
+  constructor(private configService: ConfigService) {
+  }
+
+  get config(): TMSAuthConfig {
+    const clientId = this.configService.getOrThrow<string>('MICROSOFT_CLIENT_ID');
+    const tenantId = this.configService.getOrThrow<string>('MICROSOFT_TENANT_ID');
+    const clientSecret = this.configService.getOrThrow<string>('MICROSOFT_SECRET_ID');
+    const callbackURL = this.configService.getOrThrow<string>('MICROSOFT_CALLBACK_URL');
+
+    return {
+      clientId,
+      tenantId,
+      clientSecret,
+      callbackURL,
+    };
+  }
+}

package/src/auth/microsoft/ms-auth.controller.ts

@@ -0,0 +1,40 @@
+import { Controller, Get, Req, Res, UnauthorizedException, UseFilters, UseGuards } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import type { Request, Response } from 'express';
+import { AuthService } from '../auth.service';
+import { tokenName } from '../auth.constants';
+import { SkipJWTGuard } from '../../jwt-auth/jwt-auth.guard';
+import { SkipPoliciesGuard } from '../../casl/policies.guard';
+import { AuthExceptionFilter } from '../auth.exception-filter';
+import { MSAuthGuard } from "./ms-auth.guard";
+
+@SkipPoliciesGuard()
+@ApiTags('Authentication')
+@Controller('auth/ms')
+export default class MsAuthController {
+  constructor(private authService: AuthService) {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(MSAuthGuard)
+  @Get('')
+  async loginMS() {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(MSAuthGuard)
+  @UseFilters(AuthExceptionFilter)
+  @Get('callback')
+  async loginMSCallback(
+    @Req() req: Request,
+    @Res({ passthrough: true }) res: Response,
+  ) {
+    if (!req.user) {
+      throw new UnauthorizedException(`User is not authorized`);
+    }
+
+    const loginResult = await this.authService.login(req.user);
+    res.cookie(tokenName, loginResult.accessToken);
+    res.redirect('/');
+  }
+}

package/src/auth/{ms-auth.guard.ts → microsoft/ms-auth.guard.ts}

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { MS_AUTH } from './auth-strategies.constants';
+import { MS_AUTH } from '../auth-strategies.constants';
 
 @Injectable()
 export class MSAuthGuard extends AuthGuard(MS_AUTH) {

package/src/auth/{ms-auth.strategy.ts → microsoft/ms-auth.strategy.ts}

@@ -1,9 +1,9 @@
 import { PassportStrategy } from '@nestjs/passport';
 import { Injectable, InternalServerErrorException, Logger, UnauthorizedException, } from '@nestjs/common';
-import { AuthService } from './auth.service';
-import { MS_AUTH } from './auth-strategies.constants';
+import { AuthService } from '../auth.service';
+import { MS_AUTH } from '../auth-strategies.constants';
 import { MSAuthConfigService } from "./ms-auth.config";
-import { JWTAuthService } from "../jwt-auth/jwt-auth.service";
+import { JWTAuthService } from "../../jwt-auth/jwt-auth.service";
 
 // @ts-ignore-next-line There are no types for this package
 import { Strategy, VerifyCallback } from 'passport-azure-ad-oauth2';

package/src/auth/yandex/yandex-auth.config.ts

@@ -0,0 +1,26 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+
+export type TYandexAuthConfig = {
+  clientId: string;
+  clientSecret: string;
+  callbackURL: string;
+};
+
+@Injectable()
+export class YandexAuthConfigService {
+  constructor(private configService: ConfigService) {
+  }
+
+  get config(): TYandexAuthConfig {
+    const clientId = this.configService.getOrThrow<string>('YANDEX_CLIENT_ID');
+    const clientSecret = this.configService.getOrThrow<string>('YANDEX_SECRET_ID');
+    const callbackURL = this.configService.getOrThrow<string>('YANDEX_CALLBACK_URL');
+
+    return {
+      clientId,
+      clientSecret,
+      callbackURL,
+    };
+  }
+}

package/src/auth/yandex/yandex-auth.controller.ts

@@ -0,0 +1,40 @@
+import { Controller, Get, Req, Res, UnauthorizedException, UseFilters, UseGuards } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import type { Request, Response } from 'express';
+import { AuthService } from '../auth.service';
+import { tokenName } from '../auth.constants';
+import { SkipJWTGuard } from '../../jwt-auth/jwt-auth.guard';
+import { SkipPoliciesGuard } from '../../casl/policies.guard';
+import { YandexAuthGuard } from './yandex-auth.guard';
+import { AuthExceptionFilter } from '../auth.exception-filter';
+
+@SkipPoliciesGuard()
+@ApiTags('Authentication')
+@Controller('auth/yandex')
+export default class YandexAuthController {
+  constructor(private authService: AuthService) {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(YandexAuthGuard)
+  @Get('')
+  async loginYandex() {
+  }
+
+  @SkipJWTGuard()
+  @UseGuards(YandexAuthGuard)
+  @UseFilters(AuthExceptionFilter)
+  @Get('callback')
+  async loginYandexCallback(
+    @Req() req: Request,
+    @Res({ passthrough: true }) res: Response,
+  ) {
+    if (!req.user) {
+      throw new UnauthorizedException(`User is not authorized`);
+    }
+
+    const loginResult = await this.authService.login(req.user);
+    res.cookie(tokenName, loginResult.accessToken);
+    res.redirect('/');
+  }
+}

package/src/auth/yandex/yandex-auth.guard.ts

@@ -0,0 +1,6 @@
+import { Injectable } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+import { YANDEX_AUTH } from '../auth-strategies.constants';
+
+@Injectable()
+export class YandexAuthGuard extends AuthGuard(YANDEX_AUTH) {}

package/src/auth/yandex/yandex-auth.strategy.ts

@@ -0,0 +1,59 @@
+import { Strategy } from 'passport-yandex';
+import { PassportStrategy } from '@nestjs/passport';
+import {
+  Injectable,
+  InternalServerErrorException,
+  Logger,
+  UnauthorizedException,
+} from '@nestjs/common';
+import { AuthService } from '../auth.service';
+import { YANDEX_AUTH } from '../auth-strategies.constants';
+import { YandexAuthConfigService } from "./yandex-auth.config";
+import { TUser } from "../../users";
+
+@Injectable()
+export class YandexAuthStrategy extends PassportStrategy(
+  Strategy,
+  YANDEX_AUTH,
+) {
+  private readonly logger = new Logger(YandexAuthStrategy.name);
+
+  constructor(
+    private authService: AuthService,
+    private yandexAuthConfigService: YandexAuthConfigService,
+  ) {
+    const config = yandexAuthConfigService.config;
+    super({
+      clientID: config.clientId,
+      clientSecret: config.clientSecret,
+      callbackURL: config.callbackURL,
+    });
+  }
+
+  async validate(
+    accessToken: string,
+    refreshToken: string,
+    profile: { emails: { value: string; verified: boolean }[] },
+    callback: (error: Error | null, user?: TUser | null) => void,
+  ): Promise<any> {
+    try {
+      const user = await this.authService.validateUserByEmail(
+        profile.emails[0].value,
+      );
+
+      if (!user) {
+        callback(new UnauthorizedException('User is not found'));
+        return;
+      }
+
+      callback(null, user);
+    } catch (e) {
+      this.logger.error(e, e.stack);
+      callback(
+        new InternalServerErrorException(
+          'Impossible to log in user via yandex',
+        ),
+      );
+    }
+  }
+}

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';
 

package/src/auth/google-auth.config.ts

@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-
-export type TGoogleAuthConfig = {
-  clientId: string;
-  clientSecret: string;
-  callbackURL: string;
-};
-
-@Injectable()
-export class GoogleAuthConfigService {
-  constructor(private configService: ConfigService) {
-  }
-
-  get config(): TGoogleAuthConfig {
-    const clientId = this.configService.get<string>('GOOGLE_CLIENT_ID');
-    const clientSecret = this.configService.get<string>('GOOGLE_SECRET_ID');
-    const callbackURL = this.configService.get<string>('GOOGLE_CALLBACK_URL');
-
-    if (!clientId) {
-      throw new Error('GOOGLE_CLIENT_ID is not defined');
-    }
-
-    if (!clientSecret) {
-      throw new Error('GOOGLE_SECRET_ID is not defined');
-    }
-
-    if (!callbackURL) {
-      throw new Error('GOOGLE_CALLBACK_URL is not defined');
-    }
-
-    return {
-      clientId,
-      clientSecret,
-      callbackURL,
-    };
-  }
-}

package/src/auth/ms-auth.config.ts

@@ -1,45 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-
-export type TMSAuthConfig = {
-  clientId: string;
-  tenantId: string;
-  clientSecret: string;
-  callbackURL: string;
-};
-
-@Injectable()
-export class MSAuthConfigService {
-  constructor(private configService: ConfigService) {
-  }
-
-  get config(): TMSAuthConfig {
-    const clientId = this.configService.get<string>('MICROSOFT_CLIENT_ID');
-    const tenantId = this.configService.get<string>('MICROSOFT_TENANT_ID');
-    const clientSecret = this.configService.get<string>('MICROSOFT_SECRET_ID');
-    const callbackURL = this.configService.get<string>('MICROSOFT_CALLBACK_URL');
-
-    if (!clientId) {
-      throw new Error('MICROSOFT_CLIENT_ID is not defined');
-    }
-
-    if (!tenantId) {
-      throw new Error('MICROSOFT_TENANT_ID is not defined');
-    }
-
-    if (!clientSecret) {
-      throw new Error('MICROSOFT_SECRET_ID is not defined');
-    }
-
-    if (!callbackURL) {
-      throw new Error('MICROSOFT_CALLBACK_URL is not defined');
-    }
-
-    return {
-      clientId,
-      tenantId,
-      clientSecret,
-      callbackURL,
-    };
-  }
-}