Check 'auth' field when displaying .dockercfg config

openshift · Oct 27, 2017 · 20a3e34 · 20a3e34
1 parent 14188ec
commit 20a3e34
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/app/scripts/services/secrets.js b/app/scripts/services/secrets.js
@@ -28,17 +28,29 @@ angular.module("openshiftConsole")
       return secretsByType;
     };
 
+    var setDataParams = function(decodedSecretData, serverName, data) {
+      var usernamePassword = [];
+      if (data.auth) {
+        usernamePassword = window.atob(data.auth).split(":");
+      } else if (data.username && data.password) {
+        usernamePassword = [data.username, data.password];
+      }
+
+      decodedSecretData.auths[serverName] = {
+        username: usernamePassword[0],
+        password: usernamePassword[1],
+        email: data.email
+      };
+      return decodedSecretData;
+    };
+
     var decodeDockercfg = function(encodedData) {
       var decodedSecretData = {
         auths: {}
       };
       var decodedData = JSON.parse(window.atob(encodedData));
       _.each(decodedData, function(data, serverName) {
-        decodedSecretData.auths[serverName] = {
-          username: data.username,
-          password: data.password,
-          email: data.email
-        };
+        decodedSecretData = setDataParams(decodedSecretData, serverName, data);
       });
       return decodedSecretData;
     };
@@ -53,13 +65,7 @@ angular.module("openshiftConsole")
           decodedSecretData.auths[serverName] = data;
           return;
         }
-
-        var usernamePassword = window.atob(data.auth).split(":");
-        decodedSecretData.auths[serverName] = {
-          username: usernamePassword[0],
-          password: usernamePassword[1],
-          email: data.email
-        };
+        decodedSecretData = setDataParams(decodedSecretData, serverName, data);
       });
 
       if (decodedData.credsStore) {