@hedhog/admin 0.51.28 → 0.51.30

package/frontend/dashboard-user/react-query/handlers.ts.ejs

@@ -1,28 +1,28 @@
-import { useDefaultMutation } from "@/hooks/use-default-mutation";
-import { useQuery } from "@tanstack/react-query";
-import { requests } from "./requests";
-
-const scope = "dashboard-user";
-
-export function useDashboardUserCreate() {
-  const { dashboardUserCreate } = requests();
-  return useDefaultMutation(scope, "create", dashboardUserCreate);
-}
-
-export function useDashboardUserDelete() {
-  const { dashboardUserDelete } = requests();
-  return useDefaultMutation(scope, "delete", dashboardUserDelete);
-}
-
-export function useDashboardUserUpdate() {
-  const { dashboardUserUpdate } = requests();
-  return useDefaultMutation(scope, "update", dashboardUserUpdate);
-}
-
-export function useDashboardUserGet(id: number) {
-  const { dashboardUserGet } = requests();
-  return useQuery({
-    queryKey: [scope, "get"],
-    queryFn: () => dashboardUserGet(id),
-  });
-}
+import { useDefaultMutation } from "@/hooks/use-default-mutation";
+import { useQuery } from "@tanstack/react-query";
+import { requests } from "./requests";
+
+const scope = "dashboard-user";
+
+export function useDashboardUserCreate() {
+  const { dashboardUserCreate } = requests();
+  return useDefaultMutation(scope, "create", dashboardUserCreate);
+}
+
+export function useDashboardUserDelete() {
+  const { dashboardUserDelete } = requests();
+  return useDefaultMutation(scope, "delete", dashboardUserDelete);
+}
+
+export function useDashboardUserUpdate() {
+  const { dashboardUserUpdate } = requests();
+  return useDefaultMutation(scope, "update", dashboardUserUpdate);
+}
+
+export function useDashboardUserGet(id: number) {
+  const { dashboardUserGet } = requests();
+  return useQuery({
+    queryKey: [scope, "get"],
+    queryFn: () => dashboardUserGet(id),
+  });
+}

package/frontend/dashboard-user/react-query/requests.ts.ejs

