Merge pull request #19 from Bricks666/develop

Develop
Bricks666 · Jan 27, 2024 · ca13068 · ca13068
2 parents b643b1e + 6515434
commit ca13068
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/src/auth/controllers/auth.controller.ts b/src/auth/controllers/auth.controller.ts
@@ -31,7 +31,7 @@ import {
 	LoginRequestDto,
 	TokensDto
 } from '../dto';
-import { DisableAuthCheck } from '../lib';
+import { DisableAuthCheck, DisableIsActivatedCheck } from '../lib';
 
 @ApiTags('Авторизация')
 @Controller('auth')
@@ -45,6 +45,7 @@ export class AuthController {
 		type: AuthenticationResultDto,
 	})
 	@ApiCookieAuth()
+	@DisableIsActivatedCheck()
 	@DisableAuthCheck()
 	@Get('/')
 	async authentication(
@@ -73,6 +74,7 @@ export class AuthController {
 		type: SecurityUserDto,
 		description: 'Подтверждение успешности регистрации',
 	})
+	@DisableIsActivatedCheck()
 	@DisableAuthCheck()
 	@Post('registration')
 	async registration(@Body() body: CreateUserDto): Promise<SecurityUserDto> {
@@ -95,6 +97,7 @@ export class AuthController {
 	@ApiNotFoundResponse({
 		description: 'Пользователь не найден',
 	})
+	@DisableIsActivatedCheck()
 	@DisableAuthCheck()
 	@Put('registration/activate')
 	async activate(@Query('token') token: string): Promise<boolean> {
@@ -107,6 +110,7 @@ export class AuthController {
 		type: AuthenticationResultDto,
 		description: 'Данные пользователя и пара токенов',
 	})
+	@DisableIsActivatedCheck()
 	@DisableAuthCheck()
 	@Post('login')
 	async login(

diff --git a/src/auth/lib/activated/is-activated.guard.ts b/src/auth/lib/activated/is-activated.guard.ts
@@ -1,14 +1,8 @@
-import {
-	CanActivate,
-	ExecutionContext,
-	Injectable,
-	InternalServerErrorException
-} from '@nestjs/common';
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { Request } from 'express';
 import { SecurityUserDto } from '@/users/dto';
 import { UsersService } from '@/users/services';
-import { DISABLE_AUTH_CHECK_FLAG } from '../auth';
 import { DISABLE_IS_ACTIVATED_FLAG } from './config';
 
 @Injectable()
@@ -19,15 +13,10 @@ export class IsActivatedGuard implements CanActivate {
 	) {}
 
 	async canActivate(context: ExecutionContext): Promise<boolean> {
-		const disable =
-			this.reflector.get<boolean | undefined>(
-				DISABLE_IS_ACTIVATED_FLAG,
-				context.getHandler()
-			) ||
-			this.reflector.get<boolean | undefined>(
-				DISABLE_AUTH_CHECK_FLAG,
-				context.getHandler()
-			);
+		const disable = this.reflector.getAllAndOverride<boolean | undefined>(
+			DISABLE_IS_ACTIVATED_FLAG,
+			[context.getHandler(), context.getClass()]
+		);
 
 		if (disable) {
 			return true;
@@ -37,9 +26,7 @@ export class IsActivatedGuard implements CanActivate {
 		const user = (req as any).user as SecurityUserDto;
 
 		if (!user) {
-			throw new InternalServerErrorException(
-				'Is activated must be used only with authorized users'
-			);
+			return true;
 		}
 
 		return this.usersService.isActivated({ id: user.id, });

diff --git a/src/auth/services/auth/auth.service.ts b/src/auth/services/auth/auth.service.ts
@@ -76,13 +76,17 @@ export class AuthService {
 
 		const user = await this.usersService.getInsecure({ email, });
 
+		if (!user.activated) {
+			throw new ConflictException('User is not activated');
+		}
+
 		const isValidPassword = await compare(password, user.password);
 
 		if (!isValidPassword) {
 			throw new ForbiddenException('Incorrect password');
 		}
 
-		user.password = undefined;
+		delete user.password;
 
 		const tokens = await this.#generateTokens(user);
 

diff --git a/src/shared/lib/cookie.decorator.ts b/src/shared/lib/cookie.decorator.ts
@@ -5,8 +5,6 @@ export const Cookie = createParamDecorator<string, ExecutionContext>(
 	(cookie, context) => {
 		const req: Request = context.switchToHttp().getRequest();
 
-		console.log(req.cookies);
-
 		return req.cookies[cookie] ?? null;
 	}
 );