diff --git a/src/modules/auth/auth.module.ts b/src/modules/auth/auth.module.ts index b7dd16e..8a878b7 100644 --- a/src/modules/auth/auth.module.ts +++ b/src/modules/auth/auth.module.ts @@ -16,7 +16,7 @@ import { AdminAuthGuard } from './guards/adminAuth.guard'; @Module({ imports: [ UtilsModule, - UserModule, + forwardRef(() => UserModule), JwtModule.registerAsync({ useFactory: (configService: ConfigService) => ({ global: true, @@ -27,7 +27,7 @@ import { AdminAuthGuard } from './guards/adminAuth.guard'; }), inject: [ConfigService], }), - AdminModule, + forwardRef(() => AdminModule), forwardRef(() => RestaurantsModule), MikroOrmModule.forFeature([User]), ], diff --git a/src/modules/auth/guards/adminAuth.guard.ts b/src/modules/auth/guards/adminAuth.guard.ts index 777463b..63046b3 100644 --- a/src/modules/auth/guards/adminAuth.guard.ts +++ b/src/modules/auth/guards/adminAuth.guard.ts @@ -13,7 +13,7 @@ import { JwtService } from '@nestjs/jwt'; import { ConfigService } from '@nestjs/config'; import { IAdminTokenPayload } from '../interfaces/IToken-payload'; import { PERMISSIONS_KEY } from '../decorators/permissions.decorator'; - import { PermissionsService } from 'src/modules/roles/providers/permissions.service'; +import { PermissionsService } from 'src/modules/roles/providers/permissions.service'; export interface AdminAuthRequest extends Request { adminId: string; @@ -29,8 +29,6 @@ export class AdminAuthGuard implements CanActivate { private readonly jwtService: JwtService, @Inject(ConfigService) private readonly configService: ConfigService, - @Inject(ConfigService) - private readonly permissionsService: PermissionsService, private readonly reflector: Reflector, ) {} diff --git a/src/modules/foods/controllers/category.controller.ts b/src/modules/foods/controllers/category.controller.ts index a2fdcac..e9d6557 100644 --- a/src/modules/foods/controllers/category.controller.ts +++ b/src/modules/foods/controllers/category.controller.ts @@ -17,12 +17,13 @@ import { AdminAuthGuard } from 'src/modules/auth/guards/adminAuth.guard'; import { UseGuards } from '@nestjs/common'; import { RestId } from 'src/common/decorators'; +@UseGuards(AdminAuthGuard) +@ApiBearerAuth() @ApiTags('categories') @Controller() export class CategoryController { constructor(private readonly categoryService: CategoryService) {} - @UseGuards(AdminAuthGuard) @ApiBearerAuth('/admin/categories') @Post() @ApiOperation({ summary: 'Create category' }) @@ -35,7 +36,7 @@ export class CategoryController { @UseGuards(AdminAuthGuard) @ApiBearerAuth('/admin/categories') @Get() - @ApiOperation({ summary: 'List categories for admin' }) + @ApiOperation({ summary: 'my restaurant categories' }) @ApiOkResponse({ description: 'List of categories' }) @ApiQuery({ name: 'restId', required: false, type: String }) @ApiQuery({ name: 'isActive', required: false, type: Boolean }) diff --git a/src/modules/roles/roles.module.ts b/src/modules/roles/roles.module.ts index ef289ac..2399dbe 100644 --- a/src/modules/roles/roles.module.ts +++ b/src/modules/roles/roles.module.ts @@ -1,4 +1,4 @@ -import { Module } from '@nestjs/common'; +import { Global, Module } from '@nestjs/common'; import { MikroOrmModule } from '@mikro-orm/nestjs'; import { RolesService } from './providers/roles.service'; import { RolesController } from './roles.controller'; @@ -10,6 +10,7 @@ import { JwtModule } from '@nestjs/jwt'; import { UtilsModule } from '../utils/utils.module'; import { AdminModule } from '../admin/admin.module'; +@Global() @Module({ imports: [MikroOrmModule.forFeature([Role, Permission, RolePermission]), JwtModule, UtilsModule, AdminModule], controllers: [RolesController],