Merge pull request #10591 from Leichtwind/master

fix(cache): use passed store object
nestjs · Nov 29, 2022 · 0ee84c4 · 0ee84c4
2 parents ef917e0 + 2983f54
commit 0ee84c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/integration/cache/src/multi-store/multi-store.module.ts b/integration/cache/src/multi-store/multi-store.module.ts
@@ -1,5 +1,5 @@
 import { CacheModule, Module } from '@nestjs/common';
-import * as redisStore from 'cache-manager-redis-store';
+import { redisStore } from 'cache-manager-redis-store';
 import { MultiStoreController } from './multi-store.controller';
 
 @Module({

diff --git a/packages/common/cache/cache.providers.ts b/packages/common/cache/cache.providers.ts
@@ -3,7 +3,10 @@ import { loadPackage } from '../utils/load-package.util';
 import { CACHE_MANAGER } from './cache.constants';
 import { MODULE_OPTIONS_TOKEN } from './cache.module-definition';
 import { defaultCacheOptions } from './default-options';
-import { CacheManagerOptions } from './interfaces/cache-manager.interface';
+import {
+  CacheManagerOptions,
+  CacheStore,
+} from './interfaces/cache-manager.interface';
 
 /**
  * Creates a CacheManager Provider.
@@ -28,10 +31,14 @@ export function createCacheManager(): Provider {
             ...{ ...options, store },
           });
         }
-        let cache: string | Function = 'memory';
+        let cache: string | Function | CacheStore = 'memory';
         defaultCacheOptions.ttl *= 1000;
-        if (typeof store === 'object' && 'create' in store) {
-          cache = store.create;
+        if (typeof store === 'object') {
+          if ('create' in store) {
+            cache = store.create;
+          } else {
+            cache = store;
+          }
         } else if (typeof store === 'function') {
           cache = store;
         }