Dockery/Picsur
1
0
Fork 0
mirror of https://github.com/CaramelFur/Picsur.git synced 2025-11-12 23:05:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

delete userrolesservice

Browse Source
This commit is contained in:
rubikscraft
2022-03-30 13:41:33 +02:00
parent 4b39fb91ea
commit 00d401786d
7 changed files with 42 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/managers/auth/guards/main.guard.ts
View File

@@ -10,7 +10,7 @@ import { AuthGuard } from '@nestjs/passport';
import { plainToClass } from 'class-transformer';
import { Fail, Failable, HasFailed } from 'picsur-shared/dist/types';
import { strictValidate } from 'picsur-shared/dist/util/validate';
import { UserRolesService } from '../../../collections/userdb/userrolesdb.service';
import { UsersService } from '../../../collections/userdb/userdb.service';
import { Permissions } from '../../../models/dto/permissions.dto';
import { EUserBackend } from '../../../models/entities/user.entity';
import { isPermissionsArray } from '../../../models/validators/permissions.validator';
@@ -25,7 +25,7 @@ export class MainAuthGuard extends AuthGuard(['jwt', 'guest']) {
constructor(
private reflector: Reflector,
private userRolesService: UserRolesService,
private usersService: UsersService,
) {
super();
}
@@ -50,7 +50,7 @@ export class MainAuthGuard extends AuthGuard(['jwt', 'guest']) {
}
// These are the permissions the user has
const userPermissions = await this.userRolesService.getPermissions(user);
const userPermissions = await this.usersService.getPermissions(user);
if (HasFailed(userPermissions)) {
this.logger.warn('User Permissions: ' + userPermissions.getReason());
throw new InternalServerErrorException();