@hedhog/admin 0.51.20 → 0.51.22

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.20",
+  "version": "0.51.22",
   "private": false,
   "main": "dist/index.js",
   "scripts": {
@@ -27,6 +27,7 @@
   "devDependencies": {
     "@hedhog/locale": "^0.48.4",
     "@hedhog/mail": "^0.48.1",
+    "@hedhog/mail-manager": "^0.48.20",
     "@hedhog/pagination": "^0.46.1",
     "@hedhog/prisma": "^0.46.1",
     "@hedhog/utils": "^0.0.28",
@@ -39,6 +40,7 @@
   "peerDependencies": {
     "@hedhog/locale": "latest",
     "@hedhog/mail": "latest",
+    "@hedhog/mail-manager": "latest",
     "@hedhog/pagination": "latest",
     "@hedhog/prisma": "latest",
     "@hedhog/utils": "latest",

package/src/auth/auth.controller.ts

@@ -1,4 +1,5 @@
 import { Public, Role, User } from '@hedhog/core';
+import { Locale } from '@hedhog/locale';
 import {
   Body,
   Controller,
@@ -36,8 +37,8 @@ export class AuthController {
 
   @Public()
   @Post('create-user')
-  async createUser(@Body() data: CreateUserDTO) {
-    return this.service.createUser(data);
+  async createUser(@Locale() Locale, @Body() data: CreateUserDTO) {
+    return this.service.createUser(Locale, data);
   }
 
   @Role()
@@ -48,8 +49,8 @@ export class AuthController {
 
   @Public()
   @Post('login')
-  async login(@Body() { email, password }: LoginDTO) {
-    return this.service.login({ email, password });
+  async login(@Locale() locale: string, @Body() { email, password }: LoginDTO) {
+    return this.service.login(locale, { email, password });
   }
 
   @Public()
@@ -81,6 +82,7 @@ export class AuthController {
   @Public()
   @Post('forget')
   async forget(
+    @Locale() locale: string,
     @Body()
     {
       email,
@@ -89,15 +91,18 @@ export class AuthController {
       body: string;
     },
   ) {
-    return this.service.forget({
+    return this.service.forget(locale, {
       email,
     });
   }
 
   @Public()
   @Post('reset')
-  async reset(@Body() { newPassword, confirmNewPassword, code }: ResetDTO) {
-    return this.service.resetPassword({
+  async reset(
+    @Locale() locale: string,
+    @Body() { newPassword, confirmNewPassword, code }: ResetDTO,
+  ) {
+    return this.service.resetPassword(locale, {
       newPassword,
       confirmNewPassword,
       code,
@@ -107,10 +112,11 @@ export class AuthController {
   @Public()
   @Post('change-password')
   async changePassword(
+    @Locale() locale: string,
     @Body()
     { email, currentPassword, newPassword, confirmNewPassword }: ChangeDTO,
   ) {
-    return this.service.changePassword({
+    return this.service.changePassword(locale, {
       email,
       currentPassword,
       newPassword,
@@ -119,8 +125,15 @@ export class AuthController {
   }
 
   @Post('change-email')
-  async changeEmail(@Body() { currentEmail, password, newEmail }: EmailDTO) {
-    return this.service.changeEmail({ currentEmail, password, newEmail });
+  async changeEmail(
+    @Locale() locale: string,
+    @Body() { currentEmail, password, newEmail }: EmailDTO,
+  ) {
+    return this.service.changeEmail(locale, {
+      currentEmail,
+      password,
+      newEmail,
+    });
   }
 
   @Delete('mfa-remove')

package/src/auth/auth.module.ts

@@ -1,4 +1,5 @@
 import { MailModule } from '@hedhog/mail';
+import { MailManagerModule } from '@hedhog/mail-manager';
 import { PrismaModule } from '@hedhog/prisma';
 import { HttpModule } from '@nestjs/axios';
 import { forwardRef, Module } from '@nestjs/common';
@@ -29,6 +30,7 @@ import { AuthGuard } from './guards/auth.guard';
     forwardRef(() => PrismaModule),
     forwardRef(() => MailModule),
     forwardRef(() => SettingModule),
+    MailManagerModule,
     ConfigModule,
     HttpModule,
   ],

package/src/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import { MailService } from '@hedhog/mail';
+import { MailService as MailManagerService } from '@hedhog/mail-manager';
 import { PrismaService } from '@hedhog/prisma';
 import { HttpService } from '@nestjs/axios';
 import {
@@ -16,13 +16,6 @@ import { compare, genSalt, hash } from 'bcrypt';
 import * as qrcode from 'qrcode';
 import { lastValueFrom } from 'rxjs';
 import * as speakeasy from 'speakeasy';
-import {
-  getChangeEmailEmail,
-  getChangePasswordEmail,
-  getCreateUserEmail,
-  getForgetPasswordEmail,
-  getResetPasswordEmail,
-} from '../emails';
 import { SettingService } from '../setting/setting.service';
 import { ChangeDTO } from './dto/change.dto';
 import { CreateUserDTO } from './dto/create-user.dto';
@@ -45,8 +38,8 @@ export class AuthService implements OnModuleInit {
     private readonly prisma: PrismaService,
     @Inject(forwardRef(() => JwtService))
     private readonly jwt: JwtService,
-    @Inject(forwardRef(() => MailService))
-    private readonly mail: MailService,
+    @Inject(forwardRef(() => MailManagerService))
+    private readonly mail: MailManagerService,
     @Inject(forwardRef(() => SettingService))
     private readonly setting: SettingService,
   ) {}
@@ -116,17 +109,20 @@ export class AuthService implements OnModuleInit {
     return this.getToken(newUser);
   }
 
-  async createUser({
-    code,
-    password,
-    street,
-    number,
-    complement,
-    district,
-    city,
-    state,
-    postal_code,
-  }: CreateUserDTO) {
+  async createUser(
+    locale: string,
+    {
+      code,
+      password,
+      street,
+      number,
+      complement,
+      district,
+      city,
+      state,
+      postal_code,
+    }: CreateUserDTO,
+  ) {
     try {
       const user = await this.createUserCheck(code);
       const salt = await genSalt();
@@ -191,12 +187,10 @@ export class AuthService implements OnModuleInit {
         });
       }
 
-      await this.mail.send({
-        to: user.email,
-        subject: 'Conta criada',
-        body: getCreateUserEmail({
-          name: user.name,
-        }),
+      await this.mail.sendTemplatedMail(locale, {
+        email: user.email,
+        slug: 'create-user',
+        variables: {},
       });
 
       return this.getToken(user);
@@ -228,7 +222,11 @@ export class AuthService implements OnModuleInit {
     return Math.floor(Math.random() * (max - min + 1)) + min;
   }
 
-  async loginWithEmailAndPassword(email: string, password: string) {
+  async loginWithEmailAndPassword(
+    locale: string,
+    email: string,
+    password: string,
+  ) {
     const user = await this.prisma.user.findFirst({
       where: {
         email,
@@ -260,10 +258,10 @@ export class AuthService implements OnModuleInit {
             },
           });
 
-          await this.mail.send({
-            to: user.email,
-            subject: 'Código de Login',
-            body: `Seu código de login é ${code}`,
+          await this.mail.sendTemplatedMail(locale, {
+            email: user.email,
+            slug: 'login',
+            variables: { code: String(code) },
           });
 
           return {
@@ -295,7 +293,7 @@ export class AuthService implements OnModuleInit {
     };
   }
 
-  async forget({ email }: ForgetDTO) {
+  async forget(locale: string, { email }: ForgetDTO) {
     const appUrl =
       process.env.APP_URL ?? this.configService.get<string>('APP_URL');
 
@@ -324,10 +322,13 @@ export class AuthService implements OnModuleInit {
         },
       });
 
-      await this.mail.send({
-        to: email,
-        subject: `Recuperação de Senha`,
-        body: getForgetPasswordEmail(`${appUrl}/home?reset&code=${code}`),
+      await this.mail.sendTemplatedMail(locale, {
+        email,
+        slug: 'forget',
+        variables: {
+          appUrl,
+          code,
+        },
       });
     }
 
@@ -337,12 +338,10 @@ export class AuthService implements OnModuleInit {
     };
   }
 
-  async changePassword({
-    email,
-    currentPassword,
-    newPassword,
-    confirmNewPassword,
-  }: ChangeDTO) {
+  async changePassword(
+    locale: string,
+    { email, currentPassword, newPassword, confirmNewPassword }: ChangeDTO,
+  ) {
     if (newPassword !== confirmNewPassword) {
       throw new BadRequestException('Senhas não conferem');
     }
@@ -367,16 +366,19 @@ export class AuthService implements OnModuleInit {
       },
     });
 
-    await this.mail.send({
-      to: email,
-      subject: `Senha alterada`,
-      body: getChangePasswordEmail(),
+    await this.mail.sendTemplatedMail(locale, {
+      email,
+      slug: 'change-password',
+      variables: {},
     });
 
     return this.getToken(newUser);
   }
 
-  async changeEmail({ currentEmail, password, newEmail }: EmailDTO) {
+  async changeEmail(
+    locale: string,
+    { currentEmail, password, newEmail }: EmailDTO,
+  ) {
     const user = await this.prisma.user.findFirst({
       where: { email: currentEmail },
     });
@@ -424,16 +426,19 @@ export class AuthService implements OnModuleInit {
       data: { value: newEmail },
     });
 
-    await this.mail.send({
-      to: newEmail,
-      subject: `Email alterado`,
-      body: getChangeEmailEmail(),
+    await this.mail.sendTemplatedMail(locale, {
+      email: newEmail,
+      slug: 'change-email',
+      variables: {},
     });
 
     return this.getToken(newUser);
   }
 
-  async resetPassword({ code, newPassword, confirmNewPassword }: ResetDTO) {
+  async resetPassword(
+    locale: string,
+    { code, newPassword, confirmNewPassword }: ResetDTO,
+  ) {
     if (newPassword !== confirmNewPassword) {
       throw new BadRequestException('Senhas não conferem');
     }
@@ -464,10 +469,10 @@ export class AuthService implements OnModuleInit {
           },
         });
 
-        await this.mail.send({
-          to: user.email,
-          subject: `Senha recuperada`,
-          body: getResetPasswordEmail(),
+        await this.mail.sendTemplatedMail(locale, {
+          email: user.email,
+          slug: 'reset-password',
+          variables: {},
         });
 
         return this.getToken(user);
@@ -518,7 +523,6 @@ export class AuthService implements OnModuleInit {
 
     switch (data.mfa) {
       case MultifactorType.EMAIL:
-      //TO DO
       case MultifactorType.APP:
         const codes = await this.prisma.user_code_recovery.findMany({
           where: {
@@ -607,8 +611,8 @@ export class AuthService implements OnModuleInit {
     }
   }
 
-  async login({ email, password }: LoginDTO) {
-    return this.loginWithEmailAndPassword(email, password);
+  async login(locale: string, { email, password }: LoginDTO) {
+    return this.loginWithEmailAndPassword(locale, email, password);
   }
 
   async verify(id: number) {

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);
+  }
+}