refactor(backend): rename auth to public-auth-token

Signed-off-by: Yannick Bungers <git@innay.de>
Signed-off-by: Erik Michelson <github@erik.michelson.eu>

backend/src/api/private/private-api.module.ts

@@ -5,7 +5,6 @@
  */
 import { Module } from '@nestjs/common';
 
-import { AuthModule } from '../../auth/auth.module';
 import { FrontendConfigModule } from '../../frontend-config/frontend-config.module';
 import { GroupsModule } from '../../groups/groups.module';
 import { HistoryModule } from '../../history/history.module';
@@ -14,6 +13,7 @@ import { LoggerModule } from '../../logger/logger.module';
 import { MediaModule } from '../../media/media.module';
 import { NotesModule } from '../../notes/notes.module';
 import { PermissionsModule } from '../../permissions/permissions.module';
+import { PublicAuthTokenModule } from '../../public-auth-token/public-auth-token.module';
 import { RevisionsModule } from '../../revisions/revisions.module';
 import { UsersModule } from '../../users/users.module';
 import { AliasController } from './alias/alias.controller';
@@ -24,14 +24,14 @@ import { HistoryController } from './me/history/history.controller';
 import { MeController } from './me/me.controller';
 import { MediaController } from './media/media.controller';
 import { NotesController } from './notes/notes.controller';
