bubble/educt-server
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/educt-server.git synced 2026-10-11 18:29:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: set cookie token on auth

Browse Source
This commit is contained in:
Sergey Yarkov 2021-08-21 02:21:36 +03:00
parent 0bfc5d8866
commit 42b60cb9fa
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Http/Api/v1/AuthController.ts
View File

@ -28,7 +28,7 @@ export default class AuthController extends BaseController {
public async login(ctx: HttpContextContract) { public async login(ctx: HttpContextContract) {
const payload = await ctx.request.validate(AuthValidator); const payload = await ctx.request.validate(AuthValidator);
const result = await this.authService.login(payload.login, payload.password, ctx.auth); const result = await this.authService.login(payload.login, payload.password, ctx);
if (!result.success && result.error) { if (!result.success && result.error) {
throw new Exception(result.message, result.status, result.error.code); throw new Exception(result.message, result.status, result.error.code);
@ -43,7 +43,7 @@ export default class AuthController extends BaseController {
*/ */
public async logout(ctx: HttpContextContract) { public async logout(ctx: HttpContextContract) {
const result = await this.authService.logout(ctx.auth); const result = await this.authService.logout(ctx);
if (!result.success && result.error) { if (!result.success && result.error) {
throw new Exception(result.message, result.status, result.error.code); throw new Exception(result.message, result.status, result.error.code);

14
app/Middleware/Auth.ts
View File

@ -52,13 +52,21 @@ export default class AuthMiddleware {
); );
} }
public async handle({ auth }: HttpContextContract, next: () => Promise<void>, customGuards: (keyof GuardsList)[]) { public async handle(ctx: HttpContextContract, next: () => Promise<void>, customGuards: (keyof GuardsList)[]) {
/**
* Verify token from cookie and set the authorization header
*/
const token = ctx.request.cookie('token');
if (token) {
ctx.request.headers().authorization = `Bearer ${token}`;
}
/** /**
* Uses the user defined guards or the default guard mentioned in * Uses the user defined guards or the default guard mentioned in
* the config file * the config file
*/ */
const guards = customGuards.length ? customGuards : [auth.name]; const guards = customGuards.length ? customGuards : [ctx.auth.name];
await this.authenticate(auth, guards); await this.authenticate(ctx.auth, guards);
await next(); await next();
} }
} }

17
app/Services/AuthService.ts
View File

@ -1,11 +1,11 @@
import { inject, Ioc } from '@adonisjs/core/build/standalone'; import { inject, Ioc } from '@adonisjs/core/build/standalone';
import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
import Hash from '@ioc:Adonis/Core/Hash'; import Hash from '@ioc:Adonis/Core/Hash';
import Logger from '@ioc:Adonis/Core/Logger'; import Logger from '@ioc:Adonis/Core/Logger';
/** /**
* Interfaces * Interfaces
*/ */
import { AuthContract } from '@ioc:Adonis/Addons/Auth';
import IResponse from 'App/Datatypes/Interfaces/IResponse'; import IResponse from 'App/Datatypes/Interfaces/IResponse';
/** /**
@ -33,10 +33,10 @@ export default class AuthService {
* *
* @param login Login * @param login Login
* @param password Password * @param password Password
* @param auth AuthContact * @param ctx Http context
* @returns Token data * @returns Token data
*/ */
public async login(login: string, password: string, auth: AuthContract): Promise<IResponse> { public async login(login: string, password: string, ctx: HttpContextContract): Promise<IResponse> {
const user = await this.userRepository.getByColumn('login', login); const user = await this.userRepository.getByColumn('login', login);
if (!user) { if (!user) {
@ -69,11 +69,13 @@ export default class AuthService {
/** /**
* Create new token * Create new token
*/ */
const token = await auth.use(this.authGuard).generate(user, { const token = await ctx.auth.use(this.authGuard).generate(user, {
expiresIn: '1d', expiresIn: '1d',
userRoles: user.roles.map(role => role.slug), userRoles: user.roles.map(role => role.slug),
}); });
ctx.response.cookie('token', token.token);
Logger.info(`A token for user with id: "${token.user.id}" was successfully generated.`); Logger.info(`A token for user with id: "${token.user.id}" was successfully generated.`);
return { return {
@ -87,11 +89,12 @@ export default class AuthService {
/** /**
* Logout user * Logout user
* *
* @param auth AuthContract * @param ctx Http context
* @returns Logout message * @returns Logout message
*/ */
public async logout(auth: AuthContract): Promise<IResponse> { public async logout(ctx: HttpContextContract): Promise<IResponse> {
await auth.use(this.authGuard).revoke(); ctx.response.clearCookie('token');
await ctx.auth.use(this.authGuard).revoke();
return { return {
success: true, success: true,