@@ -1,58 +1,58 @@
-import { useApp } from "@/hooks/use-app";
-import { Delete, PaginationParams, PaginationResult } from "@/types";
-import { DashboardUser } from "@/types/models";
-import { HttpMethod } from "@/types/http-method";
-
-export function requests() {
-  const { request } = useApp();
-
-  const dashboardUserList = async (params: PaginationParams) => {
-    return request<PaginationResult<DashboardUser>>({
-      url: "/dashboard-user",
-      params,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserGet = async (id: number) => {
-    return request<DashboardUser>({
-      url: `/dashboard-user/${id}`,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserCreate = async (params: { data: DashboardUser }) => {
-    const { data } = params;
-    return request<DashboardUser>({
-      url: "/dashboard-user",
-      method: HttpMethod.POST,
-      data: data,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserDelete = async (ids: number[]) => {
-    return request<Delete>({
-      url: "/dashboard-user",
-      data: { ids },
-      method: HttpMethod.DELETE,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserUpdate = async (params: {
-    id: number;
-    data: DashboardUser;
-  }) => {
-    const { id, data } = params;
-    return request<DashboardUser>({
-      url: `/dashboard-user/${id}`,
-      method: HttpMethod.PATCH,
-      data: data,
-    }).then((res) => res.data);
-  };
-
-  return {
-    dashboardUserCreate,
-    dashboardUserUpdate,
-    dashboardUserDelete,
-    dashboardUserList,
-    dashboardUserGet,
-  };
-}
+import { useApp } from "@/hooks/use-app";
+import { Delete, PaginationParams, PaginationResult } from "@/types";
+import { DashboardUser } from "@/types/models";
+import { HttpMethod } from "@/types/http-method";
+
+export function requests() {
+  const { request } = useApp();
+
+  const dashboardUserList = async (params: PaginationParams) => {
+    return request<PaginationResult<DashboardUser>>({
+      url: "/dashboard-user",
+      params,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserGet = async (id: number) => {
+    return request<DashboardUser>({
+      url: `/dashboard-user/${id}`,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserCreate = async (params: { data: DashboardUser }) => {
+    const { data } = params;
+    return request<DashboardUser>({
+      url: "/dashboard-user",
+      method: HttpMethod.POST,
+      data: data,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserDelete = async (ids: number[]) => {
+    return request<Delete>({
+      url: "/dashboard-user",
+      data: { ids },
+      method: HttpMethod.DELETE,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserUpdate = async (params: {
+    id: number;
+    data: DashboardUser;
+  }) => {
+    const { id, data } = params;
+    return request<DashboardUser>({
+      url: `/dashboard-user/${id}`,
+      method: HttpMethod.PATCH,
+      data: data,
+    }).then((res) => res.data);
+  };
+
+  return {
+    dashboardUserCreate,
+    dashboardUserUpdate,
+    dashboardUserDelete,
+    dashboardUserList,
+    dashboardUserGet,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedhog/admin",
-  "version": "0.51.28",
+  "version": "0.51.30",
   "private": false,
   "main": "dist/index.js",
   "scripts": {

package/src/auth/auth.service.ts

@@ -82,6 +82,11 @@ export class AuthService implements OnModuleInit {
     return user;
   }
 
+  async getPasswordHashed(password: string): Promise<string> {
+    const salt = await genSalt();
+    return await hash(password, salt);
+  }
+
   async register({ email, name, password, code, multifactor_id }: RegisterDTO) {
     const user = await this.prisma.user.findFirst({
       where: {
@@ -93,14 +98,11 @@ export class AuthService implements OnModuleInit {
       throw new ConflictException('Already exists a user with this email');
     }
 
-    const salt = await genSalt();
-    password = await hash(password, salt);
-
     const newUser = await this.prisma.user.create({
       data: {
         email,
         name,
-        password,
+        password: await this.getPasswordHashed(password),
         multifactor_id,
         code,
       },
@@ -125,15 +127,13 @@ export class AuthService implements OnModuleInit {
   ) {
     try {
       const user = await this.createUserCheck(code);
-      const salt = await genSalt();
-      password = await hash(password, salt);
 
       await this.prisma.user.update({
         where: {
           id: user.id,
         },
         data: {
-          password,
+          password: await this.getPasswordHashed(password),
           code: null,
         },
       });
@@ -290,6 +290,7 @@ export class AuthService implements OnModuleInit {
 
     return {
       token: this.jwt.sign(payload),
+      mfa: false,
     };
   }
 
@@ -356,15 +357,12 @@ export class AuthService implements OnModuleInit {
       throw new NotFoundException('Não foi possível alterar a senha.');
     }
 
-    const salt = await genSalt();
-    const password = await hash(newPassword, salt);
-
     const newUser = await this.prisma.user.update({
       where: {
         id: user.id,
       },
       data: {
-        password,
+        password: await this.getPasswordHashed(newPassword),
       },
     });
 
@@ -458,15 +456,12 @@ export class AuthService implements OnModuleInit {
       });
 
       if (user) {
-        const salt = await genSalt();
-        const password = await hash(confirmNewPassword, salt);
-
         await this.prisma.user.update({
           where: {
             id: user.id,
           },
           data: {
-            password,
+            password: await this.getPasswordHashed(confirmNewPassword),
             code: null,
           },
         });
@@ -488,7 +483,7 @@ export class AuthService implements OnModuleInit {
     }
   }
 
-  async checkCodeMfa(userId: number, code: number) {
+  async checkCodeMfa(userId: number, code: string) {
     const window = this.settings['mfa-window'] ?? 0;
     const step = this.settings['mfa-setp'] ?? 30;
 

package/src/auth/dto/login-with-code.dto.ts

@@ -1,10 +1,10 @@
-import { IsInt, IsJWT, Max, Min } from 'class-validator';
+import { IsJWT, IsString, Matches } from 'class-validator';
 
 export class LoginWithCodeDTO {
-  @Min(0, { message: 'O código deve ser pelo menos 0.' })
-  @Max(999999, { message: 'O código deve ser no máximo 999999.' })
-  @IsInt({ message: 'O código deve ser um número inteiro.' })
-  code: number;
+  @IsString({ message: 'O código deve ser uma string' })
+  @IsString({ message: 'O código deve ser uma string' })
+  @Matches(/^\d{6}$/, { message: 'O código deve conter 6 dígitos numéricos' })
+  code: string;
 
   @IsJWT({ message: 'Token inválido' })
   token: string;

package/src/dashboard/dashboard-component/dashboard-component.controller.ts

@@ -1,55 +1,55 @@
-import { Pagination } from '@hedhog/pagination';
-import { Locale } from '@hedhog/locale';
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Inject,
-  Param,
-  ParseIntPipe,
-  Patch,
-  Post,
-  forwardRef
-} from '@nestjs/common';
-import { CreateDTO } from './dto/create.dto';
-import { UpdateDTO } from './dto/update.dto';
-import { DashboardComponentService } from './dashboard-component.service';
-import { Role, DeleteDTO } from '@hedhog/core';
-
-@Role()
-@Controller('dashboard-component')
-export class DashboardComponentController {
-  constructor(
-    @Inject(forwardRef(() => DashboardComponentService))
-    private readonly dashboardComponentService: DashboardComponentService
-  ) {}
-
-  @Get()
-  async list(@Locale() locale, @Pagination() paginationParams) {
-    return this.dashboardComponentService.list(locale, paginationParams);
-  }
-
-  @Get(':id')
-  async get(@Param('id', ParseIntPipe) id: number) {
-    return this.dashboardComponentService.get(id);
-  }
-
-  @Post()
-  async create(@Body() data: CreateDTO) {
-    return this.dashboardComponentService.create(data);
-  }
-
-  @Patch(':id')
-  async update(@Param('id', ParseIntPipe) id: number, @Body() data: UpdateDTO) {
-    return this.dashboardComponentService.update({
-      id,
-      data
-    });
-  }
-
-  @Delete()
-  async delete(@Body() data: DeleteDTO) {
-    return this.dashboardComponentService.delete(data);
-  }
-}
+import { Pagination } from '@hedhog/pagination';
+import { Locale } from '@hedhog/locale';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Inject,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+  forwardRef
+} from '@nestjs/common';
+import { CreateDTO } from './dto/create.dto';
+import { UpdateDTO } from './dto/update.dto';
+import { DashboardComponentService } from './dashboard-component.service';
+import { Role, DeleteDTO } from '@hedhog/core';
+
+@Role()
+@Controller('dashboard-component')
+export class DashboardComponentController {
+  constructor(
+    @Inject(forwardRef(() => DashboardComponentService))
+    private readonly dashboardComponentService: DashboardComponentService
+  ) {}
+
+  @Get()
+  async list(@Locale() locale, @Pagination() paginationParams) {
+    return this.dashboardComponentService.list(locale, paginationParams);
+  }
+
+  @Get(':id')
+  async get(@Param('id', ParseIntPipe) id: number) {
+    return this.dashboardComponentService.get(id);
+  }
+
+  @Post()
+  async create(@Body() data: CreateDTO) {
+    return this.dashboardComponentService.create(data);
+  }
+
+  @Patch(':id')
+  async update(@Param('id', ParseIntPipe) id: number, @Body() data: UpdateDTO) {
+    return this.dashboardComponentService.update({
+      id,
+      data
+    });
+  }
+
+  @Delete()
+  async delete(@Body() data: DeleteDTO) {
+    return this.dashboardComponentService.delete(data);
+  }
+}

package/src/dashboard/dashboard-component/dto/create.dto.ts

@@ -1,36 +1,36 @@
-import { IsString, IsNumber, IsBoolean, IsOptional } from 'class-validator';
-import { WithLocaleDTO } from '@hedhog/locale';
-
-export class CreateDTO extends WithLocaleDTO {
-  @IsString()
-  slug: string;
-
-  @IsString()
-  path: string;
-
-  @IsOptional()
-  @IsNumber()
-  min_width?: number;
-
-  @IsOptional()
-  @IsNumber()
-  max_width?: number;
-
-  @IsOptional()
-  @IsNumber()
-  min_height?: number;
-
-  @IsOptional()
-  @IsNumber()
-  max_height?: number;
-
-  @IsNumber()
-  width: number;
-
-  @IsNumber()
-  height: number;
-
-  @IsOptional()
-  @IsBoolean()
-  is_resizable?: boolean;
-}
+import { IsString, IsNumber, IsBoolean, IsOptional } from 'class-validator';
+import { WithLocaleDTO } from '@hedhog/locale';
+
+export class CreateDTO extends WithLocaleDTO {
+  @IsString()
+  slug: string;
+
+  @IsString()
+  path: string;
+
+  @IsOptional()
+  @IsNumber()
+  min_width?: number;
+
+  @IsOptional()
+  @IsNumber()
+  max_width?: number;
+
+  @IsOptional()
+  @IsNumber()
+  min_height?: number;
+
+  @IsOptional()
+  @IsNumber()
+  max_height?: number;
+
+  @IsNumber()
+  width: number;
+
+  @IsNumber()
+  height: number;
+
+  @IsOptional()
+  @IsBoolean()
+  is_resizable?: boolean;
+}

package/src/dashboard/dashboard-component/dto/update.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
-
-export class UpdateDTO extends PartialType(CreateDTO) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateDTO } from './create.dto';
+
+export class UpdateDTO extends PartialType(CreateDTO) {}

package/src/dashboard/dashboard-item/dto/update.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
-
-export class UpdateDTO extends PartialType(CreateDTO) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateDTO } from './create.dto';
+
+export class UpdateDTO extends PartialType(CreateDTO) {}

package/src/dashboard/dashboard-user/dto/update.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
-
-export class UpdateDTO extends PartialType(CreateDTO) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateDTO } from './create.dto';
+
+export class UpdateDTO extends PartialType(CreateDTO) {}

package/src/dashboard/index.ts

@@ -1 +1 @@
-export * from './dashboard.module';
+export * from './dashboard.module';

package/src/user/user.controller.ts

@@ -1,3 +1,4 @@
+import { Role } from '@hedhog/core';
 import { Pagination } from '@hedhog/pagination';
 import {
   Body,
@@ -13,7 +14,6 @@ import {
 } from '@nestjs/common';
 import { DeleteDTO } from '../dto/delete.dto';
 import { UpdateIdsDTO } from '../dto/update-ids.dto';
-import { Role } from '@hedhog/core';
 import { CreateDTO } from './dto/create.dto';
 import { UpdateDTO } from './dto/update.dto';
 import { UserService } from './user.service';