Skip to content

Commit 5b64d0d

Browse files
committedMar 10, 2025
feat: implement ParseTokenPipe for token validation and user retrieval
1 parent 3d20975 commit 5b64d0d

11 files changed

+11
-13
lines changed
 

‎server/src/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Logger, Module } from '@nestjs/common';
22
import { ConfigModule, ConfigService } from '@nestjs/config';
3+
import { APP_GUARD } from '@nestjs/core';
34
import { MongooseModule, MongooseModuleFactoryOptions } from '@nestjs/mongoose';
45
import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
56
import { MailerModule } from '@nestjs-modules/mailer';
@@ -9,13 +10,12 @@ import { AuthModule } from './auth/auth.module';
910
import { validate } from './config/EnvironmentVariables';
1011
import { EmailLoginModule } from './email-login/email-login.module';
1112
import { FileModule } from './file/file.module';
13+
import { ParseTokenPipe } from './lib/parseToken';
1214
import { MailingModule } from './mailing/mailing.module';
13-
import { ParseTokenPipe } from './parseToken';
1415
import { SeedModule } from './seed/seed.module';
1516
import { SongModule } from './song/song.module';
1617
import { SongBrowserModule } from './song-browser/song-browser.module';
1718
import { UserModule } from './user/user.module';
18-
import { APP_GUARD } from '@nestjs/core';
1919

2020
@Module({
2121
imports: [

‎server/src/GetRequestUser.spec.ts renamed to ‎server/src/lib/GetRequestUser.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ExecutionContext, HttpException, HttpStatus } from '@nestjs/common';
2+
import { UserDocument } from '@server/user/entity/user.entity';
23

34
import { GetRequestToken, validateUser } from './GetRequestUser';
4-
import { UserDocument } from './user/entity/user.entity';
55

66
describe('GetRequestToken', () => {
77
it('should be a defined decorator', () => {

‎server/src/GetRequestUser.ts renamed to ‎server/src/lib/GetRequestUser.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import {
44
HttpStatus,
55
createParamDecorator,
66
} from '@nestjs/common';
7-
8-
import { UserDocument } from './user/entity/user.entity';
7+
import { UserDocument } from '@server/user/entity/user.entity';
98

109
export const GetRequestToken = createParamDecorator(
1110
(data: unknown, ctx: ExecutionContext) => {
File renamed without changes.

‎server/src/parseToken.spec.ts renamed to ‎server/src/lib/parseToken.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ExecutionContext } from '@nestjs/common';
22
import { Test, TestingModule } from '@nestjs/testing';
3+
import { AuthService } from '@server/auth/auth.service';
34

4-
import { AuthService } from './auth/auth.service';
55
import { ParseTokenPipe } from './parseToken';
66

77
describe('ParseTokenPipe', () => {

‎server/src/parseToken.ts renamed to ‎server/src/lib/parseToken.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {
55
Injectable,
66
Logger,
77
} from '@nestjs/common';
8-
9-
import { AuthService } from './auth/auth.service';
8+
import { AuthService } from '@server/auth/auth.service';
109

1110
@Injectable()
1211
export class ParseTokenPipe implements CanActivate {

‎server/src/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { NestFactory } from '@nestjs/core';
33
import * as express from 'express';
44

55
import { AppModule } from './app.module';
6-
import { initializeSwagger } from './initializeSwagger';
7-
import { ParseTokenPipe } from './parseToken';
6+
import { initializeSwagger } from './lib/initializeSwagger';
7+
import { ParseTokenPipe } from './lib/parseToken';
88

99
const logger: Logger = new Logger('main.ts');
1010

‎server/src/song/my-songs/my-songs.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
44
import { PageQueryDTO } from '@shared/validation/common/dto/PageQuery.dto';
55
import { SongPageDto } from '@shared/validation/song/dto/SongPageDto';
66

7-
import { GetRequestToken, validateUser } from '@server/GetRequestUser';
7+
import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
88
import { UserDocument } from '@server/user/entity/user.entity';
99

1010
import { SongService } from '../song.service';

‎server/src/song/song.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { UploadSongResponseDto } from '@shared/validation/song/dto/UploadSongRes
3636
import type { Response } from 'express';
3737

3838
import { FileService } from '@server/file/file.service';
39-
import { GetRequestToken, validateUser } from '@server/GetRequestUser';
39+
import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
4040
import { UserDocument } from '@server/user/entity/user.entity';
4141

4242
import { SongService } from './song.service';

‎server/src/user/user.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { PageQueryDTO } from '@shared/validation/common/dto/PageQuery.dto';
44
import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
55
import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dto';
66

7-
import { GetRequestToken, validateUser } from '@server/GetRequestUser';
7+
import { GetRequestToken, validateUser } from '@server/lib/GetRequestUser';
88

99
import { UserDocument } from './entity/user.entity';
1010
import { UserService } from './user.service';

0 commit comments

Comments
 (0)
Failed to load comments.