Merge pull request #1 from redislabs-training/feature/add-password-support

Add support for connecting to password protected Redis.

Author: Simon Prickett

README.md

@@ -27,7 +27,7 @@ $ npm install
 The application uses a configuration file, `config.json` to specify the port that it listens 
 on plus some logging parameters and how it connects to a database.  
 
-The supplied `config.json` file is already set up to use Redis on localhost port 6379.  Change these values if your Redis instance is on another host or port.
+The supplied `config.json` file is already set up to use Redis on localhost port 6379.  Change these values if your Redis instance is on another host or port, or requires a password to connect.
 
 ```
 {
@@ -40,6 +40,7 @@ The supplied `config.json` file is already set up to use Redis on localhost port
     "redis": {
       "host": "localhost",
       "port": 6379,
+      "password": null,
       "keyPrefix": "ru102js"
     }
   }

config.json

@@ -8,6 +8,7 @@
     "redis": {
       "host": "localhost",
       "port": 6379,
+      "password": null,
       "keyPrefix": "ru102js"
     }
   }

src/daos/impl/redis/redis_client.js

@@ -11,10 +11,16 @@ bluebird.promisifyAll(redis);
 
 // Create a client and connect to Redis using configuration
 // from config.json.
-const client = redis.createClient({
+const clientConfig = {
   host: config.get('dataStores.redis.host'),
   port: config.get('dataStores.redis.port'),
-});
+};
+
+if (config.get('dataStores.redis.password')) {
+  clientConfig.password = config.get('dataStores.redis.password');
+}
+
+const client = redis.createClient(clientConfig);
 
 // This is a catch all basic error handler.
 client.on('error', error => console.log(error));

src/examples/blocking_commands.js

@@ -14,6 +14,7 @@ const startConsumer = async () => {
   const consumerClient = redis.createClient({
     port: 6379,
     host: '127.0.0.1',
+    // password: 'password',
   });
 
   while (!done) {
@@ -48,6 +49,7 @@ const startProducer = async () => {
   const producerClient = redis.createClient({
     port: 6379,
     host: '127.0.0.1',
+    // password: 'password',
   });
 
   // Run the producer at one second intervals.

src/examples/error_handling_async_await.js

@@ -8,6 +8,7 @@ const replyErrorExamples = async () => {
   const client = redis.createClient({
     port: 6379,
     host: '127.0.0.1',
+    // password: 'password',
   });
 
   const key = 'replyErrorTest';

src/examples/error_handling_connection_error.js

@@ -9,6 +9,7 @@ const connectionErrorExample = async () => {
     const client = redis.createClient({
       port: 6379,
       host: '127.0.0.1',
+      // password: 'password',
       retry_strategy: (options) => {
         if (options.attempt > 5) {
           return new Error('Retry attempts exhausted.');

src/examples/error_handling_listener.js

@@ -3,6 +3,7 @@ const redis = require('redis');
 const client = redis.createClient({
   port: 6379,
   host: '127.0.0.1',
+  // password: 'password',
 });
 
 // Add top level error listner.

src/examples/event_examples.js

@@ -3,6 +3,7 @@ const redis = require('redis');
 const client = redis.createClient({
   port: 6379,
   host: '127.0.0.1',
+  // password: 'password',
 });
 
 client.on('ready', () => console.log('Redis client is ready!'));

src/examples/hello_async_await.js

@@ -13,6 +13,7 @@ const runApplication = async () => {
   const client = redis.createClient({
     host: 'localhost',
     port: 6379,
+    // password: 'password',
   });
 
   // Run a Redis command.

src/examples/hello_basic.js

@@ -4,6 +4,7 @@ const redis = require('redis');
 const client = redis.createClient({
   host: 'localhost',
   port: 6379,
+  // password: 'password',
 });
 
 // Run a Redis command, receive response in callback.