From ba5a860fe7addeecc05db92fe30c64739560b856 Mon Sep 17 00:00:00 2001
From: Steve Richards <srichards@mirantis.com>
Date: Wed, 23 Sep 2020 15:59:42 +0100
Subject: [PATCH] Removed hardcoded url for DECC endpoint. Now uses env var

---
 src/main/index.ts | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 73b1b28727..aaa38ac28e 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -38,7 +38,6 @@ let windowManager: WindowManager;
 let clusterManager: ClusterManager;
 let proxyServer: LensProxy;
 let deccManager: DECCManager;
-//let clusterStore: ClusterStore;
 
 mangleProxyEnv()
 if (app.commandLine.getSwitchValue("proxy-server") !== "") {
@@ -116,7 +115,7 @@ async function main() {
   app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
     // On certificate error we disable default behaviour (stop loading the page)
     // and we then say "it is all fine - true" to the callback
-    console.log('cert error: ' + error);
+    logger.error('cert error: ' + String(error));
     event.preventDefault();
     callback(true);
   });
@@ -124,6 +123,28 @@ async function main() {
   //windowManager.showMain(keycloakWinURL);
 }
 
+async function processKCLogin(idToken, refreshToken) {
+  logger.info('processKCLogin');
+  
+  userStore.setTokenDetails(idToken, refreshToken);
+  //logger.info('saved id token and refreshToken to userStore');
+
+  //logger.info('the idToken is: ' + userStore.getTokenDetails().token);
+
+  var parsedToken = userStore.decodeToken (idToken);
+  
+  
+  if (process.env.DECC_URL != '') {
+    // create decc manager
+    deccManager = new DECCManager(process.env.DECC_URL);
+    // setup clusters from DECC
+    await deccManager.createDECCLensEnv();
+  }
+  
+  await clusterStore.load();
+  await windowManager.showMain();
+}
+
 app.on("ready", main);
 
 app.on("will-quit", async (event) => {
@@ -134,23 +155,7 @@ app.on("will-quit", async (event) => {
 })
 
 ipcMain.on('keycloak-token', (event, idToken, refreshToken) => {
-  logger.info('test keycloak close main win');
-  userStore.setTokenDetails(idToken, refreshToken);
-  //logger.info('saved id token and refreshToken to userStore');
-
-  //logger.info('the idToken is: ' + userStore.getTokenDetails().token);
-
-  var parsedToken = userStore.decodeToken (idToken);
-  // create cluster manager
-  deccManager = new DECCManager('a09bfce9ea3074e25b8e5e7b1df576fd-1162277427.eu-west-2.elb.amazonaws.com');
-  deccManager.createDECCLensEnv();
-
-  // deccManager.refreshClusterKubeConfigs();
-  // deccManager.getNamespacesForUser();
-  // deccManager.addClustersToWorkspace();
-  
-  //TODO: refresh token! 
-  windowManager.showMain();
+  processKCLogin(idToken, refreshToken);  
 });
 
 ipcMain.on('keycloak-token-update', (event, idToken, refreshToken) => {