From 73b483f7e9078eb979456fc29a78699dcf72ca74 Mon Sep 17 00:00:00 2001
From: cha0s <git@cha0s.io>
Date: Tue, 19 Jan 2021 10:43:55 -0600
Subject: [PATCH] refactor(security): redis

---
 app/latus.default.yml               | 17 +++++++++--------
 packages/redis/src/create-client.js |  2 +-
 packages/redis/src/docker.js        |  2 +-
 packages/redis/src/index.js         | 10 +---------
 packages/redis/src/server.js        |  7 ++++++-
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/latus.default.yml b/app/latus.default.yml
index 52768c2..840e674 100644
--- a/app/latus.default.yml
+++ b/app/latus.default.yml
@@ -1,12 +1,12 @@
 '@latus/core': {
   up: [
-    '@latus/db',
-    '@latus/redis',
-    '@latus/user/session',
-    '@latus/user/passport',
-    '@latus/user/local',
-    '@latus/http',
-    '@latus/repl',
+    '@latus/db/server',
+    '@latus/redis/server',
+    '@latus/user/session/server',
+    '@latus/user/passport/server',
+    '@latus/user/local/server',
+    '@latus/http/server',
+    '@latus/repl/server',
   ],
 }
 '@latus/db': {
@@ -31,7 +31,8 @@
   ],
 }
 '@latus/react': {}
-'@latus/redis': {
+'@latus/redis': {}
+'@latus/redis/server': {
   docker: 'cached',
 }
 '@latus/redis/session': {}
diff --git a/packages/redis/src/create-client.js b/packages/redis/src/create-client.js
index fb5643a..3973567 100644
--- a/packages/redis/src/create-client.js
+++ b/packages/redis/src/create-client.js
@@ -5,7 +5,7 @@ const {
   REDIS_PORT,
 } = process.env;
 
-export default ({config: {'@latus/redis': {host, port}}}, opts = {}) => (
+export default ({config: {'@latus/redis/server': {host, port}}}, opts = {}) => (
   redis.createClient(
     REDIS_PORT || port,
     REDIS_HOST || host,
diff --git a/packages/redis/src/docker.js b/packages/redis/src/docker.js
index cbf8f80..b75cee9 100644
--- a/packages/redis/src/docker.js
+++ b/packages/redis/src/docker.js
@@ -9,7 +9,7 @@ import createClient from './create-client';
 const debug = D('@latus/redis/docker');
 
 export default async function createDockerContainer(latus) {
-  const {config: {'@latus/redis': {docker, port}}} = latus;
+  const {config: {'@latus/redis/server': {docker, port}}} = latus;
   const args = [
     'run',
     '--rm',
diff --git a/packages/redis/src/index.js b/packages/redis/src/index.js
index f1e86d7..ff8b4c5 100644
--- a/packages/redis/src/index.js
+++ b/packages/redis/src/index.js
@@ -1,9 +1 @@
-export default {
-  hooks: {
-    '@latus/core/config': () => ({
-      docker: true,
-      host: '127.0.0.1',
-      port: 6380,
-    }),
-  },
-};
+export default {};
diff --git a/packages/redis/src/server.js b/packages/redis/src/server.js
index 88e7794..0f103aa 100644
--- a/packages/redis/src/server.js
+++ b/packages/redis/src/server.js
@@ -31,8 +31,13 @@ export const keys = (client, pattern) => safeKeys(client, pattern, 0);
 
 export default {
   hooks: {
+    '@latus/core/config': () => ({
+      docker: true,
+      host: '127.0.0.1',
+      port: 6380,
+    }),
     '@latus/core/up': (latus) => {
-      const {config: {'@latus/redis': {docker}}} = latus;
+      const {config: {'@latus/redis/server': {docker}}} = latus;
       return 'production' !== NODE_ENV && docker ? createDockerContainer(latus) : undefined;
     },
     '@latus/repl/context': (latus) => ({