From 5f98f702d4dfeb528a7818e57a939484d4f0fdc8 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 26 Mar 2020 15:42:26 +1100
Subject: [PATCH] Generate storage profile dynamically

---
 app/config.js                                 |  2 +-
 app/user_config.js                            | 21 ++++++++++++++++---
 config/development-1.json                     |  3 ---
 config/development.json                       |  1 -
 config/local-devprod1.json                    |  6 ------
 ...l-devprod.json => production-devprod.json} |  1 -
 config/production-devprod1.json               |  4 ++++
 config/swarm-testing-2.json                   |  3 ---
 config/swarm-testing.json                     |  1 -
 9 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 config/development-1.json
 delete mode 100644 config/local-devprod1.json
 rename config/{local-devprod.json => production-devprod.json} (58%)
 create mode 100644 config/production-devprod1.json
 delete mode 100644 config/swarm-testing-2.json

diff --git a/app/config.js b/app/config.js
index 3a865109d..bd71b799c 100644
--- a/app/config.js
+++ b/app/config.js
@@ -36,11 +36,11 @@ config.environment = environment;
 // Log resulting env vars in use by config
 [
   'NODE_ENV',
+  'NODE_APP_INSTANCE',
   'NODE_CONFIG_DIR',
   'NODE_CONFIG',
   'ALLOW_CONFIG_MUTATIONS',
   'HOSTNAME',
-  'NODE_APP_INSTANCE',
   'SUPPRESS_NO_CONFIG_WARNING',
 ].forEach(s => {
   console.log(`${s} ${config.util.getEnv(s)}`);
diff --git a/app/user_config.js b/app/user_config.js
index 12cdded84..63d0b3dd5 100644
--- a/app/user_config.js
+++ b/app/user_config.js
@@ -1,15 +1,30 @@
 const path = require('path');
+const process = require('process');
 
 const { app } = require('electron');
 
 const { start } = require('./base_config');
 const config = require('./config');
 
-// Use separate data directory for development
-if (config.has('storageProfile')) {
+let storageProfile;
+const { NODE_ENV: environment, NODE_APP_INSTANCE:instance } = process.env;
+const isProduction = environment === 'production' && !instance;
+
+// Use seperate data directories for each different environment and app instances
+// We should prioritise config values first
+if (config.has(storageProfile)) {
+  storageProfile = config.get('storageProfile');
+} else if (!isProduction) {
+  storageProfile = environment;
+  if (instance) {
+    storageProfile = storageProfile.concat(`-${instance}`)
+  }
+}
+
+if (storageProfile) {
   const userData = path.join(
     app.getPath('appData'),
-    `Loki-Messenger-${config.get('storageProfile')}`
+    `Session-${storageProfile}`
   );
 
   app.setPath('userData', userData);
diff --git a/config/development-1.json b/config/development-1.json
deleted file mode 100644
index 0cccc8bd9..000000000
--- a/config/development-1.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "storageProfile": "development1"
-}
diff --git a/config/development.json b/config/development.json
index 89ac6c6f7..ba141816b 100644
--- a/config/development.json
+++ b/config/development.json
@@ -1,5 +1,4 @@
 {
-  "storageProfile": "development",
   "seedNodeList": [
     {
       "ip": "public.loki.foundation",
diff --git a/config/local-devprod1.json b/config/local-devprod1.json
deleted file mode 100644
index 9d3b12053..000000000
--- a/config/local-devprod1.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "storageProfile": "devprod1Profile",
-  "localServerPort": "8082",
-  "openDevTools": true,
-  "updatesEnabled": false
-}
diff --git a/config/local-devprod.json b/config/production-devprod.json
similarity index 58%
rename from config/local-devprod.json
rename to config/production-devprod.json
index 45797645e..62437286b 100644
--- a/config/local-devprod.json
+++ b/config/production-devprod.json
@@ -1,5 +1,4 @@
 {
-  "storageProfile": "devprodProfile",
   "openDevTools": true,
   "updatesEnabled": false
 }
diff --git a/config/production-devprod1.json b/config/production-devprod1.json
new file mode 100644
index 000000000..62437286b
--- /dev/null
+++ b/config/production-devprod1.json
@@ -0,0 +1,4 @@
+{
+  "openDevTools": true,
+  "updatesEnabled": false
+}
diff --git a/config/swarm-testing-2.json b/config/swarm-testing-2.json
deleted file mode 100644
index 0c69c0be1..000000000
--- a/config/swarm-testing-2.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "storageProfile": "swarm-testing2"
-}
diff --git a/config/swarm-testing.json b/config/swarm-testing.json
index 9df9b3340..4e7ab7fee 100644
--- a/config/swarm-testing.json
+++ b/config/swarm-testing.json
@@ -1,5 +1,4 @@
 {
-  "storageProfile": "swarm-testing",
   "seedNodeList": [
     {
       "ip": "localhost",