Merge alpha 0.0.5 to master #54

Merged
niggl merged 292 commits from dev into main 2020-12-23 17:05:35 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 3850bd9681 - Show all commits

View File

@ -84,7 +84,7 @@ export class UserController {
if (oldUser.id != updateUser.id) {
throw new UserIdsNotMatchingError();
}
await this.userRepository.save(await updateUser.toUser(oldUser));
await this.userRepository.save(await updateUser.updateUser(oldUser));
return new ResponseUser(await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] }));
}

View File

@ -85,7 +85,7 @@ export class UpdateUser {
/**
* Creates a User entity from this.
*/
public async toUser(user: User): Promise<User> {
public async updateUser(user: User): Promise<User> {
user.email = this.email;
user.username = this.username;
if (user.email === undefined && user.username === undefined) {