add redis

.circleci/config.yml

@@ -6,6 +6,7 @@ jobs:
     docker:
       - image: circleci/node:dubnium
       - image: ibmcom/cloudant-developer
+      - image: redis
     steps:
       - checkout
       - restore_cache:

README.md

@@ -37,6 +37,11 @@ run:
 npm install
 ```
 
+### Redis
+
+Be sure that redis is running on the default port (6379).
+For convenience you can run: `npm run redis`.
+
 
 ### Database (CouchDB 2.x + Clouseau + Dreyfus)
 
@@ -75,7 +80,7 @@ docker logs cloudant-developer
 
 ### App
 
-Once cloudant is running run:
+Once cloudant and redis are running run:
 
 ```sh
 npm run init
@@ -131,7 +136,7 @@ For chrome:
 
 ### Tests
 
-Once cloudant is running run:
+Once cloudant and redis are running run:
 
 ```sh
 npm test

package.json

@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "cloudant": "docker restart cloudant-developer",
+    "redis": "redis-server /usr/local/etc/redis.conf",
     "log-cloudant": "docker logs cloudant-developer",
     "extension:watch": "webpack --config webpack-extension.config.js --watch --mode development",
     "extension:build": "cross-env NODE_ENV=production webpack --config webpack-extension.config.js --mode production",
@@ -190,6 +191,7 @@
     "classnames": "^2.2.6",
     "clipboard-copy": "^3.1.0",
     "concat-stream": "^2.0.0",
+    "connect-redis": "^4.0.3",
     "cors": "^2.8.5",
     "date-fns": "^2.5.1",
     "doi-regex": "^0.1.10",
@@ -217,6 +219,7 @@
     "react-dropzone": "^10.1.10",
     "react-icons": "^3.7.0",
     "react-router-dom": "^5.1.2",
+    "redis": "^2.8.0",
     "slug": "^1.1.0",
     "uuid": "^3.3.3",
     "xmldom": "^0.1.27"

src/index.js

@@ -2,13 +2,18 @@ import path from 'path';
 import { STATUS_CODES } from 'http';
 import express from 'express';
 import session from 'express-session';
+import redis from 'redis';
+import connectRedis from 'connect-redis';
 import authRoutes from './routes/auth-routes';
 import appRoutes from './routes/app-routes';
 import apiRoutes from './routes/api-routes';
 import addDb from './middlewares/add-db';
 import { createPassport } from './utils/orcid';
+import { createRedisConfig } from './utils/redis';
 
 export function rapid(config = {}) {
+  const RedisStore = connectRedis(session);
+
   const passport = createPassport(config);
 
   const app = express();
@@ -24,7 +29,10 @@ export function rapid(config = {}) {
       secret:
         config.sessionSecret || process.env.SESSION_SECRET || 'rapid-prereview',
       resave: false,
-      saveUninitialized: false
+      saveUninitialized: false,
+      store: new RedisStore({
+        client: redis.createClient(createRedisConfig(config, { ns: 'sess' }))
+      })
     })
   );
   app.use(passport.initialize());

src/utils/redis.js

@@ -0,0 +1,21 @@
+export function createRedisConfig(config = {}, { ns } = {}) {
+  const opts = {
+    host: config.redisHost || process.env['REDIS_HOST'] || '127.0.0.1',
+    port: config.redisPort || process.env['REDIS_PORT'] || 6379
+  };
+
+  let redisPrefix = config.redisPrefix || 'rpos:';
+  if (ns) {
+    redisPrefix += `${ns}:`;
+  }
+
+  opts.prefix = redisPrefix;
+
+  const redisPassword = config.redisPassword || process.env['REDIS_PASSWORD'];
+  if (redisPassword) {
+    opts.pass = redisPassword; // for compatibility with RedisStore (used in the session middleware)
+    opts.password = redisPassword;
+  }
+
+  return opts;
+}