Merge branch 'develop' into feature/login-stats

Author: Bentroen

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Apply blank line linting rules
 2bbe554f470c5b7a0d59927dd3b9783314a0d805
+
+# Linting commits
+6efc953b9f7f648f2be59295a78ce1180f12b32d

NoteBlockWorld.code-workspace

@@ -18,7 +18,14 @@
     }
   ],
   "settings": {
+    "editor.formatOnSave": true,
+    "eslint.validate": ["typescript"],
+    "eslint.run": "onType",
+    "eslint.format.enable": true,
     "mdx.server.enable": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll": "explicit"
+    },
     "jest.disabledWorkspaceFolders": ["Root", "Frontend"]
   }
 }

pnpm-lock.yaml

@@ -62,12 +62,6 @@ export class AuthModule {
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('SERVER_URL'),
         },
-        {
-          inject: [ConfigService],
-          provide: 'MAGIC_LINK_SECRET',
-          useFactory: (configService: ConfigService) =>
-            configService.getOrThrow<string>('MAGIC_LINK_SECRET'),
-        },
         {
           inject: [ConfigService],
           provide: 'FRONTEND_URL',

server/src/auth/auth.module.ts

@@ -0,0 +1,16 @@
+import { User } from '../entity/user.entity';
+
+export class UserDto {
+  username: string;
+  publicName: string;
+  email: string;
+  static fromEntity(user: User): UserDto {
+    const userDto: UserDto = {
+      username: user.username,
+      publicName: user.publicName,
+      email: user.email,
+    };
+
+    return userDto;
+  }
+}

server/src/user/dto/user.dto.ts

@@ -404,7 +404,12 @@ describe('UserService', () => {
 
       const result = await service.updateUsername(user, body);
 
-      expect(result).toEqual(user);
+      expect(result).toEqual({
+        username: 'newuser',
+        publicName: undefined,
+        email: undefined,
+      });
+
       expect(user.username).toBe(body.username);
       expect(service.usernameExists).toHaveBeenCalledWith(body.username);
     });

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

@@ -7,6 +7,7 @@ import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dt
 import { validate } from 'class-validator';
 import { Model } from 'mongoose';
 
+import { UserDto } from './dto/user.dto';
 import { User, UserDocument } from './entity/user.entity';
 
 @Injectable()
@@ -167,7 +168,10 @@ export class UserService {
     }
 
     user.username = username;
+    user.lastEdited = new Date();
 
-    return await user.save();
+    await user.save();
+
+    return UserDto.fromEntity(user);
   }
 }

server/src/user/user.service.ts

@@ -0,0 +1,7 @@
+import { deepFreeze } from '../common/deepFreeze';
+
+export const UserConst = deepFreeze({
+  USERNAME_MIN_LENGTH: 3,
+  USERNAME_MAX_LENGTH: 32,
+  ALLOWED_REGEXP: /^[a-zA-Z0-9-_.]*$/,
+});

shared/validation/user/constants.ts

@@ -1,10 +1,13 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsString, IsNotEmpty, MinLength, MaxLength } from 'class-validator';
+import { IsString, Matches, MaxLength, MinLength } from 'class-validator';
+
+import { UserConst } from '../constants';
 
 export class UpdateUsernameDto {
   @IsString()
-  @MaxLength(64)
-  @MinLength(3)
+  @MaxLength(UserConst.USERNAME_MAX_LENGTH)
+  @MinLength(UserConst.USERNAME_MIN_LENGTH)
+  @Matches(UserConst.ALLOWED_REGEXP)
   @ApiProperty({
     description: 'Username of the user',
     example: 'tomast1137',

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

@@ -53,8 +53,8 @@
     "tailwindcss": "3.4.1",
     "tailwindcss-animate": "^1.0.7",
     "typescript": "^5.1.3",
-    "zod": "^3.22.4",
-    "zod-validation-error": "^3.0.0"
+    "zod": "^3.24.1",
+    "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
     "@shrutibalasa/tailwind-grid-auto-fit": "^1.1.0",