Explorer UI - Fix: Avoid storing credentials

Signed-off-by: thfries <thomas.fries0@gmail.com>
eclipse-ditto · Aug 28, 2022 · 542ae66 · 542ae66
1 parent f167429
commit 542ae66
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 15 deletions.
diff --git a/ui/modules/api.js b/ui/modules/api.js
@@ -222,12 +222,7 @@ let authHeaderValue;
  * @param {boolean} forDevOps if true, the credentials for the dev ops api will be used.
  */
 export function setAuthHeader(forDevOps) {
-  if (!Environments.current().bearer && !Environments.current().usernamePassword &&
-      !Environments.current().useDittoPreAuthenticatedAuth) {
-    return;
-  }
-
-  if (forDevOps && Environments.current().usernamePasswordDevOps) {
+  if (forDevOps && Environments.current().useBasicAuth) {
     authHeaderKey = 'Authorization';
     authHeaderValue = 'Basic ' + window.btoa(Environments.current().usernamePasswordDevOps);
   } else if (Environments.current().useBasicAuth) {

diff --git a/ui/modules/environments/environments.js b/ui/modules/environments/environments.js
@@ -22,31 +22,31 @@ let environments = {
     api_uri: 'http://localhost:8080',
     solutionId: null,
     bearer: null,
-    usernamePassword: 'ditto:ditto',
-    usernamePasswordDevOps: 'devops:foobar',
+    defaultUsernamePassword: 'ditto:ditto',
+    defaultUsernamePasswordDevOps: 'devops:foobar',
     useBasicAuth: true,
     useDittoPreAuthenticatedAuth: false,
-    dittoPreAuthenticatedUsername: null,
+    defaultDittoPreAuthenticatedUsername: null,
   },
   local_ditto_ide: {
     api_uri: 'http://localhost:8080',
     solutionId: null,
     bearer: null,
-    usernamePassword: null,
-    usernamePasswordDevOps: null,
+    defaultUsernamePassword: null,
+    defaultUsernamePasswordDevOps: null,
     useBasicAuth: false,
     useDittoPreAuthenticatedAuth: true,
-    dittoPreAuthenticatedUsername: 'pre:ditto',
+    defaultDittoPreAuthenticatedUsername: 'pre:ditto',
   },
   ditto_sandbox: {
     api_uri: 'https://ditto.eclipseprojects.io',
     solutionId: null,
     bearer: null,
-    usernamePassword: 'ditto:ditto',
-    usernamePasswordDevOps: null,
+    defaultUsernamePassword: 'ditto:ditto',
+    defaultUsernamePasswordDevOps: null,
     useBasicAuth: true,
     useDittoPreAuthenticatedAuth: false,
-    dittoPreAuthenticatedUsername: null,
+    defaultDittoPreAuthenticatedUsername: null,
   },
 };
 
@@ -88,6 +88,30 @@ export function ready() {
     environments = JSON.parse(restoredEnv);
   }
 
+  Object.keys(environments).forEach((env) => {
+    Object.defineProperties(environments[env], {
+      bearer: {
+        enumerable: false,
+        writable: true,
+      },
+      usernamePassword: {
+        value: environments[env].defaultUsernamePassword,
+        enumerable: false,
+        writable: true,
+      },
+      usernamePasswordDevOps: {
+        value: environments[env].defaultUsernamePasswordDevOps,
+        enumerable: false,
+        writable: true,
+      },
+      dittoPreAuthenticatedUsername: {
+        value: environments[env].defaultDittoPreAuthenticatedUsername,
+        enumerable: false,
+        writable: true,
+      },
+    });
+  });
+
   settingsEditor = ace.edit('settingsEditor');
   settingsEditor.session.setMode('ace/mode/json');