refactor(core): Remove all legacy auth middleware code (no-changelog) (#8755)

packages/cli/src/push/index.ts

@@ -7,14 +7,13 @@ import { Server as WSServer } from 'ws';
 import { parse as parseUrl } from 'url';
 import { Container, Service } from 'typedi';
 import config from '@/config';
-import { resolveJwt } from '@/auth/jwt';
-import { AUTH_COOKIE_NAME } from '@/constants';
 import { SSEPush } from './sse.push';
 import { WebSocketPush } from './websocket.push';
 import type { PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
 import type { IPushDataType } from '@/Interfaces';
 import type { User } from '@db/entities/User';
 import { OnShutdown } from '@/decorators/OnShutdown';
+import { AuthService } from '@/auth/auth.service';
 
 const useWebSockets = config.getEnv('push.backend') === 'websocket';
 
@@ -120,27 +119,15 @@ export const setupPushHandler = (restEndpoint: string, app: Application) => {
 			}
 			return;
 		}
-		try {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-			const authCookie: string = req.cookies?.[AUTH_COOKIE_NAME] ?? '';
-			const user = await resolveJwt(authCookie);
-			req.userId = user.id;
-		} catch (error) {
-			if (ws) {
-				ws.send(`Unauthorized: ${(error as Error).message}`);
-				ws.close(1008);
-			} else {
-				res.status(401).send('Unauthorized');
-			}
-			return;
-		}
 
 		next();
 	};
 
 	const push = Container.get(Push);
+	const authService = Container.get(AuthService);
 	app.use(
 		endpoint,
+		authService.createAuthMiddleware('any'),
 		pushValidationMiddleware,
 		(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) => push.handleRequest(req, res),
 	);

packages/cli/src/push/types.ts

@@ -1,10 +1,12 @@
-import type { User } from '@db/entities/User';
-import type { Request, Response } from 'express';
+import type { Response } from 'express';
 import type { WebSocket } from 'ws';
 
+import type { User } from '@db/entities/User';
+import type { AuthenticatedRequest } from '@/requests';
+
 // TODO: move all push related types here
 
-export type PushRequest = Request<{}, {}, {}, { sessionId: string }>;
+export type PushRequest = AuthenticatedRequest<{}, {}, {}, { sessionId: string }>;
 
 export type SSEPushRequest = PushRequest & { ws: undefined; userId: User['id'] };
 export type WebSocketPushRequest = PushRequest & { ws: WebSocket; userId: User['id'] };