Merge branch 'develop'

Author: Bentroen

server/src/user/dto/user.dto.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/user.service.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()
@@ -148,6 +149,8 @@ export class UserService {
     user.username = username;
     user.lastEdited = new Date();
 
-    return await user.save();
+    await user.save();
+
+    return UserDto.fromEntity(user);
   }
 }