@hedhog/admin 0.51.16 → 0.51.21

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/hedhog.yaml

@@ -534,7 +534,7 @@ data:
             description:
               en: The scopes for Google OAuth
               pt: Os escopos para o OAuth do Google
-            value: email,profile
+            value: '{["email","profile"]}'
             user_override: false
           - slug: facebook_client_id
             type: string
@@ -564,7 +564,7 @@ data:
             description:
               en: The scopes for Facebook OAuth
               pt: Os escopos para o OAuth do Facebook
-            value: id,emails,name,displayName,photos
+            value: '{["id","emails","name","displayName","photos"]}'
             user_override: false
   menu:
     - url: /management/setting

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedhog/admin",
-  "version": "0.51.16",
+  "version": "0.51.21",
   "private": false,
   "main": "dist/index.js",
   "scripts": {
@@ -27,29 +27,30 @@
   "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",
     "@nestjs/config": "^4.0.1",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/mapped-types": "^2.1.0",
-    "@types/passport-google-oauth20": "^2.0.16",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.3"
   },
   "peerDependencies": {
     "@hedhog/locale": "latest",
     "@hedhog/mail": "latest",
+    "@hedhog/mail-manager": "latest",
     "@hedhog/pagination": "latest",
     "@hedhog/prisma": "latest",
     "@hedhog/utils": "latest",
     "@nestjs/jwt": "^10.2.0"
   },
   "dependencies": {
-    "@nestjs/passport": "^11.0.5",
-    "passport": "^0.7.0",
-    "passport-google-oauth20": "^2.0.0",
+    "@nestjs/axios": "^4.0.0",
+    "axios": "^1.8.4",
     "qrcode": "^1.5.4",
-    "speakeasy": "^2.0.0"
+    "speakeasy": "^2.0.0",
+    "uuid": "^11.1.0"
   }
 }

package/src/admin.module.ts

@@ -1,7 +1,9 @@
 import { LocaleModule } from '@hedhog/locale';
 import { MailModule } from '@hedhog/mail';
+import { MailManagerModule } from '@hedhog/mail-manager';
 import { PaginationModule } from '@hedhog/pagination';
 import { PrismaModule } from '@hedhog/prisma';
+import { HttpModule } from '@nestjs/axios';
 import { forwardRef, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { AuthModule } from './auth/auth.module';
@@ -16,10 +18,12 @@ import { UserModule } from './user/user.module';
 
 @Module({
   imports: [
+    HttpModule,
     ConfigModule.forRoot(),
     forwardRef(() => AuthModule),
     forwardRef(() => DashboardModule),
     forwardRef(() => MailModule),
+    forwardRef(() => MailManagerModule),
     forwardRef(() => MenuModule),
     forwardRef(() => PaginationModule),
     forwardRef(() => RoleModule),
@@ -35,6 +39,7 @@ import { UserModule } from './user/user.module';
     UserModule,
     AuthModule,
     MailModule,
+    MailManagerModule,
     RouteModule,
     RoleModule,
     MenuModule,

package/src/auth/auth.controller.ts

@@ -1,13 +1,15 @@
 import { Public, Role, User } from '@hedhog/core';
+import { Locale } from '@hedhog/locale';
 import {
   Body,
   Controller,
+  Delete,
   forwardRef,
   Get,
   Inject,
   Post,
   Query,
-  Delete,
+  Res,
 } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { ChangeDTO } from './dto/change.dto';
@@ -35,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()
@@ -47,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()
@@ -80,6 +82,7 @@ export class AuthController {
   @Public()
   @Post('forget')
   async forget(
+    @Locale() locale: string,
     @Body()
     {
       email,
@@ -88,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,
@@ -106,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,
@@ -118,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')
@@ -137,4 +151,16 @@ export class AuthController {
     console.log('mfa-verify');
     return this.service.verifyMfa(id, token);
   }
+
+  @Public()
+  @Get('google/login')
+  async loginGoogle(@Res() res) {
+    return this.service.loginGoogle(res);
+  }
+
+  @Public()
+  @Get('google/callback')
+  async callbackGoogle(@Query() { code }: { code: string }) {
+    return this.service.callbackGoogle(code);
+  }
 }

package/src/auth/auth.module.ts

@@ -1,5 +1,7 @@
 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';
 import { ConfigModule } from '@nestjs/config';
 import { APP_GUARD } from '@nestjs/core';
@@ -27,8 +29,10 @@ import { AuthGuard } from './guards/auth.guard';
     ),
     forwardRef(() => PrismaModule),
     forwardRef(() => MailModule),
+    forwardRef(() => MailManagerModule),
     forwardRef(() => SettingModule),
     ConfigModule,
+    HttpModule,
   ],
   controllers: [AuthController],
   providers: [