Compare commits
10 Commits
572a571acf
...
cb9aff155d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb9aff155d | ||
|
|
822b39f4fd | ||
|
|
912a8e7509 | ||
|
|
17f521008c | ||
|
|
1d6d0b63e9 | ||
|
|
e75d872173 | ||
|
|
1a4fa7e4ab | ||
|
|
b7f6b079c3 | ||
|
|
13f5862654 | ||
|
|
0b19c4eab1 |
@@ -8,6 +8,8 @@ import {
|
|||||||
Query,
|
Query,
|
||||||
HttpException,
|
HttpException,
|
||||||
HttpStatus,
|
HttpStatus,
|
||||||
|
Sse,
|
||||||
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ApiBody, ApiQuery, ApiResponse } from '@nestjs/swagger';
|
import { ApiBody, ApiQuery, ApiResponse } from '@nestjs/swagger';
|
||||||
import { AirportService } from './airport.service';
|
import { AirportService } from './airport.service';
|
||||||
@@ -32,10 +34,16 @@ import { ActiveRunwaysDto } from './dto/activerunways.dto';
|
|||||||
import { Runway } from './models/runway.model';
|
import { Runway } from './models/runway.model';
|
||||||
import { RunwayDto } from './dto/runway.dto';
|
import { RunwayDto } from './dto/runway.dto';
|
||||||
import { AirportOverviewDto } from './dto/airportoverview.dto';
|
import { AirportOverviewDto } from './dto/airportoverview.dto';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { EventsService } from '../events/events.service';
|
||||||
|
import { JwtGuard } from 'src/auth/guards/jwt.guard';
|
||||||
|
|
||||||
@Controller('airport')
|
@Controller('airport')
|
||||||
export class AirportController {
|
export class AirportController {
|
||||||
constructor(private readonly airportService: AirportService) {}
|
constructor(
|
||||||
|
private readonly airportService: AirportService,
|
||||||
|
private readonly eventService: EventsService,
|
||||||
|
) {}
|
||||||
|
|
||||||
private static convertConstraint<T>(
|
private static convertConstraint<T>(
|
||||||
constraint: Constraint | ConstraintDto,
|
constraint: Constraint | ConstraintDto,
|
||||||
@@ -246,6 +254,12 @@ export class AirportController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Sse('/renew')
|
||||||
|
renew(): Observable<unknown> {
|
||||||
|
return this.eventService.subscribeAirportRenew();
|
||||||
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
@Get('/all')
|
@Get('/all')
|
||||||
@ApiResponse({
|
@ApiResponse({
|
||||||
status: 200,
|
status: 200,
|
||||||
@@ -256,6 +270,7 @@ export class AirportController {
|
|||||||
return this.airportService.allAirports();
|
return this.airportService.allAirports();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
@Get('/get')
|
@Get('/get')
|
||||||
@ApiQuery({
|
@ApiQuery({
|
||||||
name: 'icao',
|
name: 'icao',
|
||||||
@@ -280,6 +295,7 @@ export class AirportController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
@Post('/register')
|
@Post('/register')
|
||||||
@ApiBody({
|
@ApiBody({
|
||||||
description: 'The airport definition',
|
description: 'The airport definition',
|
||||||
@@ -317,6 +333,7 @@ export class AirportController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
@Delete('/remove')
|
@Delete('/remove')
|
||||||
@ApiQuery({
|
@ApiQuery({
|
||||||
name: 'icao',
|
name: 'icao',
|
||||||
@@ -340,6 +357,7 @@ export class AirportController {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
@Patch('/activateRunways')
|
@Patch('/activateRunways')
|
||||||
@ApiBody({
|
@ApiBody({
|
||||||
description: 'The airport definition',
|
description: 'The airport definition',
|
||||||
|
|||||||
@@ -3,10 +3,12 @@ import { MongooseModule } from '@nestjs/mongoose';
|
|||||||
import { AirportSchema } from './models/airport.model';
|
import { AirportSchema } from './models/airport.model';
|
||||||
import { AirportService } from './airport.service';
|
import { AirportService } from './airport.service';
|
||||||
import { AirportController } from './airport.controller';
|
import { AirportController } from './airport.controller';
|
||||||
|
import { EventsModule } from 'src/events/events.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
MongooseModule.forFeature([{ name: 'airport', schema: AirportSchema }]),
|
MongooseModule.forFeature([{ name: 'airport', schema: AirportSchema }]),
|
||||||
|
EventsModule,
|
||||||
],
|
],
|
||||||
providers: [AirportService],
|
providers: [AirportService],
|
||||||
controllers: [AirportController],
|
controllers: [AirportController],
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import { LoggingModule } from './logging/logging.module';
|
|||||||
import { InboundModule } from './inbound/inbound.module';
|
import { InboundModule } from './inbound/inbound.module';
|
||||||
import { WeatherModule } from './weather/weather.module';
|
import { WeatherModule } from './weather/weather.module';
|
||||||
import { AuthModule } from './auth/auth.module';
|
import { AuthModule } from './auth/auth.module';
|
||||||
|
import { EventsModule } from './events/events.module';
|
||||||
|
import { SystemModule } from './system/system.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -39,6 +41,8 @@ import { AuthModule } from './auth/auth.module';
|
|||||||
InboundModule,
|
InboundModule,
|
||||||
WeatherModule,
|
WeatherModule,
|
||||||
AuthModule,
|
AuthModule,
|
||||||
|
EventsModule,
|
||||||
|
SystemModule,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AppModule {}
|
export class AppModule {}
|
||||||
|
|||||||
@@ -1,17 +1,22 @@
|
|||||||
import {
|
import {
|
||||||
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
HttpException,
|
HttpException,
|
||||||
HttpStatus,
|
HttpStatus,
|
||||||
|
Patch,
|
||||||
|
Post,
|
||||||
Query,
|
Query,
|
||||||
Redirect,
|
Redirect,
|
||||||
Req,
|
Req,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ApiQuery } from '@nestjs/swagger';
|
import { ApiBody, ApiQuery, ApiResponse } from '@nestjs/swagger';
|
||||||
import { ConfigService } from '@nestjs/config';
|
import { ConfigService } from '@nestjs/config';
|
||||||
import { AuthService } from './auth.service';
|
import { AuthService } from './auth.service';
|
||||||
import { JwtGuard } from './guards/jwt.guard';
|
import { JwtGuard } from './guards/jwt.guard';
|
||||||
|
import { RadarScopeDto } from './dto/radarscope.dto';
|
||||||
|
import { RadarTokenDto } from './dto/radartoken.dto';
|
||||||
import { UserDto } from './dto/user.dto';
|
import { UserDto } from './dto/user.dto';
|
||||||
import { Request } from 'express';
|
import { Request } from 'express';
|
||||||
|
|
||||||
@@ -56,6 +61,49 @@ export class AuthController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Post('/radarScope')
|
||||||
|
@ApiBody({
|
||||||
|
description: 'The airport definition',
|
||||||
|
type: RadarScopeDto,
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'The created Bearer token to use endpoints',
|
||||||
|
type: RadarTokenDto,
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 404,
|
||||||
|
description: 'The VATSIM ID and key combination is invalid',
|
||||||
|
})
|
||||||
|
async radarScope(
|
||||||
|
@Body('scopeData') scopeData: RadarScopeDto,
|
||||||
|
): Promise<RadarTokenDto> {
|
||||||
|
return this.authService
|
||||||
|
.loginRadarScope(scopeData.vatsimId, scopeData.key)
|
||||||
|
.then((token) => {
|
||||||
|
if (token === undefined) {
|
||||||
|
throw new HttpException(
|
||||||
|
'Unknown VATSIM ID or invalid key',
|
||||||
|
HttpStatus.NOT_FOUND,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return { token };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
|
@Get('/validate')
|
||||||
|
@ApiResponse({
|
||||||
|
status: 200,
|
||||||
|
description: 'The created Bearer token to use endpoints',
|
||||||
|
})
|
||||||
|
@ApiResponse({
|
||||||
|
status: 401,
|
||||||
|
description: 'The sent Bearer token is invalid',
|
||||||
|
})
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
||||||
|
validate(): void {}
|
||||||
|
|
||||||
@UseGuards(JwtGuard)
|
@UseGuards(JwtGuard)
|
||||||
@Get('/user')
|
@Get('/user')
|
||||||
async user(@Req() request: Request): Promise<UserDto> {
|
async user(@Req() request: Request): Promise<UserDto> {
|
||||||
@@ -68,9 +116,17 @@ export class AuthController {
|
|||||||
return {
|
return {
|
||||||
vatsimId: user.vatsimId,
|
vatsimId: user.vatsimId,
|
||||||
fullName: user.fullName,
|
fullName: user.fullName,
|
||||||
|
radarScopeKey: user.radarScopeKey,
|
||||||
administrator: user.administrator,
|
administrator: user.administrator,
|
||||||
airportConfigurationAccess: user.airportConfigurationAccess,
|
airportConfigurationAccess: user.airportConfigurationAccess,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
|
@Patch('/refreshRadarScopeKey')
|
||||||
|
async refreshRadarScopeKey(@Req() request: Request): Promise<void> {
|
||||||
|
const token = request.headers.authorization.replace('Bearer ', '');
|
||||||
|
return this.authService.resetRadarScopeKey(token);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { ConfigService } from '@nestjs/config';
|
|||||||
import { JwtService } from '@nestjs/jwt';
|
import { JwtService } from '@nestjs/jwt';
|
||||||
import { InjectModel } from '@nestjs/mongoose';
|
import { InjectModel } from '@nestjs/mongoose';
|
||||||
import { Model } from 'mongoose';
|
import { Model } from 'mongoose';
|
||||||
|
import { v4 as uuid } from 'uuid';
|
||||||
import { catchError, lastValueFrom, map } from 'rxjs';
|
import { catchError, lastValueFrom, map } from 'rxjs';
|
||||||
|
|
||||||
import { User, UserDocument } from './models/user.model';
|
import { User, UserDocument } from './models/user.model';
|
||||||
@@ -76,6 +77,7 @@ export class AuthService {
|
|||||||
this.userModel.create({
|
this.userModel.create({
|
||||||
vatsimId: userdata.cid,
|
vatsimId: userdata.cid,
|
||||||
fullName,
|
fullName,
|
||||||
|
radarScopeKey: uuid(),
|
||||||
vatsimToken: token,
|
vatsimToken: token,
|
||||||
vatsimRefreshToken: refreshToken,
|
vatsimRefreshToken: refreshToken,
|
||||||
});
|
});
|
||||||
@@ -110,4 +112,24 @@ export class AuthService {
|
|||||||
return user;
|
return user;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async loginRadarScope(vatsimId: string, key: string): Promise<string> {
|
||||||
|
return this.userModel.findOne({ vatsimId }).then((user) => {
|
||||||
|
if (!user || user.radarScopeKey !== key) return undefined;
|
||||||
|
|
||||||
|
const payload = { vatsimId: vatsimId, sub: key };
|
||||||
|
return this.jwtService.sign(payload);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async resetRadarScopeKey(token: string): Promise<void> {
|
||||||
|
const payload = this.jwtService.verify(token, {
|
||||||
|
secret: this.config.get<string>('server.jwt-secret'),
|
||||||
|
});
|
||||||
|
|
||||||
|
await this.userModel.findOneAndUpdate(
|
||||||
|
{ vatsimId: payload.vatsimId },
|
||||||
|
{ radarScopeKey: uuid() },
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
18
src/auth/dto/radarscope.dto.ts
Normal file
18
src/auth/dto/radarscope.dto.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { IsNotEmpty } from 'class-validator';
|
||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
export class RadarScopeDto {
|
||||||
|
@IsNotEmpty()
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'The VATSIM ID of the controller',
|
||||||
|
example: '10000001',
|
||||||
|
})
|
||||||
|
vatsimId: string;
|
||||||
|
|
||||||
|
@IsNotEmpty()
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'The unique key to logon the RADAR scope',
|
||||||
|
example: 'SECRET',
|
||||||
|
})
|
||||||
|
key: string;
|
||||||
|
}
|
||||||
11
src/auth/dto/radartoken.dto.ts
Normal file
11
src/auth/dto/radartoken.dto.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { IsNotEmpty } from 'class-validator';
|
||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
|
||||||
|
export class RadarTokenDto {
|
||||||
|
@IsNotEmpty()
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'The usable Bearer token',
|
||||||
|
example: 'SECRET',
|
||||||
|
})
|
||||||
|
token: string;
|
||||||
|
}
|
||||||
@@ -16,6 +16,13 @@ export class UserDto {
|
|||||||
})
|
})
|
||||||
fullName: string;
|
fullName: string;
|
||||||
|
|
||||||
|
@IsNotEmpty()
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'The unique logon code for the radar scope plugins',
|
||||||
|
example: 'SECRET',
|
||||||
|
})
|
||||||
|
radarScopeKey: string;
|
||||||
|
|
||||||
@IsNotEmpty()
|
@IsNotEmpty()
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
description: 'Indicates if the user has administrator access',
|
description: 'Indicates if the user has administrator access',
|
||||||
|
|||||||
@@ -17,6 +17,11 @@ export class User {
|
|||||||
})
|
})
|
||||||
fullName: string;
|
fullName: string;
|
||||||
|
|
||||||
|
@Prop({
|
||||||
|
type: String,
|
||||||
|
})
|
||||||
|
radarScopeKey: string;
|
||||||
|
|
||||||
@Prop({
|
@Prop({
|
||||||
required: true,
|
required: true,
|
||||||
type: String,
|
type: String,
|
||||||
|
|||||||
8
src/events/events.module.ts
Normal file
8
src/events/events.module.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { EventsService } from './events.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
providers: [EventsService],
|
||||||
|
exports: [EventsService],
|
||||||
|
})
|
||||||
|
export class EventsModule {}
|
||||||
18
src/events/events.service.spec.ts
Normal file
18
src/events/events.service.spec.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { EventsService } from './events.service';
|
||||||
|
|
||||||
|
describe('EventsService', () => {
|
||||||
|
let service: EventsService;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [EventsService],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
service = module.get<EventsService>(EventsService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
44
src/events/events.service.ts
Normal file
44
src/events/events.service.ts
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { EventEmitter } from 'events';
|
||||||
|
import { fromEvent, Observable } from 'rxjs';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class EventsService {
|
||||||
|
private readonly emitter: EventEmitter;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.emitter = new EventEmitter();
|
||||||
|
}
|
||||||
|
|
||||||
|
private subscribe(event: string): Observable<unknown> {
|
||||||
|
return fromEvent(this.emitter, event);
|
||||||
|
}
|
||||||
|
|
||||||
|
private emit(event: string, data: any): void {
|
||||||
|
this.emitter.emit(event, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribeUserPrivilegeUpdate(vatsimId: string): Observable<unknown> {
|
||||||
|
return this.subscribe(`/users/${vatsimId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitUserPrivilegeUpdate(vatsimId: string): void {
|
||||||
|
this.emit(`/users/${vatsimId}`, {});
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribeAirportRenew(): Observable<unknown> {
|
||||||
|
return this.subscribe('/airports/renew');
|
||||||
|
}
|
||||||
|
|
||||||
|
emitAirportRenew(): void {
|
||||||
|
this.emit('/airports/renew', {});
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribeArrivalSequenceUpdate(icao: string): Observable<unknown> {
|
||||||
|
return this.subscribe(`/airports/arrival/${icao}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
emitArrivalSequenceUpdate(icao: string): void {
|
||||||
|
this.emit(`/airports/arrival/${icao}`, {});
|
||||||
|
}
|
||||||
|
}
|
||||||
18
src/system/system.controller.spec.ts
Normal file
18
src/system/system.controller.spec.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { SystemController } from './system.controller';
|
||||||
|
|
||||||
|
describe('SystemController', () => {
|
||||||
|
let controller: SystemController;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
controllers: [SystemController],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
controller = module.get<SystemController>(SystemController);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(controller).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
16
src/system/system.controller.ts
Normal file
16
src/system/system.controller.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { Controller, Get, UseGuards } from '@nestjs/common';
|
||||||
|
import { ApiResponse } from '@nestjs/swagger';
|
||||||
|
import { JwtGuard } from 'src/auth/guards/jwt.guard';
|
||||||
|
|
||||||
|
@Controller('system')
|
||||||
|
export class SystemController {
|
||||||
|
@UseGuards(JwtGuard)
|
||||||
|
@Get('/timestamp')
|
||||||
|
@ApiResponse({
|
||||||
|
description: 'The current ZULU timestamp of the system',
|
||||||
|
type: Number,
|
||||||
|
})
|
||||||
|
async timestamp(): Promise<number> {
|
||||||
|
return new Date().getTime();
|
||||||
|
}
|
||||||
|
}
|
||||||
9
src/system/system.module.ts
Normal file
9
src/system/system.module.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { EventsModule } from 'src/events/events.module';
|
||||||
|
import { SystemController } from './system.controller';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [EventsModule],
|
||||||
|
controllers: [SystemController],
|
||||||
|
})
|
||||||
|
export class SystemModule {}
|
||||||
Reference in New Issue
Block a user