Compare commits

..

No commits in common. "ff84209683e8d0fb705dc44466974daafa9dc85e" and "40fb081332d4e24f222eee986d78ac3d85acd5c9" have entirely different histories.

5 changed files with 15 additions and 32 deletions

View File

@ -28,7 +28,6 @@
"class-validator": "^0.12.2", "class-validator": "^0.12.2",
"class-validator-jsonschema": "^2.0.3", "class-validator-jsonschema": "^2.0.3",
"consola": "^2.15.0", "consola": "^2.15.0",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5", "cors": "^2.8.5",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"express": "^4.17.1", "express": "^4.17.1",
@ -77,4 +76,4 @@
"docs/*" "docs/*"
] ]
} }
} }

View File

@ -1,4 +1,4 @@
import { Body, CookieParam, JsonController, Post, Res } from 'routing-controllers'; import { Body, JsonController, Post } from 'routing-controllers';
import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError'; import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError';
import { UserNotFoundError } from '../errors/UserErrors'; import { UserNotFoundError } from '../errors/UserErrors';
@ -21,16 +21,14 @@ 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 login(@Body({ validate: true }) createAuth: CreateAuth, @Res() response: any) { async login(@Body({ validate: true }) createAuth: CreateAuth) {
let auth; let auth;
try { try {
auth = await createAuth.toAuth(); auth = await createAuth.toAuth();
response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
return response.send(auth)
} catch (error) { } catch (error) {
throw error; throw error;
} }
return auth
} }
@Post("/logout") @Post("/logout")
@ -41,20 +39,14 @@ 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, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) { async logout(@Body({ validate: true }) handleLogout: HandleLogout) {
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; return error;
} }
return response.send(logout) return logout
} }
@Post("/refresh") @Post("/refresh")
@ -64,18 +56,13 @@ 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(@Body({ validate: true }) refreshAuth: RefreshAuth, @CookieParam("lfk_backend__refresh_token") refresh_token: string, @Res() response: any) { async refresh(@Body({ validate: true }) refreshAuth: RefreshAuth) {
if (refresh_token && refresh_token.length != 0 && refreshAuth.token == undefined) {
refreshAuth.token = refresh_token;
}
let auth; let auth;
try { try {
auth = await refreshAuth.toAuth(); auth = await refreshAuth.toAuth();
response.cookie('lfk_backend__refresh_token', auth.refresh_token, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
response.cookie('lfk_backend__refresh_token_expires_at', auth.refresh_token_expires_at, { expires: new Date(auth.refresh_token_expires_at * 1000), httpOnly: true });
} catch (error) { } catch (error) {
throw error; return error;
} }
return response.send(auth) return auth
} }
} }

View File

@ -1,11 +1,10 @@
import cookieParser from "cookie-parser";
import { Application } from "express"; import { Application } from "express";
/** /**
* Loader for express related configurations. * Loader for express related configurations.
* Currently only enables the proxy trust. * Currently only enables the proxy trust.
*/ */
export default async (app: Application) => { export default async (app: Application) => {
app.enable('trust proxy'); app.enable('trust proxy');
app.use(cookieParser());
return app; return app;
}; };

View File

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

View File

@ -1,4 +1,4 @@
import { IsOptional, IsString } from 'class-validator'; import { 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,8 +8,7 @@ import { Auth } from '../responses/ResponseAuth';
export class RefreshAuth { export class RefreshAuth {
@IsString() @IsString()
@IsOptional() token: string;
token?: string;
public async toAuth(): Promise<Auth> { public async toAuth(): Promise<Auth> {
let newAuth: Auth = new Auth(); let newAuth: Auth = new Auth();