Browse Source

fix: url ensure trailing slash

pull/6157/head
lolgopher 1 year ago
parent
commit
1c3dbf7318
  1. 7
      packages/nocodb/src/gateways/socket.gateway.ts
  2. 9
      packages/nocodb/src/modules/jobs/jobs.gateway.ts

7
packages/nocodb/src/gateways/socket.gateway.ts

@ -15,13 +15,18 @@ function getHash(str) {
} }
const url = new URL(process.env.NC_PUBLIC_URL || `http://localhost:${process.env.PORT || '8080'}/`) const url = new URL(process.env.NC_PUBLIC_URL || `http://localhost:${process.env.PORT || '8080'}/`)
let namespace = url.pathname
if (!namespace.endsWith('/')) {
namespace = namespace + '/';
}
@WebSocketGateway({ @WebSocketGateway({
cors: { cors: {
origin: '*', origin: '*',
allowedHeaders: ['xc-auth'], allowedHeaders: ['xc-auth'],
credentials: true, credentials: true,
}, },
namespace: url.pathname, namespace: namespace,
}) })
@Injectable() @Injectable()
export class SocketGateway implements OnModuleInit { export class SocketGateway implements OnModuleInit {

9
packages/nocodb/src/modules/jobs/jobs.gateway.ts

@ -15,13 +15,20 @@ import type { OnModuleInit } from '@nestjs/common';
import type { JobStatus } from '../../interface/Jobs'; import type { JobStatus } from '../../interface/Jobs';
const url = new URL(process.env.NC_PUBLIC_URL || `http://localhost:${process.env.PORT || '8080'}/`) const url = new URL(process.env.NC_PUBLIC_URL || `http://localhost:${process.env.PORT || '8080'}/`)
let namespace = url.pathname
if (!namespace.endsWith('/')) {
namespace = namespace + '/jobs';
} else {
namespace = namespace + 'jobs';
}
@WebSocketGateway({ @WebSocketGateway({
cors: { cors: {
origin: '*', origin: '*',
allowedHeaders: ['xc-auth'], allowedHeaders: ['xc-auth'],
credentials: true, credentials: true,
}, },
namespace: `${url.pathname}jobs`, namespace: namespace,
}) })
export class JobsGateway implements OnModuleInit { export class JobsGateway implements OnModuleInit {
constructor(@Inject('JobsService') private readonly jobsService) {} constructor(@Inject('JobsService') private readonly jobsService) {}

Loading…
Cancel
Save