remove use of created types

Author: nazabucciarelli

apps/meteor/app/statistics/server/lib/SAUMonitor.ts

@@ -1,4 +1,4 @@
-import type { ISession, ISessionDevice, IUser, LoginSessionPayload, LogoutSessionPayload } from '@rocket.chat/core-typings';
+import type { ISession, ISessionDevice, IUser } from '@rocket.chat/core-typings';
 import { cronJobs } from '@rocket.chat/cron';
 import { Logger } from '@rocket.chat/logger';
 import { Sessions, Users, aggregates } from '@rocket.chat/models';
@@ -31,6 +31,16 @@ const getUserRoles = mem(
 
 const isProdEnv = process.env.NODE_ENV === 'production';
 
+type HandleSessionArgs = {
+	userId: string;
+	instanceId: string;
+	userAgent: string;
+	loginToken?: string;
+	connectionId: string;
+	clientAddress: string;
+	host: string;
+};
+
 /**
  * Server Session Monitor for SAU(Simultaneously Active Users) based on Meteor server sessions
  */
@@ -110,24 +120,21 @@ export class SAUMonitorClass {
 			return;
 		}
 
-		sauEvents.on(
-			'sau.accounts.login',
-			async ({ userId, instanceId, userAgent, loginToken, connectionId, clientAddress, host }: LoginSessionPayload) => {
-				if (!this.isRunning()) {
-					return;
-				}
+		sauEvents.on('sau.accounts.login', async ({ userId, instanceId, userAgent, loginToken, connectionId, clientAddress, host }) => {
+			if (!this.isRunning()) {
+				return;
+			}
 
-				const roles = await getUserRoles(userId);
+			const roles = await getUserRoles(userId);
 
-				const mostImportantRole = getMostImportantRole(roles);
+			const mostImportantRole = getMostImportantRole(roles);
 
-				const loginAt = new Date();
-				const params = { roles, mostImportantRole, loginAt, ...getDateObj() };
-				await this._handleSession({ userId, instanceId, userAgent, loginToken, connectionId, clientAddress, host }, params);
-			},
-		);
+			const loginAt = new Date();
+			const params = { roles, mostImportantRole, loginAt, ...getDateObj() };
+			await this._handleSession({ userId, instanceId, userAgent, loginToken, connectionId, clientAddress, host }, params);
+		});
 
-		sauEvents.on('sau.accounts.logout', async ({ userId, sessionId }: LogoutSessionPayload) => {
+		sauEvents.on('sau.accounts.logout', async ({ userId, sessionId }) => {
 			if (!this.isRunning()) {
 				return;
 			}
@@ -158,12 +165,12 @@ export class SAUMonitorClass {
 	}
 
 	private async _handleSession(
-		{ userId, instanceId, userAgent, loginToken, connectionId, clientAddress, host }: LoginSessionPayload,
+		{ userId, instanceId, userAgent, loginToken, connectionId, clientAddress, host }: HandleSessionArgs,
 		params: Pick<ISession, 'mostImportantRole' | 'loginAt' | 'day' | 'month' | 'year' | 'roles'>,
 	): Promise<void> {
 		const data: Omit<ISession, '_id' | '_updatedAt' | 'createdAt' | 'searchTerm'> = {
 			userId,
-			loginToken,
+			...(loginToken && { loginToken }),
 			ip: clientAddress,
 			host,
 			sessionId: connectionId,

apps/meteor/server/hooks/sauMonitorHooks.ts

@@ -1,10 +1,3 @@
-import type {
-	LoginSessionPayload,
-	LogoutSessionPayload,
-	SocketConnectedPayload,
-	SocketDisconnectedPayload,
-	DeviceLoginPayload,
-} from '@rocket.chat/core-typings';
 import { InstanceStatus } from '@rocket.chat/instance-status';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
@@ -28,59 +21,38 @@ Accounts.onLogin((info: ILoginAttempt) => {
 	const { resume } = methodArguments.find((arg) => 'resume' in arg) ?? {};
 	const loginToken = resume ? Accounts._hashLoginToken(resume) : '';
 	const instanceId = InstanceStatus.id();
-	const userId = info.user._id;
-	const connectionId = info.connection.id;
 	const clientAddress = getClientAddress(info.connection);
 	const userAgent = getHeader(httpHeaders, 'user-agent');
 	const host = getHeader(httpHeaders, 'host');
 
-	const loginEventObject: LoginSessionPayload = {
-		userId,
+	sauEvents.emit('sau.accounts.login', {
+		userId: info.user._id,
 		instanceId,
 		userAgent,
 		loginToken,
-		connectionId,
+		connectionId: info.connection.id,
 		clientAddress,
 		host,
-	};
-	sauEvents.emit('sau.accounts.login', loginEventObject);
+	});
 
-	const deviceLoginEventObject: DeviceLoginPayload = {
-		userId,
-		userAgent,
-		loginToken,
-		clientAddress,
-	};
-	deviceManagementEvents.emit('device-login', deviceLoginEventObject);
+	deviceManagementEvents.emit('device-login', { userId: info.user._id, userAgent, loginToken, clientAddress });
 });
 
 Accounts.onLogout((info) => {
 	if (!info.user) {
 		return;
 	}
 
-	const logoutEventObject: LogoutSessionPayload = {
-		userId: info.user._id,
-		sessionId: info.connection.id,
-	};
-
-	sauEvents.emit('sau.accounts.logout', logoutEventObject);
+	sauEvents.emit('sau.accounts.logout', { userId: info.user._id, sessionId: info.connection.id });
 });
 
 Meteor.onConnection((connection) => {
 	connection.onClose(async () => {
-		const socketDisconnectedEventObject: SocketDisconnectedPayload = {
-			connectionId: connection.id,
-			instanceId: InstanceStatus.id(),
-		};
-		sauEvents.emit('sau.socket.disconnected', socketDisconnectedEventObject);
+		sauEvents.emit('sau.socket.disconnected', { connectionId: connection.id, instanceId: InstanceStatus.id() });
 	});
 });
 
 Meteor.onConnection((connection) => {
-	const socketConnectedEventObject: SocketConnectedPayload = {
-		// Implement SocketConnectedPayload type in case of using the sau.socket.connected hook
-		...connection,
-	};
-	sauEvents.emit('sau.socket.connected', socketConnectedEventObject);
+	// in case of implementing a listener of this event, define the parameters type in services/sauMonitor/events.ts
+	sauEvents.emit('sau.socket.connected', { instanceId: InstanceStatus.id(), connectionId: connection.id });
 });

apps/meteor/server/services/device-management/events.ts

@@ -1,6 +1,5 @@
-import type { DeviceLoginPayload } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 
 export const deviceManagementEvents = new Emitter<{
-	'device-login': DeviceLoginPayload;
+	'device-login': { userId: string; userAgent: string; loginToken: string; clientAddress: string };
 }>();

apps/meteor/server/services/device-management/service.ts

@@ -12,10 +12,12 @@ export class DeviceManagementService extends ServiceClassInternal implements IDe
 		super();
 
 		this.onEvent('accounts.login', async ({ userId, connection }) => {
-			const clientAddress = getClientAddress(connection);
-			const userAgent = getHeader(connection.httpHeaders, 'user-agent');
 			// TODO need to add loginToken to data
-			deviceManagementEvents.emit('device-login', { userId, userAgent, clientAddress });
+			deviceManagementEvents.emit('device-login', {
+				userId,
+				userAgent: getHeader(connection.httpHeaders, 'user-agent'),
+				clientAddress: getClientAddress(connection),
+			});
 		});
 	}
 }

apps/meteor/server/services/sauMonitor/events.ts

@@ -1,14 +1,16 @@
-import type {
-	LoginSessionPayload,
-	LogoutSessionPayload,
-	SocketConnectedPayload,
-	SocketDisconnectedPayload,
-} from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 
 export const sauEvents = new Emitter<{
-	'sau.accounts.login': LoginSessionPayload;
-	'sau.accounts.logout': LogoutSessionPayload;
-	'sau.socket.connected': SocketConnectedPayload;
-	'sau.socket.disconnected': SocketDisconnectedPayload;
+	'sau.accounts.login': {
+		userId: string;
+		instanceId: string;
+		connectionId: string;
+		loginToken: string;
+		clientAddress: string;
+		userAgent: string;
+		host: string;
+	};
+	'sau.accounts.logout': { userId: string; sessionId: string };
+	'sau.socket.connected': { instanceId: string; connectionId: string };
+	'sau.socket.disconnected': { instanceId: string; connectionId: string };
 }>();

apps/meteor/server/services/sauMonitor/service.ts

@@ -20,7 +20,15 @@ export class SAUMonitorService extends ServiceClassInternal implements ISAUMonit
 			const userAgent = getHeader(connection.httpHeaders, 'user-agent');
 			const host = getHeader(connection.httpHeaders, 'host');
 
-			sauEvents.emit('sau.accounts.login', { userId, instanceId, connectionId: connection.id, loginToken: connection.loginToken, clientAddress, userAgent, host });
+			sauEvents.emit('sau.accounts.login', {
+				userId,
+				instanceId,
+				connectionId: connection.id,
+				loginToken: connection.loginToken,
+				clientAddress,
+				userAgent,
+				host,
+			});
 		});
 
 		this.onEvent('accounts.logout', async ({ userId, connection }) => {
@@ -33,7 +41,7 @@ export class SAUMonitorService extends ServiceClassInternal implements ISAUMonit
 
 		this.onEvent('socket.connected', async (data) => {
 			// console.log('socket.connected', data);
-			sauEvents.emit('sau.socket.connected', data);
+			sauEvents.emit('sau.socket.connected', { instanceId: InstanceStatus.id(), connectionId: data.id });
 		});
 	}
 }

packages/core-typings/src/DeviceLoginPayload.ts

@@ -133,11 +133,4 @@ export * from './Abac';
 export * from './ServerAudit/IAuditServerAbacAction';
 export * from './ServerAudit/IAuditUserChangedEvent';
 
-export * from './DeviceLoginPayload';
-
-export * from './sau/LoginSessionPayload';
-export * from './sau/LogoutSessionPayload';
-export * from './sau/SocketDisconnectedPayload';
-export * from './sau/SocketConnectedPayload';
-
 export { schemas } from './Ajv';