Merge branch 'develop' of https://github.com/OpenNBS/NoteBlockWorld into feature/login-by-email

Author: tomast1337

server/src/auth/auth.service.spec.ts

@@ -53,6 +53,10 @@ describe('AuthService', () => {
           provide: 'FRONTEND_URL',
           useValue: 'http://frontend.test.com',
         },
+        {
+          provide: 'COOKIE_EXPIRES_IN',
+          useValue: '3600',
+        },
         {
           provide: 'JWT_SECRET',
           useValue: 'test-jwt-secret',
@@ -373,15 +377,15 @@ describe('AuthService', () => {
 
       expect(res.cookie).toHaveBeenCalledWith('token', 'access-token', {
         domain: '.test.com',
-        maxAge: 3600,
+        maxAge: 3600000,
       });
 
       expect(res.cookie).toHaveBeenCalledWith(
         'refresh_token',
         'refresh-token',
         {
           domain: '.test.com',
-          maxAge: 3600,
+          maxAge: 3600000,
         },
       );
 

server/src/auth/auth.service.ts

@@ -230,7 +230,7 @@ export class AuthService {
 
     const frontEndURL = this.FRONTEND_URL;
     const domain = this.APP_DOMAIN;
-    const maxAge = parseInt(this.COOKIE_EXPIRES_IN);
+    const maxAge = parseInt(this.COOKIE_EXPIRES_IN) * 1000;
 
     res.cookie('token', token.access_token, {
       domain: domain,

server/src/user/user.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Inject, Query } from '@nestjs/common';
+import { Body, Controller, Get, Inject, Patch, Query } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { PageQueryDTO } from '@shared/validation/common/dto/PageQuery.dto';
 import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
@@ -7,6 +7,7 @@ import { GetRequestToken, validateUser } from '@server/GetRequestUser';
 
 import { UserDocument } from './entity/user.entity';
 import { UserService } from './user.service';
+import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dto';
 
 @Controller('user')
 export class UserController {
@@ -37,4 +38,16 @@ export class UserController {
     user = validateUser(user);
     return await this.userService.getSelfUserData(user);
   }
+
+  @Patch('username')
+  @ApiTags('user')
+  @ApiBearerAuth()
+  @ApiOperation({ summary: 'Update the username' })
+  async updateUsername(
+    @GetRequestToken() user: UserDocument | null,
+    @Body() body: UpdateUsernameDto,
+  ) {
+    user = validateUser(user);
+    return await this.userService.updateUsername(user, body);
+  }
 }

server/src/user/user.service.spec.ts

@@ -287,4 +287,75 @@ describe('UserService', () => {
       expect(service.usernameExists).toHaveBeenCalledWith(baseUsername);
     });
   });
+
+  describe('normalizeUsername', () => {
+    it('should normalize a username', () => {
+      const inputUsername = 'tést user';
+      const normalizedUsername = 'test_user';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+
+    it('should remove special characters from a username', () => {
+      const inputUsername = '静_かな';
+      const normalizedUsername = '_';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+
+    it('should replace spaces with underscores in a username', () => {
+      const inputUsername = 'Имя пользователя';
+      const normalizedUsername = '_';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+
+    it('should replace spaces with underscores in a username', () => {
+      const inputUsername = 'Eglė Čepulytė';
+      const normalizedUsername = 'Egle_Cepulyte';
+
+      const result = (service as any).normalizeUsername(inputUsername);
+
+      expect(result).toBe(normalizedUsername);
+    });
+  });
+
+  describe('updateUsername', () => {
+    it('should update a user username', async () => {
+      const user = {
+        username: 'testuser',
+        save: jest.fn().mockReturnThis(),
+      } as unknown as UserDocument;
+      const body = { username: 'newuser' };
+
+      jest.spyOn(service, 'usernameExists').mockResolvedValue(false);
+
+      const result = await service.updateUsername(user, body);
+
+      expect(result).toEqual(user);
+      expect(user.username).toBe(body.username);
+      expect(service.usernameExists).toHaveBeenCalledWith(body.username);
+    });
+
+    it('should throw an error if username already exists', async () => {
+      const user = {
+        username: 'testuser',
+        save: jest.fn().mockReturnThis(),
+      } as unknown as UserDocument;
+
+      const body = { username: 'newuser' };
+
+      jest.spyOn(service, 'usernameExists').mockResolvedValue(true);
+
+      await expect(service.updateUsername(user, body)).rejects.toThrow(
+        new HttpException('Username already exists', HttpStatus.BAD_REQUEST),
+      );
+    });
+  });
 });

server/src/user/user.service.ts

@@ -6,7 +6,7 @@ import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
 import { NewEmailUserDto } from '@shared/validation/user/dto/NewEmailUser.dto';
 import { validate } from 'class-validator';
 import { Model } from 'mongoose';
-
+import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dto';
 import { User, UserDocument } from './entity/user.entity';
 
 @Injectable()
@@ -155,14 +155,17 @@ export class UserService {
     return !!user;
   }
 
-  public async generateUsername(inputUsername: string) {
-    // Normalize username (remove accents, replace spaces with underscores)
-    const baseUsername = inputUsername
+  private normalizeUsername = (inputUsername: string) =>
+    inputUsername
       .replace(' ', '_')
       .normalize('NFKD')
       .replace(/[\u0300-\u036f]/g, '')
       .replace(/[^a-zA-Z0-9_]/g, '');
 
+  public async generateUsername(inputUsername: string) {
+    // Normalize username (remove accents, replace spaces with underscores)
+    const baseUsername = this.normalizeUsername(inputUsername);
+
     let newUsername = baseUsername;
     let counter = 1;
 
@@ -174,4 +177,24 @@ export class UserService {
 
     return newUsername;
   }
+
+  public async updateUsername(user: UserDocument, body: UpdateUsernameDto) {
+    let { username } = body;
+    username = this.normalizeUsername(username);
+
+    if (await this.usernameExists(username)) {
+      throw new HttpException(
+        'Username already exists',
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    if (user.username === username) {
+      throw new HttpException('Username is the same', HttpStatus.BAD_REQUEST);
+    }
+
+    user.username = username;
+
+    return await user.save();
+  }
 }

shared/validation/user/dto/UpdateUsername.dto.ts

@@ -0,0 +1,13 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsNotEmpty, MinLength, MaxLength } from 'class-validator';
+
+export class UpdateUsernameDto {
+  @IsString()
+  @MaxLength(64)
+  @MinLength(3)
+  @ApiProperty({
+    description: 'Username of the user',
+    example: 'tomast1137',
+  })
+  username: string;
+}

web/src/lib/axios/ClientAxios.ts

@@ -0,0 +1,24 @@
+import axios from 'axios';
+import { getTokenLocal } from './token.utils';
+export const baseApiURL = process.env.NEXT_PUBLIC_API_URL;
+
+const ClientAxios = axios.create({
+  baseURL: baseApiURL,
+  withCredentials: true,
+});
+
+// Add a request interceptor to add the token to the request
+ClientAxios.interceptors.request.use(
+  (config) => {
+    const token = getTokenLocal();
+
+    config.headers.authorization = `Bearer ${token}`;
+
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  },
+);
+
+export default ClientAxios;

web/src/modules/shared/components/client/GenericModal.tsx

@@ -5,17 +5,19 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Dialog, Transition } from '@headlessui/react';
 import { Fragment } from 'react';
 
-export default function GenericModal({
+interface GenericModalProps {
+  isOpen: boolean;
+  setIsOpen?: (isOpen: boolean) => void;
+  title: string;
+  children?: React.ReactNode | React.ReactNode[] | string;
+}
+
+const GenericModal = ({
   isOpen,
   setIsOpen,
   title,
   children,
-}: {
-  isOpen: boolean;
-  setIsOpen?: (isOpen: boolean) => void;
-  title: string;
-  children: React.ReactNode;
-}) {
+}: GenericModalProps) => {
   return (
     <Transition appear show={isOpen} as={Fragment}>
       <Dialog
@@ -80,4 +82,6 @@ export default function GenericModal({
       </Dialog>
     </Transition>
   );
-}
+};
+
+export default GenericModal;