Merge branch 'fix/properly-configure-cmd-panel' into 'master'

fix: properly configure host in 'config panel' cmd

See merge request prey/js/prey-node-client!1039

lib/agent/control-panel/secure.js

@@ -20,23 +20,6 @@ let privateKey;
 let publicKey;
 let publicKeys = {};
 
-const protocol = config.getData('control-panel.protocol');
-const host = config.getData('control-panel.host');
-let panelHost;
-switch (host) {
-  case 'solid.preyproject.com':
-    panelHost = 'panel.preyproject.com';
-    break;
-  case 'solid.preyhq.com':
-    panelHost = 'panel.preyhq.com';
-    break;
-  default:
-    panelHost = host;
-    break;
-}
-const base = `${protocol}://${panelHost}`;
-const authUrl = `${base}/auth/configuration/start`;
-
 const notifyLinked = (hardware) => {
   if (!common.helpers.running_on_background()) return;
   const data = {
@@ -144,6 +127,22 @@ exports.generate_keys = (cb) => {
 };
 
 exports.open_config = (deviceKey, cb) => {
+  const protocol = config.getData('control-panel.protocol');
+  const host = config.getData('control-panel.host');
+  let panelHost;
+  switch (host) {
+    case 'solid.preyproject.com':
+      panelHost = 'panel.preyproject.com';
+      break;
+    case 'solid.preyhq.com':
+      panelHost = 'panel.preyhq.com';
+      break;
+    default:
+      panelHost = host;
+      break;
+  }
+  const base = `${protocol}://${panelHost}`;
+  const authUrl = `${base}/auth/configuration/start`;
   setTimeout(() => {
     const lang = common.system.lang || 'en';