fix endpoint permissions

ruslang02 · May 13, 2021 · 12f606c · 12f606c
1 parent 1208ed6
commit 12f606c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "type": "git"
   },
   "scripts": {
+    "build:server": "cd server/; npm run build",
     "proxy": "sudo nginx -p $PWD/proxy -c nginx.conf",
     "proxy:dev": "sudo nginx -p $PWD/proxy -c nginx.dev.conf",
     "start:server": "node dist/main",

diff --git a/server/src/admin/admin.module.ts b/server/src/admin/admin.module.ts
@@ -8,11 +8,10 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { LoggerModule } from 'logger/logger.module';
 import { AdminController } from './admin.controller';
-import { AdminService } from './admin.service';
 
 @Module({
   controllers: [AdminController],
-  providers: [AdminService],
+  providers: [],
   imports: [LoggerModule, TypeOrmModule.forFeature([Report, User, CalendarEvent, PendingEvent, Report, ChatMessage, File])],
 })
 export class AdminModule { }
diff --git a/server/src/admin/admin.service.ts b/server/src/admin/admin.service.ts
diff --git a/server/src/auth/auth.controller.ts b/server/src/auth/auth.controller.ts
@@ -32,7 +32,7 @@ import { generateId } from 'utils/IdGenerator';
 import { LocalAuthGuard } from '../guards/local.guard';
 import { UsersService } from '../users/users.service';
 import { AuthService } from './auth.service';
-import { VerifyService } from './mail.service';
+import { MailService } from './mail.service';
 
 @ApiTags('Авторизация и регистрация пользователей')
 @Controller('/api/auth')
@@ -43,7 +43,7 @@ export class AuthController {
     private auth: AuthService,
     private i18n: I18nService,
     private users: UsersService,
-    private verifyMail: VerifyService,
+    private verifyMail: MailService,
     private jwt: JwtService,
     private adapter: UserAdapter
   ) { }

diff --git a/server/src/auth/auth.module.ts b/server/src/auth/auth.module.ts
@@ -7,7 +7,7 @@ import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { JwtStrategy } from './jwt.strategy';
 import { LocalStrategy } from './local.strategy';
-import { VerifyService } from './mail.service'
+import { MailService } from './mail.service'
 
 @Module({
   controllers: [AuthController],
@@ -23,6 +23,6 @@ import { VerifyService } from './mail.service'
     UsersModule,
   ],
   exports: [JwtModule],
-  providers: [AuthService, JwtStrategy, LocalStrategy, VerifyService],
+  providers: [AuthService, JwtStrategy, LocalStrategy, MailService],
 })
 export class AuthModule { }
diff --git a/server/src/auth/mail.service.ts b/server/src/auth/mail.service.ts
@@ -2,7 +2,7 @@ import { MailerService } from '@nestjs-modules/mailer';
 import { Inject, Injectable, LoggerService } from '@nestjs/common';
 
 @Injectable()
-export class VerifyService {
+export class MailService {
   constructor(
     @Inject('Logger')
     private logger: LoggerService,

diff --git a/server/src/schedules/schedules.controller.ts b/server/src/schedules/schedules.controller.ts
@@ -153,7 +153,7 @@ export class SchedulesController {
   }
 
   @Types(UserType.ADMIN, UserType.MODERATOR, UserType.LAWYER)
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, UserGuard)
   @ApiBearerAuth()
   @Get("/")
   @ApiOperation({