Fix/current fix

docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.8'
 services:
   api:
     container_name: ionicapp_api
+    restart: unless-stopped
     depends_on:
       - postgres
     build:  
@@ -22,6 +23,7 @@ services:
 
   postgres:
     container_name: ionicapp_postgres
+    restart: unless-stopped
     build:
       dockerfile: docker/postgres/Dockerfile
     environment:
@@ -48,6 +50,7 @@ services:
 
   redis:
     container_name: ionicapp_redis
+    restart: unless-stopped
     image: redis:alpine
     ports:
       - ${REDIS_PORT}:6379

src/dto/id-number.dto.ts

@@ -8,5 +8,5 @@ export class IdNumberDto {
   @IsPositive()
   @Expose()
   @ApiProperty({ example: 1 })
-  id: number;
+  id!: number;
 }

src/entities/user.entity.ts

@@ -10,26 +10,26 @@ export class User {
     unique: true,
     generated: 'uuid',
   })
-  id: string;
+  id!: string;
 
   @Column({
     type: 'varchar',
     length: 255,
     nullable: false,
   })
-  password: string;
+  password!: string;
 
   @Column({
     type: 'varchar',
     length: 255,
     nullable: false,
   })
-  name: string;
+  name!: string;
 
   @Column({
     type: 'varchar',
     length: 255,
     nullable: false,
   })
-  email: string;
+  email!: string;
 }

src/helpers/system.ts

@@ -5,3 +5,10 @@ export const encodePassword = async (passwordRaw: string): Promise<string> => {
   const salt = await bcrypt.genSalt(Number(b));
   return await bcrypt.hash(passwordRaw, salt);
 };
+
+export const checkPassword = async (
+  password: string,
+  hashedPassword: string,
+): Promise<boolean> => {
+  return bcrypt.compare(password, hashedPassword);
+};

src/main.ts

