fix: socket with passport middleware

Signed-off-by: Pranav C <pranavxc@gmail.com>

packages/nocodb-nest/src/app.module.ts

@@ -59,6 +59,7 @@ import type {
   OnApplicationBootstrap,
   Provider,
 } from '@nestjs/common';
+import { ClientService } from './services/client/client.service';
 
 export const JwtStrategyProvider: Provider = {
   provide: JwtStrategy,
@@ -133,6 +134,7 @@ export const JwtStrategyProvider: Provider = {
     JwtStrategyProvider,
     LocalStrategy,
     ExtractProjectIdMiddleware,
+    ClientService,
   ],
 })
 export class AppModule implements OnApplicationBootstrap {
@@ -159,6 +161,6 @@ export class AppModule implements OnApplicationBootstrap {
     Noco.config = this.connection.config;
 
     // run upgrader
-    await NcUpgrader.upgrade({ ncMeta: Noco._ncMeta });
+    // await NcUpgrader.upgrade({ ncMeta: Noco._ncMeta });
   }
 }

packages/nocodb-nest/src/db/BaseModelSqlv2.ts

@@ -50,8 +50,6 @@ import genRollupSelectv2 from './genRollupSelectv2';
 import conditionV2 from './conditionV2';
 import sortV2 from './sortV2';
 import { customValidators } from './util/customValidators';
-import type LookupColumn from '../../../nocodb/src/lib/models/LookupColumn';
-import type { XKnex } from '../../../nocodb/src/lib/db/sql-data-mapper';
 import type {
   XcFilter,
   XcFilterWithAlias,
@@ -67,6 +65,7 @@ import type {
 } from '../models';
 import type { Knex } from 'knex';
 import type { SortType } from 'nocodb-sdk';
+import { XKnex } from './CustomKnex';
 
 export async function getViewAndModelByAliasOrId(param: {
   projectName: string;

packages/nocodb-nest/src/helpers/populateMeta.ts

@@ -1,5 +1,5 @@
 import { ModelTypes, UITypes, ViewTypes } from 'nocodb-sdk';
-import { isVirtualCol, RelationTypes } from '../../../nocodb-sdk';
+import { isVirtualCol, RelationTypes } from 'nocodb-sdk';
 import Column from '../models/Column';
 import Model from '../models/Model';
 import NcConnectionMgrv2 from '../utils/common/NcConnectionMgrv2';

packages/nocodb-nest/src/modules/projects/projects.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import * as DOMPurify from 'isomorphic-dompurify';
 import { customAlphabet } from 'nanoid';
 import { T } from 'nc-help';
-import { OrgUserRoles } from '../../../../nocodb-sdk';
+import { OrgUserRoles } from 'nocodb-sdk';
 import { populateMeta, validatePayload } from '../../helpers';
 import { NcError } from '../../helpers/catchError';
 import { extractPropsAndSanitize } from '../../helpers/extractProps';
@@ -12,7 +12,7 @@ import { Project, ProjectUser } from '../../models';
 import Noco from '../../Noco';
 import extractRolesObj from '../../utils/extractRolesObj';
 import NcConfigFactory from '../../utils/NcConfigFactory';
-import type { ProjectUpdateReqType } from '../../../../nocodb-sdk';
+import type { ProjectUpdateReqType } from 'nocodb-sdk';
 import type { ProjectReqType } from 'nocodb-sdk';
 
 const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 4);

packages/nocodb-nest/src/modules/users/helpers.ts

@@ -16,7 +16,7 @@ export function genJwt(user: User, config: NcConfig) {
     },
     config.auth.jwt.secret,
     // todo: better typing
-    config.auth.jwt.options as any,
+    { expiresIn: '10h', ...(config.auth.jwt.options as any) },
   );
 }
 

packages/nocodb-nest/src/modules/users/users.service.ts

@@ -482,9 +482,6 @@ export class UsersService {
   }
 
   async login(user: any) {
-    delete user.password;
-    delete user.salt;
-    const payload = user;
     return {
       token: genJwt(user, Noco.getConfig()), //this.jwtService.sign(payload),
     };

packages/nocodb-nest/src/modules/utils/utils.controller.ts

@@ -53,10 +53,6 @@ export class UtilsController {
   async axiosRequestMake(@Body() body: any) {
     return await this.utilsService.axiosRequestMake({ body });
   }
-  @Get('/api/v1/aggregated-meta-info')
-  async aggregatedMetaInfo() {
-    return await this.utilsService.aggregatedMetaInfo();
-  }
 
   @Post('/api/v1/url_to_config')
   async urlToDbConfig(@Body() body: any) {
@@ -64,4 +60,11 @@ export class UtilsController {
       body,
     });
   }
+
+  @Get('/api/v1/aggregated-meta-info')
+  async aggregatedMetaInfo() {
+    // todo: refactor
+    return (await this.utilsService.aggregatedMetaInfo()) as any;
+  }
+
 }

