@@ -1,5 +1,6 @@
|
||||
import { RoleData } from "./role.entity";
|
||||
import { PermissionData } from "./permission.entity";
|
||||
import crypto from 'crypto';
|
||||
|
||||
export class UserData {
|
||||
private constructor(
|
||||
@@ -7,7 +8,6 @@ export class UserData {
|
||||
public authentikId: string | null,
|
||||
public username: string,
|
||||
public email: string,
|
||||
public password: string | null,
|
||||
public roles: RoleData[],
|
||||
public permissions: PermissionData[],
|
||||
public isActive: boolean,
|
||||
@@ -22,7 +22,6 @@ export class UserData {
|
||||
static create(data: {
|
||||
username: string;
|
||||
email: string;
|
||||
password?: string | null;
|
||||
authentikId?: string | null;
|
||||
storageQuota?: number;
|
||||
storageUsed?: number;
|
||||
@@ -34,7 +33,6 @@ export class UserData {
|
||||
data.authentikId || null,
|
||||
data.username,
|
||||
data.email,
|
||||
data.password ?? null,
|
||||
[],
|
||||
[],
|
||||
true,
|
||||
@@ -119,7 +117,6 @@ export class UserData {
|
||||
authentikId?: string | null;
|
||||
username: string;
|
||||
email: string;
|
||||
password: string | null;
|
||||
roles?: RoleData[];
|
||||
permissions?: PermissionData[];
|
||||
isActive?: boolean;
|
||||
@@ -134,7 +131,6 @@ export class UserData {
|
||||
props.authentikId || null,
|
||||
props.username,
|
||||
props.email,
|
||||
props.password,
|
||||
props.roles || [],
|
||||
props.permissions || [],
|
||||
props.isActive !== undefined ? props.isActive : true,
|
||||
|
||||
@@ -42,7 +42,6 @@ export class PrismaUserMapper {
|
||||
authentikId: model.authentikUserId || model.authentikId || null,
|
||||
username: model.username || model.name || model.username,
|
||||
email: model.email,
|
||||
password: model.password ?? null,
|
||||
roles,
|
||||
permissions,
|
||||
isActive: model.isActive ?? true,
|
||||
@@ -60,7 +59,6 @@ export class PrismaUserMapper {
|
||||
authentikId: userData.authentikId,
|
||||
username: userData.username,
|
||||
email: userData.email,
|
||||
password: userData.password ?? null,
|
||||
isActive: userData.isActive,
|
||||
deletedAt: userData.deletedAt,
|
||||
lastSeenAt: userData.lastSeenAt,
|
||||
|
||||
@@ -11,10 +11,7 @@ export class CreateUserDto {
|
||||
@IsEmail()
|
||||
email!: string;
|
||||
|
||||
@ApiProperty({ example: 'strongpassword' })
|
||||
@IsString()
|
||||
@Length(8, 128)
|
||||
password!: string;
|
||||
|
||||
|
||||
@ApiPropertyOptional({ example: 10737418240 })
|
||||
@IsOptional()
|
||||
|
||||
@@ -14,10 +14,7 @@ export class UpdateUserDto extends PartialType(CreateUserDto) {
|
||||
@IsEmail()
|
||||
email?: string;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
@IsOptional()
|
||||
@Length(8, 128)
|
||||
password?: string;
|
||||
|
||||
|
||||
@ApiPropertyOptional()
|
||||
@IsOptional()
|
||||
|
||||
Reference in New Issue
Block a user