@@ -16,6 +16,7 @@ async function bootstrap(): Promise<void> {
   const corsOrigins = configService.get<string>('SITE_ORIGIN');
   const corsOriginsArray = corsOrigins?.split(',').filter(Boolean) ?? [];
 
+  app.setGlobalPrefix('api');
   app.useGlobalPipes(new ValidationPipe(validationPipeConfig));
 
   app.enableShutdownHooks();
@@ -33,7 +34,7 @@ async function bootstrap(): Promise<void> {
       .addBearerAuth()
       .build();
     const document = SwaggerModule.createDocument(app, swaggerConfig);
-    SwaggerModule.setup('api/docs', app, document, {
+    SwaggerModule.setup('docs', app, document, {
       swaggerOptions: { persistAuthorization: true },
     });
   }

src/modules/auth/auth.service.ts

@@ -12,6 +12,7 @@ import {
   AccessForbiddenException,
   AccessTokenGenerationException,
 } from '../../exceptions/access-exceptions';
+import { checkPassword } from '../../helpers/system';
 
 @Injectable()
 export class AuthService {
@@ -27,33 +28,24 @@ export class AuthService {
     return this.jwtService.signAsync(payload, options);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async validateUser(email: string, _password: string): Promise<User> {
+  async validateUser(email: string, password: string): Promise<User> {
     const user: User | null = await this.usersRepository.findOneBy({
       email,
     });
-
     if (!user) {
       throw new AccessForbiddenException('Invalid login or password');
     }
-
-    // use mocked (simplified) auth - allow all users regardles of password
-    // TODO: remove this after real auth implementation
-
-    // const passwordIsValid = await this.hashService.compareHashed(
-    //   password,
-    //   user.password,
-    // );
-    // if (!passwordIsValid) {
-    //   throw new AccessForbiddenException('Invalid login or password');
-    // }
+    const passwordIsValid = await checkPassword(password, user.password);
+    if (!passwordIsValid) {
+      throw new AccessForbiddenException('Invalid login or password');
+    }
 
     return user;
   }
 
   async signin(payloadUser: JwtUserPayloadDto): Promise<ResponseTokenDto> {
     const dbUser: User | null = await this.usersRepository.findOneBy({
-      id: payloadUser._id,
+      id: payloadUser.id,
     });
 
     if (!dbUser) {
@@ -67,11 +59,11 @@ export class AuthService {
     userPayload: JwtUserPayloadDto,
   ): Promise<ResponseTokenDto> {
     const accessToken = await this.generateAccessToken({
-      sub: userPayload._id,
+      sub: userPayload.id,
     });
 
     const refreshToken = await this.generateRefreshToken({
-      sub: userPayload._id,
+      sub: userPayload.id,
     });
 
     return { accessToken, refreshToken };
@@ -112,21 +104,21 @@ export class AuthService {
         expiresIn,
       });
     } catch (e) {
-      throw new AccessTokenGenerationException(e.message);
+      throw new AccessTokenGenerationException((e as Error)?.message);
     }
   }
 
   async refresh(payloadUser: JwtUserPayloadDto): Promise<ResponseTokenDto> {
     const dbUser: User | null = await this.usersRepository.findOneBy({
-      id: payloadUser._id,
+      id: payloadUser.id,
     });
 
     if (!dbUser) {
       throw new AccessForbiddenException('access denied');
     }
 
     const updatedPayload: JwtUserPayloadDto = {
-      _id: String(dbUser.id),
+      id: String(dbUser.id),
     };
 
     return this.generateTokens(updatedPayload);

src/modules/auth/dto/auth.dto.ts

@@ -4,9 +4,9 @@ import { IsString } from 'class-validator';
 export class AuthDto {
   @ApiProperty({ example: 'admin@test.com' })
   @IsString()
-  email: string;
+  email!: string;
 
   @ApiProperty({ example: 'asdfasdf' })
   @IsString()
-  password: string;
+  password!: string;
 }

src/modules/auth/dto/jwt-user-payload.dto.ts

@@ -1,3 +1,3 @@
 export class JwtUserPayloadDto {
-  _id: string;
+  id!: string;
 }

src/modules/auth/dto/response-token.dto.ts

@@ -6,10 +6,10 @@ export class ResponseTokenDto {
   @ApiProperty()
   @IsString()
   @Expose()
-  accessToken: string;
+  accessToken!: string;
 
   @ApiProperty()
   @IsString()
   @Expose()
-  refreshToken: string;
+  refreshToken!: string;
 }

src/modules/auth/strategy/jwt-refresh.strategy.ts

@@ -23,6 +23,6 @@ export class JwtRefreshStrategy extends PassportStrategy(
   }
 
   validate(req: Request, payload: JwtPayload): JwtUserPayloadDto {
-    return { _id: payload.sub };
+    return { id: payload.sub };
   }
 }

src/modules/auth/strategy/jwt.strategy.ts

@@ -20,6 +20,6 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
   }
 
   validate(payload: JwtPayload): JwtUserPayloadDto {
-    return { _id: payload.sub };
+    return { id: payload.sub };
   }
 }

src/modules/auth/strategy/local.strategy.ts

@@ -1,10 +1,11 @@
 import { PassportStrategy } from '@nestjs/passport';
 import { Strategy } from 'passport-local';
-import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 
 import { AuthService } from '../auth.service';
 import { JwtUserPayloadDto } from '../dto/jwt-user-payload.dto';
 import { User } from '../../../entities/user.entity';
+import { AccessUnauthorizedException } from '../../../exceptions/access-exceptions';
 
 @Injectable()
 export class LocalStrategy extends PassportStrategy(Strategy) {
@@ -20,13 +21,13 @@ export class LocalStrategy extends PassportStrategy(Strategy) {
     try {
       user = await this.authService.validateUser(email, password);
     } catch (e) {
-      throw new UnauthorizedException(e.message);
+      throw new AccessUnauthorizedException((e as Error)?.message);
     }
 
     if (!user) {
-      throw new UnauthorizedException();
+      throw new AccessUnauthorizedException();
     }
 
-    return { _id: String(user.id) };
+    return { id: String(user.id) };
   }
 }

src/modules/users/dto/user.dto.ts

@@ -3,20 +3,20 @@ import { IsEmail, IsString, IsUUID, MaxLength } from 'class-validator';
 export class UserDto {
   @ApiProperty({ example: '123e4567-e89b-12d3-a456-426614174000' })
   @IsUUID()
-  id: string;
+  id!: string;
 
   @ApiProperty({ example: 'hashedPassword123' })
   @IsString()
   @MaxLength(255, { message: 'Password too long. Maximum is 255 symbols.' })
-  password: string;
+  password!: string;
 
   @ApiProperty({ example: 'Max' })
   @IsString()
   @MaxLength(255, { message: 'Name too long. Maximum is 255 symbols.' })
-  name: string;
+  name!: string;
 
   @ApiProperty({ example: 'someemail@test.com' })
   @IsEmail()
   @MaxLength(255, { message: 'Email too long. Maximum is 255 symbols.' })
-  email: string;
+  email!: string;
 }

src/modules/users/responses/user.response.ts

@@ -5,13 +5,13 @@ import { Exclude, Expose } from 'class-transformer';
 export class UserResponse {
   @Expose()
   @ApiProperty({ example: '123e4567-e89b-12d3-a456-426614174000' })
-  id: string;
+  id!: string;
 
   @Expose()
   @ApiProperty({ example: 'Max' })
-  name: string;
+  name!: string;
 
   @Expose()
   @ApiProperty({ example: 'someemail@test.com' })
-  email: string;
+  email!: string;
 }

src/responses/typed-list.response.factory.ts

@@ -8,12 +8,12 @@ export function TypedListResponseFactory<T>(ListClass: Constructor<T>) {
   class TypedList implements IListResponse<T> {
     @Expose()
     @ApiProperty({ example: 1 })
-    total: number;
+    total!: number;
 
     @Expose()
     @Type(() => ListClass)
     @ApiProperty({ type: ListClass, isArray: true })
-    data: T[];
+    data!: T[];
   }
   return TypedList;
 }

tsconfig.json

@@ -16,7 +16,8 @@
     "forceConsistentCasingInFileNames": true,
     "noImplicitAny": false,
     "strictBindCallApply": false,
-    "noFallthroughCasesInSwitch": false
+    "noFallthroughCasesInSwitch": false,
+    "strict": true
   },
   "exclude": [
     "node_modules",