Now w/ working logout
All checks were successful
continuous-integration/drone/pr Build is passing

ref #25
This commit is contained in:
Nicolai Ort 2020-12-12 19:50:12 +01:00
parent 30928180e6
commit ac2da0af63
2 changed files with 12 additions and 5 deletions

View File

@ -41,14 +41,20 @@ export class AuthController {
@ResponseSchema(PasswordNeededError) @ResponseSchema(PasswordNeededError)
@ResponseSchema(InvalidCredentialsError) @ResponseSchema(InvalidCredentialsError)
@OpenAPI({ description: 'Create a new access token object' }) @OpenAPI({ description: 'Create a new access token object' })
async logout(@Body({ validate: true }) handleLogout: HandleLogout) { 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;
}
let logout; let logout;
try { try {
logout = await handleLogout.logout() logout = await handleLogout.logout()
await response.cookie('lfk_backend__refresh_token', "expired", { expires: new Date(Date.now()), httpOnly: true });
response.cookie('lfk_backend__refresh_token_expires_at', "expired", { expires: new Date(Date.now()), httpOnly: true });
} catch (error) { } catch (error) {
throw error; throw error;
} }
return logout return response.send(logout)
} }
@Post("/refresh") @Post("/refresh")
@ -58,7 +64,7 @@ export class AuthController {
@ResponseSchema(UserNotFoundError) @ResponseSchema(UserNotFoundError)
@ResponseSchema(RefreshTokenCountInvalidError) @ResponseSchema(RefreshTokenCountInvalidError)
@OpenAPI({ description: 'refresh a access token' }) @OpenAPI({ description: 'refresh a access token' })
async refresh(@CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any, @Body({ validate: true }) refreshAuth: RefreshAuth) { async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) {
if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) { if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
refreshAuth.token = refresh_token; refreshAuth.token = refresh_token;
} }

View File

@ -1,4 +1,4 @@
import { IsString } from 'class-validator'; import { IsOptional, IsString } from 'class-validator';
import * as jsonwebtoken from 'jsonwebtoken'; import * as jsonwebtoken from 'jsonwebtoken';
import { getConnectionManager } from 'typeorm'; import { getConnectionManager } from 'typeorm';
import { config } from '../../config'; import { config } from '../../config';
@ -8,7 +8,8 @@ import { Logout } from '../responses/ResponseLogout';
export class HandleLogout { export class HandleLogout {
@IsString() @IsString()
token: string; @IsOptional()
token?: string;
public async logout(): Promise<Logout> { public async logout(): Promise<Logout> {
let logout: Logout = new Logout(); let logout: Logout = new Logout();