@hedhog/admin 0.51.38 → 0.51.40

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/tables/setting.yaml

@@ -15,6 +15,7 @@ columns:
       - number
       - boolean
       - json
+      - locale
     default: string
   - name: value
     length: 1023

package/package.json

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

package/src/auth/auth.controller.ts

@@ -27,7 +27,7 @@ export class AuthController {
   constructor(
     @Inject(forwardRef(() => AuthService))
     private readonly service: AuthService,
-  ) {}
+  ) { }
 
   @Public()
   @Get('create-user')
@@ -149,7 +149,7 @@ export class AuthController {
   @Public()
   @Post('mfa-verify')
   async verifyMfa(@Body() { token, email }: { token: string; email: string }) {
-    return this.service.verifyMfa(email, token);
+    return this.service.verifyMfa(email, token, false);
   }
 
   @Public()
@@ -163,4 +163,16 @@ export class AuthController {
   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

@@ -42,7 +42,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([
@@ -735,7 +735,11 @@ export class AuthService implements OnModuleInit {
     }
   }
 
-  async verifyMfa(email: string, token: string, verifyMultifactor = true) {
+  async verifyMfa(
+    email: string,
+    token: string,
+    verifyMultifactor: boolean = true,
+  ) {
     const window = this.settings['mfa-window'] ?? 0;
     const step = this.settings['mfa-setp'] ?? 30;
 
@@ -861,4 +865,68 @@ export class AuthService implements OnModuleInit {
 
     return user;
   }
+
+  async loginFacebook(res: any) {
+    const redirectURI = new URL(
+      '/auth/facebook/callback',
+      this.settings['url'],
+    ).toString();
+
+    const params = new URLSearchParams({
+      client_id: this.settings['facebook_client_id'],
+      redirect_uri: redirectURI,
+      response_type: 'code',
+      scope: (this.settings['facebook_scopes'] ?? ['email']).join(','),
+      auth_type: 'rerequest',
+    });
+
+    const url = `https://www.facebook.com/v17.0/dialog/oauth?${params.toString()}`;
+
+    return res.redirect(url);
+  }
+
+  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.fetchFacebookToken(code, tokenUrl);
+    const profile = await this.fetchFacebookProfile(
+      tokenResponse.access_token,
+      profileUrl,
+    );
+
+    let user = await this.findOrCreateUser(profile);
+
+    return this.getToken(user);
+  }
+
+  private async fetchFacebookToken(code: string, url: string) {
+    const response = await lastValueFrom(
+      this.httpService.post(
+        url,
+        new URLSearchParams({
+          client_id: this.settings['facebook_client_id'],
+          client_secret: this.settings['facebook_client_secret'],
+          redirect_uri: `${this.settings['url']}/auth/facebook/callback`,
+          grant_type: 'authorization_code',
+          code,
+        }).toString(),
+        {
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        },
+      ),
+    );
+
+    return response.data;
+  }
+
+  private async fetchFacebookProfile(accessToken: string, url: string) {
+    const response = await lastValueFrom(
+      this.httpService.get(url, {
+        headers: { Authorization: `Bearer ${accessToken}` },
+      }),
+    );
+
+    return response.data;
+  }
 }

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/setting/setting.service.ts

@@ -361,7 +361,7 @@ export class SettingService {
     const data: Record<string, any> = {};
 
     for (const s of setting) {
-      switch (s.type) {
+      switch (s.type as any) {
         case 'boolean':
           data[s.slug] = s.value === 'true';
           break;
@@ -373,10 +373,17 @@ export class SettingService {
           try {
             data[s.slug] = JSON.parse(s.value);
           } catch (err) {
-            console.error('Error parsing JSON', s.value, err);
+            console.warn('Error parsing JSON', s.value, err);
             data[s.slug] = s.value;
           }
           break;
+        case 'locale':
+          try {
+            data[s.slug] = JSON.parse(s.value);
+          } catch (err) {
+            console.warn('Error parsing locale JSON', s.value, err);
+            data[s.slug] = s.value;
+          }
         default:
           data[s.slug] = s.value;
       }
@@ -387,6 +394,18 @@ export class SettingService {
         ss.value;
     });
 
+    for (const s of slug) {
+      const notFoundSlugs: string[] = [];
+      if (data[s] === undefined) {
+        notFoundSlugs.push(s);
+      }
+      if (notFoundSlugs.length > 0) {
+        throw new BadRequestException(
+          `Settings with slugs ${notFoundSlugs.join(', ')} not found.`,
+        );
+      }
+    }
+
     return data;
   }