From b9a2d9b6b4edca70c402916bf12fd9542165b0ad Mon Sep 17 00:00:00 2001 From: "saito.k" Date: Tue, 5 Sep 2023 15:28:43 +0900 Subject: [PATCH] =?UTF-8?q?redis=E5=91=A8=E3=82=8A=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=82=92=E3=82=82=E3=81=A8=E3=81=AB=E6=88=BB=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dictation_server/.env.local.example | 5 +-- dictation_server/src/app.module.ts | 2 -- .../src/common/redis/redis.module.ts | 36 ------------------- .../src/common/redis/redis.service.ts | 30 ---------------- .../src/features/auth/auth.controller.ts | 5 +-- .../src/features/auth/auth.module.ts | 3 +- 6 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 dictation_server/src/common/redis/redis.module.ts delete mode 100644 dictation_server/src/common/redis/redis.service.ts diff --git a/dictation_server/.env.local.example b/dictation_server/.env.local.example index 1acdf09..679d57e 100644 --- a/dictation_server/.env.local.example +++ b/dictation_server/.env.local.example @@ -24,7 +24,4 @@ STORAGE_ACCOUNT_KEY_AU=XXXXXXXXXXXXXXXXXXXXXXX STORAGE_ACCOUNT_KEY_EU=XXXXXXXXXXXXXXXXXXXXXXX STORAGE_ACCOUNT_ENDPOINT_US=https://AAAAAAAAAAAAA STORAGE_ACCOUNT_ENDPOINT_AU=https://AAAAAAAAAAAAA -STORAGE_ACCOUNT_ENDPOINT_EU=https://AAAAAAAAAAAAA -REDIS_HOST=redis-cache -REDIS_PORT=6379 -REDIS_PASSWORD=omdsredispass \ No newline at end of file +STORAGE_ACCOUNT_ENDPOINT_EU=https://AAAAAAAAAAAAA \ No newline at end of file diff --git a/dictation_server/src/app.module.ts b/dictation_server/src/app.module.ts index 9c4beb2..e8b4375 100644 --- a/dictation_server/src/app.module.ts +++ b/dictation_server/src/app.module.ts @@ -42,7 +42,6 @@ import { SortCriteriaRepositoryModule } from './repositories/sort_criteria/sort_ import { TemplateFilesRepositoryModule } from './repositories/template_files/template_files.repository.module'; import { WorktypesRepositoryModule } from './repositories/worktypes/worktypes.repository.module'; import { OptionItemsRepositoryModule } from './repositories/option_items/option_items.repository.module'; -import { RedisModule } from './common/redis/redis.module'; @Module({ imports: [ @@ -92,7 +91,6 @@ import { RedisModule } from './common/redis/redis.module'; }), inject: [ConfigService], }), - RedisModule, NotificationModule, NotificationhubModule, BlobstorageModule, diff --git a/dictation_server/src/common/redis/redis.module.ts b/dictation_server/src/common/redis/redis.module.ts deleted file mode 100644 index 1741179..0000000 --- a/dictation_server/src/common/redis/redis.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { CacheModule, Module } from '@nestjs/common'; -import { ConfigModule, ConfigService } from '@nestjs/config'; -import * as redisStore from 'cache-manager-redis-store'; -import { RedisService } from './redis.service'; - -@Module({ - imports: [ - CacheModule.registerAsync({ - imports: [ConfigModule], - useFactory: async (configService: ConfigService) => { - if (process.env.STAGE === 'local') { - return { - store: redisStore, - host: configService.get('REDIS_HOST'), - port: configService.get('REDIS_PORT'), - password: configService.get('REDIS_PASSWORD'), - ttl: configService.get('REDIS_TTL'), - }; - } - return { - store: redisStore, - url: `rediss://${configService.get('REDIS_HOST')}:${configService.get( - 'REDIS_PORT', - )}}`, - password: configService.get('REDIS_PASSWORD'), - ttl: configService.get('REDIS_TTL'), - tls: {}, - }; - }, - inject: [ConfigService], - }), - ], - providers: [RedisService], - exports: [RedisService], -}) -export class RedisModule {} diff --git a/dictation_server/src/common/redis/redis.service.ts b/dictation_server/src/common/redis/redis.service.ts deleted file mode 100644 index 330a9bc..0000000 --- a/dictation_server/src/common/redis/redis.service.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { - CACHE_MANAGER, - Inject, - Injectable, - InternalServerErrorException, -} from '@nestjs/common'; -import { Cache } from 'cache-manager'; - -// TODO「タスク 1828: IDトークンを一度しか使えないようにする」で本実装する予定 -@Injectable() -export class RedisService { - constructor(@Inject(CACHE_MANAGER) private cacheManager: Cache) {} - - async set(key: string, value: string): Promise { - try { - await this.cacheManager.set(key, value); - } catch (error) { - throw new InternalServerErrorException(); - } - } - - async get(key: string): Promise { - try { - const value = await this.cacheManager.get(key); - return value; - } catch (error) { - throw new InternalServerErrorException(); - } - } -} diff --git a/dictation_server/src/features/auth/auth.controller.ts b/dictation_server/src/features/auth/auth.controller.ts index 377f98f..83b75de 100644 --- a/dictation_server/src/features/auth/auth.controller.ts +++ b/dictation_server/src/features/auth/auth.controller.ts @@ -23,14 +23,13 @@ import { import { retrieveAuthorizationToken } from '../../common/http/helper'; import { makeContext } from '../../common/log'; import { v4 as uuidv4 } from 'uuid'; -import { RedisService } from '../../common/redis/redis.service'; @ApiTags('auth') @Controller('auth') export class AuthController { constructor( // TODO「タスク 1828: IDトークンを一度しか使えないようにする」で使用する予定 - private readonly redisService: RedisService, + // private readonly redisService: RedisService, private readonly authService: AuthService, ) {} @@ -65,8 +64,6 @@ export class AuthController { HttpStatus.BAD_REQUEST, ); } - //TODO redisにidTokenを保存 - this.redisService.set(body.idToken, 'used'); const context = makeContext(uuidv4()); diff --git a/dictation_server/src/features/auth/auth.module.ts b/dictation_server/src/features/auth/auth.module.ts index 2ccc725..6db0c3f 100644 --- a/dictation_server/src/features/auth/auth.module.ts +++ b/dictation_server/src/features/auth/auth.module.ts @@ -4,9 +4,8 @@ import { AdB2cModule } from '../../gateways/adb2c/adb2c.module'; import { UsersRepositoryModule } from '../../repositories/users/users.repository.module'; import { AuthController } from './auth.controller'; import { AuthService } from './auth.service'; -import { RedisModule } from '../../common/redis/redis.module'; @Module({ - imports: [ConfigModule, AdB2cModule, UsersRepositoryModule, RedisModule], + imports: [ConfigModule, AdB2cModule, UsersRepositoryModule], controllers: [AuthController], providers: [AuthService], })