-import { TokensController } from './tokens/tokens.controller';
+import { PublicAuthTokensController } from './tokens/publicAuthTokensController';
 import { UsersController } from './users/users.controller';
 
 @Module({
   imports: [
     LoggerModule,
     UsersModule,
-    AuthModule,
+    PublicAuthTokenModule,
     FrontendConfigModule,
     HistoryModule,
     PermissionsModule,
@@ -42,7 +42,7 @@ import { UsersController } from './users/users.controller';
     GroupsModule,
   ],
   controllers: [
-    TokensController,
+    PublicAuthTokensController,
     ConfigController,
     MediaController,
     HistoryController,

backend/src/api/private/tokens/publicAuthTokensController.ts

@@ -15,14 +15,14 @@ import {
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 
-import {
-  AuthTokenCreateDto,
-  AuthTokenDto,
-  AuthTokenWithSecretDto,
-} from '../../../auth/auth-token.dto';
-import { AuthService } from '../../../auth/auth.service';
 import { SessionGuard } from '../../../identity/session.guard';
 import { ConsoleLoggerService } from '../../../logger/console-logger.service';
+import {
+  PublicAuthTokenCreateDto,
+  PublicAuthTokenDto,
+  PublicAuthTokenWithSecretDto,
+} from '../../../public-auth-token/public-auth-token.dto';
+import { PublicAuthTokenService } from '../../../public-auth-token/public-auth-token.service';
 import { User } from '../../../users/user.entity';
 import { OpenApi } from '../../utils/openapi.decorator';
 import { RequestUser } from '../../utils/request-user.decorator';
@@ -31,29 +31,31 @@ import { RequestUser } from '../../utils/request-user.decorator';
 @OpenApi(401)
 @ApiTags('tokens')
 @Controller('tokens')
-export class TokensController {
+export class PublicAuthTokensController {
   constructor(
     private readonly logger: ConsoleLoggerService,
-    private authService: AuthService,
+    private publicAuthTokenService: PublicAuthTokenService,
   ) {
-    this.logger.setContext(TokensController.name);
+    this.logger.setContext(PublicAuthTokensController.name);
   }
 
   @Get()
   @OpenApi(200)
-  async getUserTokens(@RequestUser() user: User): Promise<AuthTokenDto[]> {
-    return (await this.authService.getTokensByUser(user)).map((token) =>
-      this.authService.toAuthTokenDto(token),
+  async getUserTokens(
+    @RequestUser() user: User,
+  ): Promise<PublicAuthTokenDto[]> {
+    return (await this.publicAuthTokenService.getTokensByUser(user)).map(
+      (token) => this.publicAuthTokenService.toAuthTokenDto(token),
     );
   }
 
   @Post()
   @OpenApi(201)
   async postTokenRequest(
-    @Body() createDto: AuthTokenCreateDto,
+    @Body() createDto: PublicAuthTokenCreateDto,
     @RequestUser() user: User,
-  ): Promise<AuthTokenWithSecretDto> {
-    return await this.authService.addToken(
+  ): Promise<PublicAuthTokenWithSecretDto> {
+    return await this.publicAuthTokenService.addToken(
       user,
       createDto.label,
       createDto.validUntil,
@@ -66,10 +68,10 @@ export class TokensController {
     @RequestUser() user: User,
     @Param('keyId') keyId: string,
   ): Promise<void> {
-    const tokens = await this.authService.getTokensByUser(user);
+    const tokens = await this.publicAuthTokenService.getTokensByUser(user);
     for (const token of tokens) {
       if (token.keyId == keyId) {
-        return await this.authService.removeToken(keyId);
+        return await this.publicAuthTokenService.removeToken(keyId);
       }
     }
     throw new UnauthorizedException(

backend/src/api/public/alias/alias.controller.ts

@@ -16,7 +16,6 @@ import {
 } from '@nestjs/common';
 import { ApiSecurity, ApiTags } from '@nestjs/swagger';
 
-import { TokenAuthGuard } from '../../../auth/token.strategy';
 import { ConsoleLoggerService } from '../../../logger/console-logger.service';
 import { AliasCreateDto } from '../../../notes/alias-create.dto';
 import { AliasUpdateDto } from '../../../notes/alias-update.dto';
@@ -24,11 +23,12 @@ import { AliasDto } from '../../../notes/alias.dto';
 import { AliasService } from '../../../notes/alias.service';
 import { NotesService } from '../../../notes/notes.service';
 import { PermissionsService } from '../../../permissions/permissions.service';
+import { PublicAuthTokenGuard } from '../../../public-auth-token/public-auth-token.strategy';
 import { User } from '../../../users/user.entity';
 import { OpenApi } from '../../utils/openapi.decorator';
 import { RequestUser } from '../../utils/request-user.decorator';
 
-@UseGuards(TokenAuthGuard)
+@UseGuards(PublicAuthTokenGuard)
 @OpenApi(401)
 @ApiTags('alias')
 @ApiSecurity('token')

backend/src/api/public/me/me.controller.ts

@@ -14,7 +14,6 @@ import {
 } from '@nestjs/common';
 import { ApiSecurity, ApiTags } from '@nestjs/swagger';
 
-import { TokenAuthGuard } from '../../../auth/token.strategy';
 import { HistoryEntryUpdateDto } from '../../../history/history-entry-update.dto';
 import { HistoryEntryDto } from '../../../history/history-entry.dto';
 import { HistoryService } from '../../../history/history.service';
@@ -24,6 +23,7 @@ import { MediaService } from '../../../media/media.service';
 import { NoteMetadataDto } from '../../../notes/note-metadata.dto';
 import { Note } from '../../../notes/note.entity';
 import { NotesService } from '../../../notes/notes.service';
+import { PublicAuthTokenGuard } from '../../../public-auth-token/public-auth-token.strategy';
 import { FullUserInfoDto } from '../../../users/user-info.dto';
 import { User } from '../../../users/user.entity';
 import { UsersService } from '../../../users/users.service';
@@ -32,7 +32,7 @@ import { OpenApi } from '../../utils/openapi.decorator';
 import { RequestNote } from '../../utils/request-note.decorator';
 import { RequestUser } from '../../utils/request-user.decorator';
 
-@UseGuards(TokenAuthGuard)
+@UseGuards(PublicAuthTokenGuard)
 @OpenApi(401)
 @ApiTags('me')
 @ApiSecurity('token')

backend/src/api/public/media/media.controller.ts

@@ -25,7 +25,6 @@ import {
 } from '@nestjs/swagger';
 import { Response } from 'express';
 
-import { TokenAuthGuard } from '../../../auth/token.strategy';
 import { PermissionError } from '../../../errors/errors';
 import { ConsoleLoggerService } from '../../../logger/console-logger.service';
 import { MediaUploadDto } from '../../../media/media-upload.dto';
@@ -36,13 +35,14 @@ import { PermissionsGuard } from '../../../permissions/permissions.guard';
 import { PermissionsService } from '../../../permissions/permissions.service';
 import { RequirePermission } from '../../../permissions/require-permission.decorator';
 import { RequiredPermission } from '../../../permissions/required-permission.enum';
+import { PublicAuthTokenGuard } from '../../../public-auth-token/public-auth-token.strategy';
 import { User } from '../../../users/user.entity';
 import { NoteHeaderInterceptor } from '../../utils/note-header.interceptor';
 import { OpenApi } from '../../utils/openapi.decorator';
 import { RequestNote } from '../../utils/request-note.decorator';
 import { RequestUser } from '../../utils/request-user.decorator';
 
-@UseGuards(TokenAuthGuard)
+@UseGuards(PublicAuthTokenGuard)
 @OpenApi(401)
 @ApiTags('media')
 @ApiSecurity('token')

backend/src/api/public/monitoring/monitoring.controller.ts

@@ -6,12 +6,12 @@
 import { Controller, Get, UseGuards } from '@nestjs/common';
 import { ApiSecurity, ApiTags } from '@nestjs/swagger';
 
-import { TokenAuthGuard } from '../../../auth/token.strategy';
 import { MonitoringService } from '../../../monitoring/monitoring.service';
 import { ServerStatusDto } from '../../../monitoring/server-status.dto';
+import { PublicAuthTokenGuard } from '../../../public-auth-token/public-auth-token.strategy';
 import { OpenApi } from '../../utils/openapi.decorator';
 
-@UseGuards(TokenAuthGuard)
+@UseGuards(PublicAuthTokenGuard)
 @OpenApi(401)
 @ApiTags('monitoring')
 @ApiSecurity('token')

backend/src/api/public/notes/notes.controller.ts

@@ -17,7 +17,6 @@ import {
 } from '@nestjs/common';
 import { ApiSecurity, ApiTags } from '@nestjs/swagger';
 
-import { TokenAuthGuard } from '../../../auth/token.strategy';
 import { NotInDBError } from '../../../errors/errors';
 import { GroupsService } from '../../../groups/groups.service';
 import { HistoryService } from '../../../history/history.service';
@@ -37,6 +36,7 @@ import { PermissionsGuard } from '../../../permissions/permissions.guard';
 import { PermissionsService } from '../../../permissions/permissions.service';
 import { RequirePermission } from '../../../permissions/require-permission.decorator';
 import { RequiredPermission } from '../../../permissions/required-permission.enum';
+import { PublicAuthTokenGuard } from '../../../public-auth-token/public-auth-token.strategy';
 import { RevisionMetadataDto } from '../../../revisions/revision-metadata.dto';
 import { RevisionDto } from '../../../revisions/revision.dto';
 import { RevisionsService } from '../../../revisions/revisions.service';
@@ -49,7 +49,7 @@ import { OpenApi } from '../../utils/openapi.decorator';
 import { RequestNote } from '../../utils/request-note.decorator';
 import { RequestUser } from '../../utils/request-user.decorator';
 
-@UseGuards(TokenAuthGuard, PermissionsGuard)
+@UseGuards(PublicAuthTokenGuard, PermissionsGuard)
 @OpenApi(401)
 @ApiTags('notes')
 @ApiSecurity('token')