From d2c41fb983cbd66de1484d39006aa587ba57346e Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 4 Jun 2024 14:33:04 +0300
Subject: [PATCH] apps/api: use global CacheModule

---
 apps/api/src/app.module.ts               | 10 ++++++++++
 apps/api/src/ldap-tfa/ldap-tfa.module.ts | 17 +++--------------
 apps/api/src/ldap/ldap.module.ts         | 13 +------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/apps/api/src/app.module.ts b/apps/api/src/app.module.ts
index 7a8fadf..0841d2c 100644
--- a/apps/api/src/app.module.ts
+++ b/apps/api/src/app.module.ts
@@ -4,10 +4,13 @@ import { AppService } from './app.service';
 import { env } from './config/env';
 import { LdapModule } from './ldap/ldap.module';
 import { LdapTfaModule } from './ldap-tfa/ldap-tfa.module';
+import { CacheModule } from '@nestjs/cache-manager';
 import { Global, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { JwtModule } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
+import * as redisStore from 'cache-manager-ioredis';
+import type { RedisOptions } from 'ioredis';
 
 @Global()
 @Module({
@@ -27,6 +30,13 @@ import { MongooseModule } from '@nestjs/mongoose';
     AccountModule,
     LdapTfaModule,
     MongooseModule.forRoot(`mongodb://${env.MONGO_HOST}`),
+    CacheModule.register<RedisOptions>({
+      host: env.REDIS_HOST,
+      isGlobal: true,
+      port: env.REDIS_PORT,
+      store: redisStore,
+      ttl: env.API_CACHE_TTL,
+    }),
   ],
   providers: [AppService],
 })
diff --git a/apps/api/src/ldap-tfa/ldap-tfa.module.ts b/apps/api/src/ldap-tfa/ldap-tfa.module.ts
index 714dfa5..9a96f45 100644
--- a/apps/api/src/ldap-tfa/ldap-tfa.module.ts
+++ b/apps/api/src/ldap-tfa/ldap-tfa.module.ts
@@ -1,23 +1,12 @@
 /* eslint-disable @typescript-eslint/no-extraneous-class */
 import { LdapTfaController } from './ldap-tfa.controller';
-import { CacheModule } from '@nestjs/cache-manager';
 import { Module } from '@nestjs/common';
-import * as redisStore from 'cache-manager-ioredis';
-import type { RedisOptions } from 'ioredis';
-import { env } from 'src/config/env';
 import { LdapModule } from 'src/ldap/ldap.module';
+import { LdapTfaGateway } from 'src/ldap-tfa/ldap-tfa.gateway';
 
 @Module({
   controllers: [LdapTfaController],
-  imports: [
-    LdapModule,
-    CacheModule.register<RedisOptions>({
-      db: 1,
-      host: env.REDIS_HOST,
-      port: env.REDIS_PORT,
-      store: redisStore,
-      ttl: env.API_CACHE_TTL,
-    }),
-  ],
+  imports: [LdapModule],
+  providers: [LdapTfaGateway],
 })
 export class LdapTfaModule {}
diff --git a/apps/api/src/ldap/ldap.module.ts b/apps/api/src/ldap/ldap.module.ts
index d7ab022..6b391b5 100644
--- a/apps/api/src/ldap/ldap.module.ts
+++ b/apps/api/src/ldap/ldap.module.ts
@@ -1,22 +1,11 @@
 import { LdapController } from './ldap.controller';
 import { LdapService } from './ldap.service';
-import { CacheModule } from '@nestjs/cache-manager';
 import { Module } from '@nestjs/common';
-import * as redisStore from 'cache-manager-ioredis';
-import type { RedisOptions } from 'ioredis';
-import { env } from 'src/config/env';
 
 @Module({
   controllers: [LdapController],
   exports: [LdapService],
-  imports: [
-    CacheModule.register<RedisOptions>({
-      host: env.REDIS_HOST,
-      port: env.REDIS_PORT,
-      store: redisStore,
-      ttl: env.API_CACHE_TTL,
-    }),
-  ],
+  imports: [],
   providers: [LdapService],
 })
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class