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