Umstellung auf firebase

bizmatch-server/src/listings/broker-listings.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Inject, Post, UseGuards } from '@nestjs/common';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
-import { OptionalJwtAuthGuard } from 'src/jwt-auth/optional-jwt-auth.guard';
+import { OptionalAuthGuard } from 'src/jwt-auth/optional-auth.guard';
 import { UserListingCriteria } from 'src/models/main.model';
 import { Logger } from 'winston';
 import { UserService } from '../user/user.service';
@@ -12,7 +12,7 @@ export class BrokerListingsController {
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
   ) {}
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('search')
   async find(@Body() criteria: UserListingCriteria): Promise<any> {
     return await this.userService.searchUserListings(criteria);

bizmatch-server/src/listings/business-listings.controller.ts

@@ -1,8 +1,9 @@
 import { Body, Controller, Delete, Get, Inject, Param, Post, Put, Request, UseGuards } from '@nestjs/common';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
+import { AuthGuard } from 'src/jwt-auth/auth.guard';
 import { Logger } from 'winston';
-import { JwtAuthGuard } from '../jwt-auth/jwt-auth.guard';
-import { OptionalJwtAuthGuard } from '../jwt-auth/optional-jwt-auth.guard';
+
+import { OptionalAuthGuard } from 'src/jwt-auth/optional-auth.guard';
 import { BusinessListing } from '../models/db.model';
 import { BusinessListingCriteria, JwtUser } from '../models/main.model';
 import { BusinessListingService } from './business-listing.service';
@@ -14,52 +15,52 @@ export class BusinessListingsController {
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
   ) {}
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get(':id')
   async findById(@Request() req, @Param('id') id: string): Promise<any> {
     return await this.listingsService.findBusinessesById(id, req.user as JwtUser);
   }
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AuthGuard)
   @Get('favorites/all')
   async findFavorites(@Request() req): Promise<any> {
     return await this.listingsService.findFavoriteListings(req.user as JwtUser);
   }
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get('user/:userid')
   async findByUserId(@Request() req, @Param('userid') userid: string): Promise<BusinessListing[]> {
     return await this.listingsService.findBusinessesByEmail(userid, req.user as JwtUser);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('find')
   async find(@Request() req, @Body() criteria: BusinessListingCriteria): Promise<any> {
     return await this.listingsService.searchBusinessListings(criteria, req.user as JwtUser);
   }
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('findTotal')
   async findTotal(@Request() req, @Body() criteria: BusinessListingCriteria): Promise<number> {
     return await this.listingsService.getBusinessListingsCount(criteria, req.user as JwtUser);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post()
   async create(@Body() listing: any) {
     return await this.listingsService.createListing(listing);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Put()
   async update(@Body() listing: any) {
     return await this.listingsService.updateBusinessListing(listing.id, listing);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Delete('listing/:id')
   async deleteById(@Param('id') id: string) {
     await this.listingsService.deleteListing(id);
   }
 
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AuthGuard)
   @Delete('favorite/:id')
   async deleteFavorite(@Request() req, @Param('id') id: string) {
     await this.listingsService.deleteFavorite(id, req.user as JwtUser);

bizmatch-server/src/listings/commercial-property-listings.controller.ts

@@ -2,8 +2,9 @@ import { Body, Controller, Delete, Get, Inject, Param, Post, Put, Request, UseGu
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
 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 { CommercialPropertyListing } from '../models/db.model';
 import { CommercialPropertyListingCriteria, JwtUser } from '../models/main.model';
 import { CommercialPropertyService } from './commercial-property.service';
@@ -16,54 +17,54 @@ export class CommercialPropertyListingsController {
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
   ) {}
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get(':id')
   async findById(@Request() req, @Param('id') id: string): Promise<any> {
     return await this.listingsService.findCommercialPropertiesById(id, req.user as JwtUser);
   }
 
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AuthGuard)
   @Get('favorites/all')
   async findFavorites(@Request() req): Promise<any> {
     return await this.listingsService.findFavoriteListings(req.user as JwtUser);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get('user/:email')
   async findByEmail(@Request() req, @Param('email') email: string): Promise<CommercialPropertyListing[]> {
     return await this.listingsService.findCommercialPropertiesByEmail(email, req.user as JwtUser);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('find')
   async find(@Request() req, @Body() criteria: CommercialPropertyListingCriteria): Promise<any> {
     return await this.listingsService.searchCommercialProperties(criteria, req.user as JwtUser);
   }
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post('findTotal')
   async findTotal(@Request() req, @Body() criteria: CommercialPropertyListingCriteria): Promise<number> {
     return await this.listingsService.getCommercialPropertiesCount(criteria, req.user as JwtUser);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Post()
   async create(@Body() listing: any) {
     return await this.listingsService.createListing(listing);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Put()
   async update(@Body() listing: any) {
     return await this.listingsService.updateCommercialPropertyListing(listing.id, listing);
   }
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Delete('listing/:id/:imagePath')
   async deleteById(@Param('id') id: string, @Param('imagePath') imagePath: string) {
     await this.listingsService.deleteListing(id);
     this.fileService.deleteDirectoryIfExists(imagePath);
   }
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(AuthGuard)
   @Delete('favorite/:id')
   async deleteFavorite(@Request() req, @Param('id') id: string) {
     await this.listingsService.deleteFavorite(id, req.user as JwtUser);

bizmatch-server/src/listings/unknown-listings.controller.ts

@@ -1,7 +1,7 @@
 import { Controller, Get, Inject, Param, Request, UseGuards } from '@nestjs/common';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
+import { OptionalAuthGuard } from 'src/jwt-auth/optional-auth.guard';
 import { Logger } from 'winston';
-import { OptionalJwtAuthGuard } from '../jwt-auth/optional-jwt-auth.guard';
 import { BusinessListingService } from './business-listing.service';
 import { CommercialPropertyService } from './commercial-property.service';
 
@@ -13,7 +13,7 @@ export class UnknownListingsController {
     private readonly propertyListingsService: CommercialPropertyService,
   ) {}
 
-  @UseGuards(OptionalJwtAuthGuard)
+  @UseGuards(OptionalAuthGuard)
   @Get(':id')
   async findById(@Request() req, @Param('id') id: string): Promise<any> {
     try {