@@ -1,4 +1,4 @@
 | 
			
		||||
import { Body, CookieParam, JsonController, Param, Post, Res } from 'routing-controllers';
 | 
			
		||||
import { Body, CookieParam, JsonController, Param, Post, Req, Res } from 'routing-controllers';
 | 
			
		||||
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 | 
			
		||||
import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError';
 | 
			
		||||
import { UserNotFoundError } from '../errors/UserErrors';
 | 
			
		||||
@@ -42,7 +42,7 @@ export class AuthController {
 | 
			
		||||
	@ResponseSchema(UsernameOrEmailNeededError)
 | 
			
		||||
	@ResponseSchema(PasswordNeededError)
 | 
			
		||||
	@ResponseSchema(InvalidCredentialsError)
 | 
			
		||||
	@OpenAPI({ description: 'Create a new access token object' })
 | 
			
		||||
	@OpenAPI({ description: 'Create a new access token object', security: [{ "RefreshTokenCookie": [] }] })
 | 
			
		||||
	async logout(@Body({ validate: true }) handleLogout: HandleLogout, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
 | 
			
		||||
		if (refresh_token && refresh_token.length != 0 && handleLogout.token == undefined) {
 | 
			
		||||
			handleLogout.token = refresh_token;
 | 
			
		||||
@@ -65,11 +65,12 @@ export class AuthController {
 | 
			
		||||
	@ResponseSchema(IllegalJWTError)
 | 
			
		||||
	@ResponseSchema(UserNotFoundError)
 | 
			
		||||
	@ResponseSchema(RefreshTokenCountInvalidError)
 | 
			
		||||
	@OpenAPI({ description: 'refresh a access token' })
 | 
			
		||||
	async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
 | 
			
		||||
	@OpenAPI({ description: 'refresh a access token', security: [{ "RefreshTokenCookie": [] }] })
 | 
			
		||||
	async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any, @Req() req: any) {
 | 
			
		||||
		if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
 | 
			
		||||
			refreshAuth.token = refresh_token;
 | 
			
		||||
		}
 | 
			
		||||
		console.log(req.headers)
 | 
			
		||||
		let auth;
 | 
			
		||||
		try {
 | 
			
		||||
			auth = await refreshAuth.toAuth();
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,7 @@ import { RunnerController } from './RunnerController';
 | 
			
		||||
 | 
			
		||||
@Controller()
 | 
			
		||||
@Authorized(["RUNNER:IMPORT", "TEAM:IMPORT"])
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class ImportController {
 | 
			
		||||
    private runnerController: RunnerController;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ import { ResponsePrincipal } from '../models/responses/ResponsePrincipal';
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@JsonController('/permissions')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class PermissionController {
 | 
			
		||||
    private permissionRepository: Repository<Permission>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -10,7 +10,7 @@ import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 | 
			
		||||
import { ResponseRunner } from '../models/responses/ResponseRunner';
 | 
			
		||||
 | 
			
		||||
@JsonController('/runners')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class RunnerController {
 | 
			
		||||
	private runnerRepository: Repository<Runner>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ import { RunnerTeamController } from './RunnerTeamController';
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@JsonController('/organisations')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class RunnerOrganisationController {
 | 
			
		||||
	private runnerOrganisationRepository: Repository<RunnerOrganisation>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@ import { RunnerController } from './RunnerController';
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@JsonController('/teams')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class RunnerTeamController {
 | 
			
		||||
	private runnerTeamRepository: Repository<RunnerTeam>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ import { ResponseEmpty } from '../models/responses/ResponseEmpty';
 | 
			
		||||
import { ResponseTrack } from '../models/responses/ResponseTrack';
 | 
			
		||||
 | 
			
		||||
@JsonController('/tracks')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class TrackController {
 | 
			
		||||
	private trackRepository: Repository<Track>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ import { PermissionController } from './PermissionController';
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@JsonController('/users')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class UserController {
 | 
			
		||||
	private userRepository: Repository<User>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@ import { PermissionController } from './PermissionController';
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@JsonController('/usergroups')
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }] })
 | 
			
		||||
@OpenAPI({ security: [{ "AuthToken": [] }, { "RefreshTokenCookie": [] }] })
 | 
			
		||||
export class UserGroupController {
 | 
			
		||||
	private userGroupsRepository: Repository<UserGroup>;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user