Umstellung auf firebase

bizmatch-server/src/user/user.controller.ts

@@ -1,11 +1,11 @@
 import { BadRequestException, Body, Controller, Get, Inject, Param, Post, Query, Request, UseGuards } from '@nestjs/common';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
-import { AdminAuthGuard } from 'src/jwt-auth/admin-auth.guard';
 import { Logger } from 'winston';
 import { ZodError } from 'zod';
 import { FileService } from '../file/file.service';
-import { JwtAuthGuard } from '../jwt-auth/jwt-auth.guard';
-import { OptionalJwtAuthGuard } from '../jwt-auth/optional-jwt-auth.guard';
+
+import { AuthGuard } from 'src/jwt-auth/auth.guard';
+import { OptionalAuthGuard } from 'src/jwt-auth/optional-auth.guard';
 import { User } from '../models/db.model';
 import { JwtUser, Subscription, UserListingCriteria } from '../models/main.model';
 import { UserService } from './user.service';
@@ -18,26 +18,26 @@ export class UserController {
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
   ) {}
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get()
   async findByMail(@Request() req, @Query('mail') mail: string): Promise<User> {
     const user = await this.userService.getUserByMail(mail, req.user as JwtUser);
     return user;
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get(':id')
   async findById(@Param('id') id: string): Promise<User> {
     const user = await this.userService.getUserById(id);
     return user;
   }
-  @UseGuards(AdminAuthGuard)
-  @Get('user/all')
-  async getAllUser(): Promise<User[]> {
-    return await this.userService.getAllUser();
-  }
+  // @UseGuards(AdminAuthGuard)
+  // @Get('user/all')
+  // async getAllUser(): Promise<User[]> {
+  //   return await this.userService.getAllUser();
+  // }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post()
   async save(@Body() user: any): Promise<User> {
     try {
@@ -57,27 +57,27 @@ export class UserController {
     }
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('guaranteed')
   async saveGuaranteed(@Body() user: any): Promise<User> {
     const savedUser = await this.userService.saveUser(user, false);
     return savedUser;
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('search')
   async find(@Body() criteria: UserListingCriteria): Promise<{ results: User[]; totalCount: number }> {
     const foundUsers = await this.userService.searchUserListings(criteria);
     return foundUsers;
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('findTotal')
   async findTotal(@Body() criteria: UserListingCriteria): Promise<number> {
     return await this.userService.getUserListingsCount(criteria);
   }
 
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AuthGuard)
   @Get('subscriptions/:id')
   async findSubscriptionsById(@Param('id') id: string): Promise<Subscription[]> {
     const subscriptions = [];