From 9566eee6096ba6db8680dbbd038cd32ea8e824ef Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Tue, 13 Jul 2021 01:09:13 +0200
Subject: [PATCH] [bug] fix cache - don't use for admins

---
 server/routes/inclusive.js | 2 +-
 server/routes/nouns.js     | 2 +-
 server/routes/terms.js     | 2 +-
 src/cache.js               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/routes/inclusive.js b/server/routes/inclusive.js
index f345252ed..e9eeec39b 100644
--- a/server/routes/inclusive.js
+++ b/server/routes/inclusive.js
@@ -32,7 +32,7 @@ router.get('/inclusive', handleErrorAsync(async (req, res) => {
             AND i.approved >= ${req.isGranted('inclusive') ? 0 : 1}
             AND i.deleted = 0
         `), 'insteadOf');
-    }));
+    }, !req.isGranted('inclusive')));
 }));
 
 router.get('/inclusive/search/:term', handleErrorAsync(async (req, res) => {
diff --git a/server/routes/nouns.js b/server/routes/nouns.js
index 6fcd29227..f8c0852c6 100644
--- a/server/routes/nouns.js
+++ b/server/routes/nouns.js
@@ -80,7 +80,7 @@ router.get('/nouns', handleErrorAsync(async (req, res) => {
             AND n.approved >= ${req.isGranted('nouns') ? 0 : 1}
             ORDER BY n.approved, n.masc
         `))
-    }));
+    }, !req.isGranted('nouns')));
 }));
 
 router.get('/nouns/search/:term', handleErrorAsync(async (req, res) => {
diff --git a/server/routes/terms.js b/server/routes/terms.js
index 2690fe714..f9ecf081f 100644
--- a/server/routes/terms.js
+++ b/server/routes/terms.js
@@ -32,7 +32,7 @@ router.get('/terms', handleErrorAsync(async (req, res) => {
             AND i.approved >= ${req.isGranted('terms') ? 0 : 1}
             AND i.deleted = 0
         `), 'term');
-    }));
+    }, !req.isGranted('terms')));
 }));
 
 router.get('/terms/search/:term', handleErrorAsync(async (req, res) => {
diff --git a/src/cache.js b/src/cache.js
index 764a7ea35..b6b245fa3 100644
--- a/src/cache.js
+++ b/src/cache.js
@@ -8,8 +8,8 @@ export class CacheObject {
         this.maxAgeMinutes = maxAgeMinutes;
     }
 
-    async fetch(generator) {
-        if (process.env.NODE_ENV === 'development') {
+    async fetch(generator, enabled = true) {
+        if (process.env.NODE_ENV === 'development' || !enabled) {
             return await generator();
         }