packages/nocodb-nest/src/services/client/client.service.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { ClientService } from './client.service';
+
+describe('ClientService', () => {
+  let service: ClientService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [ClientService],
+    }).compile();
+
+    service = module.get<ClientService>(ClientService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});

packages/nocodb-nest/src/services/client/client.service.ts

@@ -0,0 +1,84 @@
+import crypto from 'crypto';
+import { Inject, Injectable, UnauthorizedException } from '@nestjs/common';
+import { HttpAdapterHost } from '@nestjs/core';
+import { T } from 'nc-help';
+import { Server } from 'socket.io';
+import { AuthGuard } from '@nestjs/passport';
+import { JwtStrategy } from '../../strategies/jwt.strategy';
+import type { OnModuleInit } from '@nestjs/common';
+import type { Socket } from 'socket.io';
+import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context-host';
+
+function getHash(str) {
+  return crypto.createHash('md5').update(str).digest('hex');
+}
+
+@Injectable()
+export class ClientService implements OnModuleInit {
+  // private server: HttpServer;
+  private clients: { [id: string]: Socket } = {};
+  private jobs: { [id: string]: { last_message: any } } = {};
+
+  constructor(
+    private jwtStrategy: JwtStrategy,
+    @Inject(HttpAdapterHost) private httpAdapterHost: HttpAdapterHost,
+  ) {
+    // this.server = this.httpAdapterHost.httpAdapter.getHttpServer();
+  }
+
+  async onModuleInit() {
+    const io = new Server(this.httpAdapterHost.httpAdapter.getHttpServer(), {
+      cors: {
+        origin: '*',
+        allowedHeaders: ['xc-auth'],
+        credentials: true,
+      },
+    });
+    io.use(async (socket, next) => {
+      // const authGuard = new (AuthGuard('jwt'))();
+      // const result = await authGuard.canActivate(socket.handshake as any);
+      // if (!result) {
+      //   throw new UnauthorizedException();
+      // }
+      // return new Promise((resolve, reject) => {
+      //   this.jwtStrategy.authenticate(
+      //     socket.handshake as any,
+      //     (error, user) => {
+      //       if (error) {
+      //         reject(new UnauthorizedException(error.message));
+      //       } else {
+      //         resolve(user);
+      //       }
+      //     },
+      //   );
+      // });
+      try {
+        const context = new ExecutionContextHost([socket.handshake as any]);
+        const guard = new (AuthGuard('jwt'))(context);
+        const canActivate = await guard.canActivate(context);
+      } catch {}
+
+      next()
+    }).on('connection', (socket) => {
+      this.clients[socket.id] = socket;
+      const id = getHash(
+        (process.env.NC_SERVER_UUID || T.id) +
+          (socket?.handshake as any)?.user?.id,
+      );
+
+      socket.on('page', (args) => {
+        T.page({ ...args, id });
+      });
+      socket.on('event', (args) => {
+        T.event({ ...args, id });
+      });
+      socket.on('subscribe', (room) => {
+        if (room in this.jobs) {
+          socket.join(room);
+          socket.emit('job');
+          socket.emit('progress', this.jobs[room].last_message);
+        }
+      });
+    });
+  }
+}

packages/nocodb-nest/src/strategies/jwt.strategy.ts

@@ -1,31 +1,24 @@
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
-import { OrgUserRoles } from '../../../nocodb-sdk';
+import { OrgUserRoles } from 'nocodb-sdk';
 import NocoCache from '../cache/NocoCache';
 import { ProjectUser, User } from '../models';
-import { genJwt } from '../modules/users/helpers'
+import { genJwt } from '../modules/users/helpers';
-import Noco from '../Noco'
+import Noco from '../Noco';
 import extractRolesObj from '../utils/extractRolesObj';
 import { CacheGetType, CacheScope } from '../utils/globals';
 import { jwtConstants } from '../modules/auth/constants';
 import { UsersService } from '../modules/users/users.service';
-import NcConfigFactory from '../utils/NcConfigFactory'
+import NcConfigFactory from '../utils/NcConfigFactory';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
-  constructor(options, private userService: UsersService, ) {
+  constructor(options, private userService: UsersService) {
-    super(
+    super({
-      options
+      expiresIn: '10h',
-    )
+      ...options,
-    //   {
+    });
-    //   // ignoreExpiration: false,
-    //   jwtFromRequest: ExtractJwt.fromHeader('xc-auth'),
-    //   expiresIn: '10h',
-    //   passReqToCallback: true,
-    //   secretOrKey: process.env.NC_AUTH_JWT_SECRET ?? 'temporary-key'
-    //
-    // });
   }
 
   async validate(req: any, jwtPayload: any) {

packages/nocodb-nest/src/strategies/local.strategy.ts

@@ -3,7 +3,7 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Injectable } from '@nestjs/common';
 import { AuthService } from '../modules/auth/auth.service';
 import extractRolesObj from '../utils/extractRolesObj';
-import { NcError } from '../../../nocodb/src/lib/meta/helpers/catchError';
+import { NcError } from '../helpers/catchError';
 
 @Injectable()
 export class LocalStrategy extends PassportStrategy(Strategy) {