From b869b83a3f7486ffaf0439a997d3107067b0ecd2 Mon Sep 17 00:00:00 2001 From: nkhangg Date: Wed, 19 Mar 2025 15:36:57 +0700 Subject: [PATCH] ignore password --- auto-bid-admin/src/components/dashboard/working-page.tsx | 4 ---- auto-bid-admin/src/pages/dashboard.tsx | 6 ++---- auto-bid-server/src/modules/bids/entities/wed-bid.entity.ts | 2 ++ auto-bid-server/src/modules/bids/getways/bid-getway.ts | 4 ++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/auto-bid-admin/src/components/dashboard/working-page.tsx b/auto-bid-admin/src/components/dashboard/working-page.tsx index 63cd898..df1bb41 100644 --- a/auto-bid-admin/src/components/dashboard/working-page.tsx +++ b/auto-bid-admin/src/components/dashboard/working-page.tsx @@ -35,10 +35,6 @@ export default function WorkingPage({ data, socket }: IWorkingPageProps) { }; }, [socket, data.id, data.type]); - useEffect(() => { - console.log({ imageSrc }); - }, [imageSrc]); - return ( <> diff --git a/auto-bid-admin/src/pages/dashboard.tsx b/auto-bid-admin/src/pages/dashboard.tsx index 9fc512b..9e9f590 100644 --- a/auto-bid-admin/src/pages/dashboard.tsx +++ b/auto-bid-admin/src/pages/dashboard.tsx @@ -27,9 +27,7 @@ export default function DashBoard() { console.log('❌ WebSocket disconnected'); }); - socket.on('bidsUpdated', (data: IWebBid[]) => { - console.log('📢 Bids Data:', data); - + socket.on('adminBidsUpdated', (data: IWebBid[]) => { const array = data.reduce((prev, cur) => { if (cur.children?.length > 0) { prev = [...prev, ...cur.children]; @@ -56,7 +54,7 @@ export default function DashBoard() { return () => { console.log('🔌 Cleanup WebSocket listeners...'); - socket.off('bidsUpdated'); + socket.off('adminBidsUpdated'); socket.off('working'); socket.off('connect'); socket.off('disconnect'); diff --git a/auto-bid-server/src/modules/bids/entities/wed-bid.entity.ts b/auto-bid-server/src/modules/bids/entities/wed-bid.entity.ts index c4867aa..5111002 100644 --- a/auto-bid-server/src/modules/bids/entities/wed-bid.entity.ts +++ b/auto-bid-server/src/modules/bids/entities/wed-bid.entity.ts @@ -1,6 +1,7 @@ import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm'; import { Timestamp } from './timestamp'; import { Bid } from './bid.entity'; +import { Exclude } from 'class-transformer'; @Entity('web_bids') export class WebBid extends Timestamp { @@ -17,6 +18,7 @@ export class WebBid extends Timestamp { username: string; @Column({ default: null, nullable: true }) + @Exclude() password: string; @Column({ default: true }) diff --git a/auto-bid-server/src/modules/bids/getways/bid-getway.ts b/auto-bid-server/src/modules/bids/getways/bid-getway.ts index 9fffc8b..61fc675 100644 --- a/auto-bid-server/src/modules/bids/getways/bid-getway.ts +++ b/auto-bid-server/src/modules/bids/getways/bid-getway.ts @@ -8,6 +8,8 @@ import { Server, Socket } from 'socket.io'; import { EventEmitter2 } from '@nestjs/event-emitter'; import { BidsService } from '../services/bids.service'; import { WebBidsService } from '../services/web-bids.service'; +import { plainToClass } from 'class-transformer'; +import { WebBid } from '../entities/wed-bid.entity'; @WebSocketGateway({ cors: { @@ -29,6 +31,7 @@ export class BidGateway implements OnGatewayConnection { async onModuleInit() { this.eventEmitter.on('bids.updated', (data) => { this.server.emit('bidsUpdated', data); + this.server.emit('adminBidsUpdated', plainToClass(WebBid, data)); }); this.eventEmitter.on('web.updated', (data) => { @@ -46,5 +49,6 @@ export class BidGateway implements OnGatewayConnection { const data = await this.webBidsService.getDataClient(); // Gửi dữ liệu bids ngay khi client kết nối client.emit('bidsUpdated', data); + client.emit('adminBidsUpdated', plainToClass(WebBid, data)); } }