From 8a03d4bbdc13d533f92184aa72d772ba1165ef94 Mon Sep 17 00:00:00 2001
From: Tanya Byrne <t.byrne1@lancaster.ac.uk>
Date: Tue, 18 Aug 2020 18:09:19 +0100
Subject: [PATCH 1/2] add to env varibles so user has choice

This is between 'redis' and 'memory'
---
 api/example.env                       | 1 +
 api/package-lock.json                 | 8 --------
 api/package.json                      | 1 -
 api/src/cli/utils/create-env/index.ts | 1 +
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/api/example.env b/api/example.env
index feaf7afd1f..2cfaf5b28e 100644
--- a/api/example.env
+++ b/api/example.env
@@ -28,6 +28,7 @@ REDIS_PASSWORD=null
 
 ####################################################################################################
 # Rate Limiting
+RATE_LIMIT_TYPE="redis"
 CONSUMED_POINTS_LIMIT=5
 CONSUMED_RESET_DURATION=1
 EXEC_EVENLY=true
diff --git a/api/package-lock.json b/api/package-lock.json
index 43c47a888f..f23f4d915f 100644
--- a/api/package-lock.json
+++ b/api/package-lock.json
@@ -5294,14 +5294,6 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz",
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="
     },
-    "node-cache": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz",
-      "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==",
-      "requires": {
-        "clone": "2.x"
-      }
-    },
     "node-exceptions": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/node-exceptions/-/node-exceptions-4.0.1.tgz",
diff --git a/api/package.json b/api/package.json
index 27f0fc1de7..37bc05761e 100644
--- a/api/package.json
+++ b/api/package.json
@@ -103,7 +103,6 @@
     "lodash": "^4.17.19",
     "ms": "^2.1.2",
     "nanoid": "^3.1.12",
-    "node-cache": "^5.1.2",
     "nodemailer": "^6.4.11",
     "ora": "^4.1.1",
     "otplib": "^12.0.1",
diff --git a/api/src/cli/utils/create-env/index.ts b/api/src/cli/utils/create-env/index.ts
index 6c7aa4222e..0fb2cf52c6 100644
--- a/api/src/cli/utils/create-env/index.ts
+++ b/api/src/cli/utils/create-env/index.ts
@@ -31,6 +31,7 @@ const defaults = {
 		REDIS_PASSWORD: null,
 	},
 	rateLimits: {
+		RATE_LIMIT_TYPE: 'redis',
 		CONSUMED_POINTS_LIMIT: 5,
 		CONSUMED_RESET_DURATION: 1,
 		EXEC_EVENLY: true,

From 413144a9d8244695057f4ad91e6c3d9b6023551a Mon Sep 17 00:00:00 2001
From: Tanya Byrne <t.byrne1@lancaster.ac.uk>
Date: Tue, 18 Aug 2020 18:23:52 +0100
Subject: [PATCH 2/2] match formatting.

---
 api/example.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/example.env b/api/example.env
index 2cfaf5b28e..d148c411d5 100644
--- a/api/example.env
+++ b/api/example.env
@@ -28,6 +28,7 @@ REDIS_PASSWORD=null
 
 ####################################################################################################
 # Rate Limiting
+
 RATE_LIMIT_TYPE="redis"
 CONSUMED_POINTS_LIMIT=5
 CONSUMED_RESET_DURATION=1