@hedhog/admin 0.51.45 → 0.51.47

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.45",
+  "version": "0.51.47",
   "private": false,
   "main": "dist/index.js",
   "scripts": {

package/src/auth/auth.controller.ts

@@ -9,7 +9,6 @@ import {
   Inject,
   Post,
   Query,
-  Res,
 } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { ChangeDTO } from './dto/change.dto';
@@ -27,7 +26,7 @@ export class AuthController {
   constructor(
     @Inject(forwardRef(() => AuthService))
     private readonly service: AuthService,
-  ) { }
+  ) {}
 
   @Public()
   @Get('create-user')
@@ -151,28 +150,4 @@ export class AuthController {
   async verifyMfa(@Body() { token, email }: { token: string; email: string }) {
     return this.service.verifyMfa(email, token, false);
   }
-
-  @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);
-  }
-
-  @Public()
-  @Get('facebook/login')
-  async loginFacebook(@Res() res) {
-    return this.service.loginFacebook(res);
-  }
-
-  @Public()
-  @Get('facebook/callback')
-  async callbackFacebook(@Query() { code }: { code: string }) {
-    return this.service.callbackFacebook(code);
-  }
 }

package/src/auth/auth.service.ts

@@ -1,6 +1,5 @@
 import { MailService as MailManagerService } from '@hedhog/mail-manager';
 import { PrismaService } from '@hedhog/prisma';
-import { HttpService } from '@nestjs/axios';
 import {
   BadRequestException,
   ConflictException,
@@ -13,8 +12,8 @@ import {
 import { ConfigService } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
 import { compare, genSalt, hash } from 'bcrypt';
+import { randomBytes } from 'crypto';
 import * as qrcode from 'qrcode';
-import { lastValueFrom } from 'rxjs';
 import * as speakeasy from 'speakeasy';
 import { SettingService } from '../setting/setting.service';
 import { ChangeDTO } from './dto/change.dto';
@@ -32,7 +31,6 @@ export class AuthService implements OnModuleInit {
   public settings: Record<string, any> = {};
 
   constructor(
-    private readonly httpService: HttpService,
     private readonly configService: ConfigService,
     @Inject(forwardRef(() => PrismaService))
     private readonly prisma: PrismaService,
@@ -42,7 +40,7 @@ export class AuthService implements OnModuleInit {
     private readonly mail: MailManagerService,
     @Inject(forwardRef(() => SettingService))
     private readonly setting: SettingService,
-  ) { }
+  ) {}
 
   async onModuleInit() {
     this.settings = await this.setting.getSettingValues([
@@ -222,6 +220,10 @@ export class AuthService implements OnModuleInit {
     return Math.floor(Math.random() * (max - min + 1)) + min;
   }
 
+  generateRandomPassword(length = 12) {
+    return randomBytes(length).toString('base64').slice(0, length);
+  }
+
   async loginWithEmailAndPassword(
     locale: string,
     email: string,
@@ -230,6 +232,10 @@ export class AuthService implements OnModuleInit {
     const user = await this.prisma.user.findFirst({
       where: {
         email,
+        password: {
+          not: null,
+          notIn: [''],
+        },
       },
     });
 
@@ -242,6 +248,10 @@ export class AuthService implements OnModuleInit {
       throw new BadRequestException('Acesso negado');
     }
 
+    return this.userMfaSteps(user, locale);
+  }
+
+  async userMfaSteps(user, locale = 'pt') {
     if (!user.multifactor_id) {
       return this.getToken(user);
     } else {
@@ -783,118 +793,4 @@ export class AuthService implements OnModuleInit {
 
     return { ...newToken, codes };
   }
-
-  async loginGoogle(res: any) {
-    const redirectURI = new URL('/callback/google', this.settings['url']).toString();
-    const params = new URLSearchParams({
-      client_id: this.settings['google_client_id'],
-      redirect_uri: redirectURI,
-      response_type: 'code',
-      scope: Array.isArray(this.settings['google_scopes'])
-        ? this.settings['google_scopes'].join(' ')
-        : String(this.settings['google_scopes']),
-    });
-    console.log('loginGoogle', params)
-    return res.redirect(`https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`);
-  }
-
-  async callbackGoogle(code: string) {
-    const tokenUrl = 'https://oauth2.googleapis.com/token';
-    const profileUrl = 'https://www.googleapis.com/oauth2/v2/userinfo';
-    const tokenResponse = await this.fetchOAuthToken({
-      code,
-      url: tokenUrl,
-      clientId: this.settings['google_client_id'],
-      clientSecret: this.settings['google_client_secret'],
-      redirectUri: `${this.settings['url']}/callback/google`,
-    });
-    const profile = await this.fetchOAuthProfile(tokenResponse.access_token, profileUrl);
-    const user = await this.findOrCreateUser(profile);
-    return this.getToken(user);
-  }
-
-  async loginFacebook(res: any) {
-    const redirectURI = new URL('/callback/facebook', this.settings['url']).toString();
-    const params = new URLSearchParams({
-      client_id: this.settings['facebook_client_id'],
-      redirect_uri: redirectURI,
-      response_type: 'code',
-      scope: Array.isArray(this.settings['facebook_scopes'])
-        ? this.settings['facebook_scopes'].join(',')
-        : String(this.settings['facebook_scopes'] ?? 'email'),
-      auth_type: 'rerequest',
-    });
-    console.log('loginFacebook', params);
-    return res.redirect(`https://www.facebook.com/v17.0/dialog/oauth?${params.toString()}`);
-  }
-
-  async callbackFacebook(code: string) {
-    const tokenUrl = 'https://graph.facebook.com/v17.0/oauth/access_token';
-    const profileUrl = 'https://graph.facebook.com/me?fields=id,name,email';
-    const tokenResponse = await this.fetchOAuthToken({
-      code,
-      url: tokenUrl,
-      clientId: this.settings['facebook_client_id'],
-      clientSecret: this.settings['facebook_client_secret'],
-      redirectUri: `${this.settings['url']}/callback/facebook`,
-    });
-    const profile = await this.fetchOAuthProfile(tokenResponse.access_token, profileUrl);
-    const user = await this.findOrCreateUser(profile);
-    return this.getToken(user);
-  }
-
-  private async fetchOAuthToken({
-    code,
-    url,
-    clientId,
-    clientSecret,
-    redirectUri,
-  }: {
-    code: string;
-    url: string;
-    clientId: string;
-    clientSecret: string;
-    redirectUri: string;
-  }) {
-    const body = new URLSearchParams({
-      client_id: clientId,
-      client_secret: clientSecret,
-      redirect_uri: redirectUri,
-      grant_type: 'authorization_code',
-      code,
-    }).toString();
-
-    const response = await lastValueFrom(
-      this.httpService.post(url, body, {
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      }),
-    );
-    return response.data;
-  }
-
-  private async fetchOAuthProfile(accessToken: string, url: string) {
-    const response = await lastValueFrom(
-      this.httpService.get(url, {
-        headers: { Authorization: `Bearer ${accessToken}` },
-      }),
-    );
-    return response.data;
-  }
-
-  private async findOrCreateUser(profile: any) {
-    let user = await this.prisma.user.findFirst({
-      where: { email: profile.email },
-    });
-    if (!user) {
-      user = await this.prisma.user.create({
-        data: {
-          email: profile.email,
-          name: profile.name,
-          password: '',
-          code: profile.id,
-        },
-      });
-    }
-    return user;
-  }
 }

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';