new harmonized approach 2

Author: rlindner81

src/feature-toggles.js

@@ -808,8 +808,8 @@ class FeatureToggles {
     configFile: configFilepath,
     configFiles: configFilepaths,
     configAuto,
+    redisCredentials,
     redisClientOptions,
-    redisClusterOptions,
   } = {}) {
     if (this.__isInitialized) {
       return;
@@ -868,7 +868,7 @@ class FeatureToggles {
       );
     }
 
-    redis.setCustomOptions(redisClientOptions, redisClusterOptions);
+    redis.setCustomOptions(redisCredentials, redisClientOptions);
     const redisIntegrationMode = await redis.getIntegrationMode();
     if (redisIntegrationMode !== REDIS_INTEGRATION_MODE.NO_REDIS) {
       try {

src/plugin.js

@@ -178,8 +178,8 @@ const activate = async () => {
     configFile: envFeatureToggles?.configFile,
     configFiles: envFeatureToggles?.configFiles,
     configAuto,
-    redisClientOptions,
     redisCredentials,
+    redisClientOptions,
   });
 
   _registerFeatureProvider(envFeatureToggles);

src/redis-adapter.js

@@ -35,17 +35,17 @@ const MODE = Object.freeze({
 });
 
 let __messageHandlers;
+let __customCredentials;
 let __customClientOptions;
-let __customClusterOptions;
 let __activeOptionsTuple;
 let __canGetClientPromise;
 let __mainClientPromise;
 let __subscriberClientPromise;
 let __integrationModePromise;
 const _reset = () => {
   __messageHandlers = new HandlerCollection();
+  __customCredentials = null;
   __customClientOptions = null;
-  __customClusterOptions = null;
   __activeOptionsTuple = null;
   __canGetClientPromise = null;
   __mainClientPromise = null;
@@ -213,9 +213,9 @@ const _closeClientBase = async (client) => {
   }
 };
 
-const setCustomOptions = (clientOptions, clusterOptions) => {
+const setCustomOptions = (credentials, clientOptions) => {
+  __customCredentials = credentials;
   __customClientOptions = clientOptions;
-  __customClusterOptions = clusterOptions;
 };
 
 const _canGetClient = async () => {