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

fix: fixed role check middleware

Browse Source
This commit is contained in:
Sergey Yarkov 2022-02-14 21:58:07 +03:00
parent 046e3a28f3
commit 4056dde970
4 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Middleware/Role.ts
View File

@ -1,5 +1,6 @@
import { Exception } from '@adonisjs/core/build/standalone'; import { Exception } from '@adonisjs/core/build/standalone';
import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext'; import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
import User from 'App/Models/User';
export default class Role { export default class Role {
error: { error: {
@ -23,7 +24,7 @@ export default class Role {
* @param {string[]} roles - Array of roles for route * @param {string[]} roles - Array of roles for route
* @param {string[]} userRole - Array of roles of current user * @param {string[]} userRole - Array of roles of current user
*/ */
protected checkRoles(roles: string[], userRoles: string[]): void { protected check(roles: string[], userRoles: string[]): void {
if (!roles.some(role => userRoles.includes(role))) { if (!roles.some(role => userRoles.includes(role))) {
/** /**
* Failed to verify user rights * Failed to verify user rights
@ -33,8 +34,20 @@ export default class Role {
} }
public async handle({ auth }: HttpContextContract, next: () => Promise<void>, roles: string[]) { public async handle({ auth }: HttpContextContract, next: () => Promise<void>, roles: string[]) {
const { userRoles } = auth.use('api').token?.meta; const { userId } = auth.use('api').token?.meta;
this.checkRoles(roles, userRoles); const user = await User.query().where('id', userId).preload('roles').first();
if (!user) {
/**
* User not found
*/
throw new Exception('Cannot identify current user.', this.error.status, this.error.code);
}
this.check(
roles,
user.roles.map(role => role.slug)
);
await next(); await next();
} }
} }

1
app/Services/AuthService.ts
View File

@ -66,6 +66,7 @@ export default class AuthService {
*/ */
const token = await ctx.auth.use(this.authGuard).generate(user, { const token = await ctx.auth.use(this.authGuard).generate(user, {
expiresIn: '1d', expiresIn: '1d',
userId: user.id,
userRoles: user.roles.map(role => role.slug), userRoles: user.roles.map(role => role.slug),
userName: user.fullname, userName: user.fullname,
}); });

20
app/Validators/Contacts/UpdateContactsValidator.ts
View File

@ -12,12 +12,24 @@ export default class UpdateContactsValidator {
}), }),
rules.unique({ table: 'contacts', column: 'phone_number' }), rules.unique({ table: 'contacts', column: 'phone_number' }),
]), ]),
vk_id: schema.string.nullableAndOptional({}, [rules.regex(/^([a-zA-Z0-9_]){1,64}$/)]), vk_id: schema.string.nullableAndOptional({}, [
twitter_id: schema.string.nullableAndOptional({}, [rules.regex(/(^|[^@\w])@(\w{1,15})\b/)]), rules.regex(/^([a-zA-Z0-9_]){1,64}$/),
telegram_id: schema.string.nullableAndOptional({}, [rules.regex(/(^|[^@\w])@(\w{1,64})\b/)]), rules.unique({ table: 'contacts', column: 'vk_id' }),
]),
twitter_id: schema.string.nullableAndOptional({}, [
rules.regex(/(^|[^@\w])@(\w{1,15})\b/),
rules.unique({ table: 'contacts', column: 'twitter_id' }),
]),
telegram_id: schema.string.nullableAndOptional({}, [
rules.regex(/(^|[^@\w])@(\w{1,64})\b/),
rules.unique({ table: 'contacts', column: 'telegram_id' }),
]),
}); });
public messages = { public messages = {
'phone_number.unique': 'This phone number is not available', 'phone_number.unique': 'This phone number is not available.',
'vk_id.unique': 'This ID is not available.',
'twitter_id.unique': 'Twitter username is not available.',
'telegram_id.unique': 'Telegram username is not available.',
}; };
} }

18
app/Validators/User/UpdateUserInfoValidator.ts
View File

@ -10,12 +10,24 @@ export default class UpdateUserInfoValidator {
rules.mobile({ locales: ['ru-RU', 'en-US'], strict: true }), rules.mobile({ locales: ['ru-RU', 'en-US'], strict: true }),
rules.unique({ table: 'contacts', column: 'phone_number' }), rules.unique({ table: 'contacts', column: 'phone_number' }),
]), ]),
vk_id: schema.string.nullableAndOptional({}, [rules.regex(/^([a-zA-Z0-9_]){1,64}$/)]), vk_id: schema.string.nullableAndOptional({}, [
twitter_id: schema.string.nullableAndOptional({}, [rules.regex(/(^|[^@\w])@(\w{1,15})\b/)]), rules.regex(/^([a-zA-Z0-9_]){1,64}$/),
telegram_id: schema.string.nullableAndOptional({}, [rules.regex(/(^|[^@\w])@(\w{1,64})\b/)]), rules.unique({ table: 'contacts', column: 'vk_id' }),
]),
twitter_id: schema.string.nullableAndOptional({}, [
rules.regex(/(^|[^@\w])@(\w{1,15})\b/),
rules.unique({ table: 'contacts', column: 'twitter_id' }),
]),
telegram_id: schema.string.nullableAndOptional({}, [
rules.regex(/(^|[^@\w])@(\w{1,64})\b/),
rules.unique({ table: 'contacts', column: 'telegram_id' }),
]),
}); });
public messages = { public messages = {
'phone_number.unique': 'This phone number is not available.', 'phone_number.unique': 'This phone number is not available.',
'vk_id.unique': 'This ID is not available.',
'twitter_id.unique': 'Twitter username is not available.',
'telegram_id.unique': 'Telegram username is not available.',
}; };
} }