Compare commits
2 Commits
2f7b0d5606
...
a16c4c564a
Author | SHA1 | Date | |
---|---|---|---|
a16c4c564a | |||
8d860cb2e1 |
@ -62,7 +62,7 @@ export class UserController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
user = await this.userRepository.save(user)
|
user = await this.userRepository.save(user)
|
||||||
return new ResponseUser(await this.userRepository.findOne(user, { relations: ['permissions', 'groups'] }));
|
return new ResponseUser(await this.userRepository.findOne({ id: user.id }, { relations: ['permissions', 'groups'] }));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Put('/:id')
|
@Put('/:id')
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as argon2 from "argon2";
|
import * as argon2 from "argon2";
|
||||||
import { IsEmail, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
import { IsBoolean, IsEmail, IsOptional, IsPhoneNumber, IsString } from 'class-validator';
|
||||||
import { getConnectionManager } from 'typeorm';
|
import { getConnectionManager } from 'typeorm';
|
||||||
import * as uuid from 'uuid';
|
import * as uuid from 'uuid';
|
||||||
import { config } from '../../config';
|
import { config } from '../../config';
|
||||||
@ -63,6 +63,14 @@ export class CreateUser {
|
|||||||
@IsString()
|
@IsString()
|
||||||
password: string;
|
password: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will the new user be enabled from the start?
|
||||||
|
* Default: true
|
||||||
|
*/
|
||||||
|
@IsBoolean()
|
||||||
|
@IsOptional()
|
||||||
|
enabled?: boolean = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The new user's groups' id(s).
|
* The new user's groups' id(s).
|
||||||
* You can provide either one groupId or an array of groupIDs.
|
* You can provide either one groupId or an array of groupIDs.
|
||||||
@ -91,6 +99,7 @@ export class CreateUser {
|
|||||||
newUser.phone = this.phone
|
newUser.phone = this.phone
|
||||||
newUser.password = await argon2.hash(this.password + newUser.uuid);
|
newUser.password = await argon2.hash(this.password + newUser.uuid);
|
||||||
newUser.groups = await this.getGroups();
|
newUser.groups = await this.getGroups();
|
||||||
|
newUser.enabled = this.enabled;
|
||||||
//TODO: ProfilePics
|
//TODO: ProfilePics
|
||||||
|
|
||||||
return newUser;
|
return newUser;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user