fix: make logout close sockets

This commit is contained in:
yassinedorbozgithub 2025-01-29 11:06:23 +01:00
parent a0844efc4a
commit aa4a0fe438
4 changed files with 31 additions and 6 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -11,6 +11,8 @@ import {
Body,
Controller,
Get,
Headers,
Inject,
InternalServerErrorException,
Param,
Post,
@ -21,7 +23,9 @@ import {
UseGuards,
UseInterceptors,
} from '@nestjs/common';
import { EventEmitter2 } from '@nestjs/event-emitter';
import { CsrfCheck, CsrfGen, CsrfGenAuth } from '@tekuconcept/nestjs-csrf';
import cookie from 'cookie';
import { Request, Response } from 'express';
import { Session as ExpressSession } from 'express-session';
@ -38,6 +42,9 @@ import { UserService } from '../services/user.service';
import { ValidateAccountService } from '../services/validate-account.service';
export class BaseAuthController {
@Inject(EventEmitter2)
private readonly eventEmitter: EventEmitter2;
constructor(protected readonly logger: LoggerService) {}
/**
@ -66,7 +73,13 @@ export class BaseAuthController {
logout(
@Session() session: ExpressSession,
@Res({ passthrough: true }) res: Response,
@Headers() headers: Record<string, string>,
) {
const parsedCookie = cookie.parse(headers['cookie']);
const sessionCookie = encodeURIComponent(
String(parsedCookie[config.session.name] || ''),
);
this.eventEmitter.emit('hook:websocket:session_data', sessionCookie);
res.clearCookie(config.session.name);
session.destroy((error) => {

View File

@ -1,12 +1,12 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { EventEmitter2 } from '@nestjs/event-emitter';
import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
import {
ConnectedSocket,
MessageBody,
@ -258,6 +258,17 @@ export class WebsocketGateway
this.eventEmitter.emit(`hook:websocket:connection`, client);
}
@OnEvent('hook:websocket:session_data')
disconnectSockets(sessionCookie: string) {
if (sessionCookie.length) {
for (const [socketId, socket] of this.io.sockets.sockets) {
if (socket.handshake.headers.cookie?.includes(sessionCookie)) {
this.io.sockets.sockets.get(socketId)?.disconnect(true);
}
}
}
}
async handleDisconnect(client: Socket): Promise<void> {
this.logger.log(`Client id:${client.id} disconnected`);
// Configurable custom afterDisconnect logic here

View File

@ -1,5 +1,5 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@ -116,6 +116,7 @@ declare module '@nestjs/event-emitter' {
object,
{
connection: Socket;
session_data: string;
}
>;
}

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "hexabot",
"version": "2.2.2",
"version": "2.2.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "hexabot",
"version": "2.2.2",
"version": "2.2.3",
"license": "AGPL-3.0-only",
"workspaces": [
"frontend",