Merge branch 'next' into task/OV-1-add-sign-in-flow

backend/src/bundles/auth/auth.controller.ts

@@ -1,4 +1,8 @@
-import { type UserSignUpRequestDto } from '~/bundles/users/users.js';
+import {
+    type UserSignInRequestDto,
+    type UserSignUpRequestDto,
+    userSignInValidationSchema,
+} from '~/bundles/users/users.js';
 import { userSignUpValidationSchema } from '~/bundles/users/users.js';
 import {
     type ApiHandlerOptions,
@@ -20,6 +24,20 @@ class AuthController extends BaseController {
 
         this.authService = authService;
 
+        this.addRoute({
+            path: AuthApiPath.SIGN_IN,
+            method: 'POST',
+            validation: {
+                body: userSignInValidationSchema,
+            },
+            handler: (options) =>
+                this.signIn(
+                    options as ApiHandlerOptions<{
+                        body: UserSignInRequestDto;
+                    }>,
+                ),
+        });
+
         this.addRoute({
             path: AuthApiPath.SIGN_UP,
             method: 'POST',
@@ -35,6 +53,55 @@ class AuthController extends BaseController {
         });
     }
 
+    /**
+     * @swagger
+     * /auth/sign-in:
+     *    post:
+     *      description: Sign in user into the application
+     *      requestBody:
+     *        description: User auth data
+     *        required: true
+     *        content:
+     *          application/json:
+     *            schema:
+     *              type: object
+     *              properties:
+     *                email:
+     *                  type: string
+     *                  format: email
+     *                password:
+     *                  type: string
+     *      responses:
+     *        200:
+     *          description: Successful operation
+     *          content:
+     *            application/json:
+     *              schema:
+     *                type: object
+     *                properties:
+     *                  message:
+     *                    type: object
+     *                    $ref: '#/components/schemas/User'
+     *        400:
+     *          description: Failed operation
+     *          content:
+     *            application/json:
+     *              schema:
+     *                  type: object
+     *                  $ref: '#/components/schemas/Error'
+     */
+
+    private async signIn(
+        options: ApiHandlerOptions<{
+            body: UserSignInRequestDto;
+        }>,
+    ): Promise<ApiHandlerResponse> {
+        return {
+            payload: await this.authService.signIn(options.body),
+            status: HttpCode.OK,
+        };
+    }
+
     /**
      * @swagger
      * /auth/sign-up:
@@ -65,6 +132,7 @@ class AuthController extends BaseController {
      *                    type: object
      *                    $ref: '#/components/schemas/User'
      */
+
     private async signUp(
         options: ApiHandlerOptions<{
             body: UserSignUpRequestDto;

backend/src/bundles/auth/auth.service.ts

@@ -3,6 +3,14 @@ import {
     type UserSignUpResponseDto,
 } from '~/bundles/users/types/types.js';
 import { type UserService } from '~/bundles/users/user.service.js';
+import {
+    type UserSignInRequestDto,
+    type UserSignInResponseDto,
+} from '~/bundles/users/users.js';
+import { HttpCode, HttpError } from '~/common/http/http.js';
+import { cryptService } from '~/common/services/services.js';
+
+import { UserValidationMessage } from './enums/enums.js';
 
 class AuthService {
     private userService: UserService;
@@ -11,6 +19,36 @@ class AuthService {
         this.userService = userService;
     }
 
+    public async signIn(
+        userRequestDto: UserSignInRequestDto,
+    ): Promise<UserSignInResponseDto> {
+        const { email, password } = userRequestDto;
+        const user = await this.userService.findByEmail(email);
+
+        if (!user) {
+            throw new HttpError({
+                message: UserValidationMessage.WRONG_CREDENTIALS,
+                status: HttpCode.BAD_REQUEST,
+            });
+        }
+
+        const { passwordHash } = user.toNewObject();
+
+        const isPwdCorrect = cryptService.compareSyncPassword(
+            password,
+            passwordHash,
+        );
+
+        if (!isPwdCorrect) {
+            throw new HttpError({
+                message: UserValidationMessage.WRONG_CREDENTIALS,
+                status: HttpCode.BAD_REQUEST,
+            });
+        }
+
+        return user.toObject();
+    }
+
     public signUp(
         userRequestDto: UserSignUpRequestDto,
     ): Promise<UserSignUpResponseDto> {

backend/src/bundles/auth/enums/enums.ts

@@ -1 +1 @@
-export { AuthApiPath } from 'shared';
+export { AuthApiPath, UserValidationMessage } from 'shared';

backend/src/bundles/users/types/types.ts

@@ -1,5 +1,7 @@
 export {
     type UserGetAllResponseDto,
+    type UserSignInRequestDto,
+    type UserSignInResponseDto,
     type UserSignUpRequestDto,
     type UserSignUpResponseDto,
 } from 'shared';

backend/src/bundles/users/user.repository.ts

@@ -13,6 +13,12 @@ class UserRepository implements Repository {
         return Promise.resolve(null);
     }
 
+    public async findByEmail(email: string): Promise<UserEntity | null> {
+        const user = await this.userModel.query().findOne({ email }).execute();
+
+        return user ? UserEntity.initialize(user) : null;
+    }
+
     public async findAll(): Promise<UserEntity[]> {
         const users = await this.userModel.query().execute();
 

backend/src/bundles/users/user.service.ts

@@ -20,6 +20,10 @@ class UserService implements Service {
         return Promise.resolve(null);
     }
 
+    public async findByEmail(email: string): Promise<UserEntity | null> {
+        return await this.userRepository.findByEmail(email);
+    }
+
     public async findAll(): Promise<UserGetAllResponseDto> {
         const items = await this.userRepository.findAll();
 

backend/src/bundles/users/users.ts

@@ -11,8 +11,13 @@ const userController = new UserController(logger, userService);
 
 export { userController, userService };
 export {
+    type UserSignInRequestDto,
+    type UserSignInResponseDto,
     type UserSignUpRequestDto,
     type UserSignUpResponseDto,
 } from './types/types.js';
 export { UserModel } from './user.model.js';
-export { userSignUpValidationSchema } from './validation-schemas/validation-schemas.js';
+export {
+    userSignInValidationSchema,
+    userSignUpValidationSchema,
+} from './validation-schemas/validation-schemas.js';

backend/src/bundles/users/validation-schemas/validation-schemas.ts

@@ -1 +1 @@
-export { userSignUpValidationSchema } from 'shared';
+export { userSignInValidationSchema, userSignUpValidationSchema } from 'shared';

backend/src/common/server-application/base-server-app-api.ts

@@ -38,11 +38,27 @@ class BaseServerAppApi implements ServerAppApi {
             definition: {
                 openapi: '3.0.0',
                 info: {
-                    title: 'Hello World',
+                    title: 'OutreachVids API documentation',
                     version: `${this.version}.0.0`,
                 },
+                components: {
+                    schemas: {
+                        Error: {
+                            type: 'object',
+                            properties: {
+                                errorType: {
+                                    type: 'string',
+                                    enum: ['COMMON', 'VALIDATION'],
+                                },
+                                message: {
+                                    type: 'string',
+                                },
+                            },
+                        },
+                    },
+                },
             },
-            apis: [`src/packages/**/*.controller.${controllerExtension}`],
+            apis: [`src/bundles/**/*.controller.${controllerExtension}`],
         });
     }
 }

frontend/src/bundles/common/components/components.ts

@@ -1,4 +1,5 @@
 export { Button } from './button/button.js';
+export { Header } from './header/header.js';
 export { Input } from './input/input.js';
 export { Link } from './link/link.js';
 export { Loader } from './loader/loader.js';

frontend/src/bundles/common/components/header/header.tsx

@@ -0,0 +1,33 @@
+import { Flex, Text } from '@chakra-ui/react';
+
+const Header = (): JSX.Element => {
+    return (
+        <Flex
+            as="header"
+            height="75px"
+            position="sticky"
+            top="0"
+            left="0"
+            width="100%"
+            backgroundColor="background.900"
+            color="white"
+            boxShadow="md"
+            zIndex="1000"
+            padding="4"
+            marginBottom="20px"
+        >
+            <Flex
+                width="full"
+                alignItems="center"
+                maxWidth="1440px"
+                justifyContent="space-between"
+            >
+                <Text fontSize="xl" fontWeight="lighter">
+                    Logo
+                </Text>
+            </Flex>
+        </Flex>
+    );
+};
+
+export { Header };

frontend/src/framework/theme/styles/colors.styles.ts

@@ -7,9 +7,8 @@ const colors = {
         50: '#e2e1ec',
     },
     brand: {
-        900: '#1a365d',
-        200: '#b3e0ff',
         secondary: {
+            50: '#3BAF28',
             300: '#ff6e1c',
             600: '#eb5500',
             900: '#e13b00',

frontend/src/framework/theme/styles/components.styles.ts

@@ -3,7 +3,55 @@ import { colors } from './colors.styles.js';
 const components = {
     Heading: {
         baseStyle: {
-            color: colors.text.accent,
+            color: colors.white,
+            fontFamily: 'Poppins, sans-serif',
+            textAlign: 'left',
+        },
+        variants: {
+            H1: {
+                fontSize: '54px',
+                fontWeight: '600',
+                lineHeight: '64px',
+            },
+            H2: {
+                fontSize: '30px',
+                fontWeight: '600',
+                lineHeight: '32px',
+            },
+            H3: {
+                fontSize: '18px',
+                fontWeight: '700',
+                lineHeight: '27px',
+            },
+        },
+    },
+    Text: {
+        baseStyle: {
+            color: colors.white,
+            fontFamily: 'Poppins, sans-serif',
+            textAlign: 'left',
+        },
+        variants: {
+            body1: {
+                fontSize: '16px',
+                fontWeight: '500',
+                lineHeight: '22px',
+            },
+            bodySmall: {
+                fontSize: '14px',
+                fontWeight: '400',
+                lineHeight: '20px',
+            },
+            caption: {
+                fontSize: '12px',
+                fontWeight: '400',
+                lineHeight: '16px',
+            },
+            button: {
+                fontSize: '14px',
+                fontWeight: '600',
+                lineHeight: '16px',
+            },
         },
     },
     Button: {

shared/src/bundles/users/enums/user-validation-message.enum.ts

@@ -5,6 +5,7 @@ const UserValidationMessage = {
     EMAIL_INVALID: 'Please enter a valid email',
     PASSWORD_LENGTH: 'Password must have from 6 to 12 characters',
     INVALID_DATA: 'Incorrect email or password. Please try again.',
+    WRONG_CREDENTIALS: 'Email or password are incorrect',
 } as const;
 
 export { UserValidationMessage };

shared/src/framework/http/enums/http-code.enum.ts

@@ -1,6 +1,7 @@
 const HttpCode = {
     OK: 200,
     CREATED: 201,
+    BAD_REQUEST: 400,
     UNPROCESSED_ENTITY: 422,
     INTERNAL_SERVER_ERROR: 500,
 } as const;