added unit test case and fixed build (we can't rely on Uri being a cl…

…ass)
hawtio · Apr 19, 2013 · 789bca1 · 789bca1
1 parent 8e720c6
commit 789bca1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/js/hawtio-plugin-loader.js b/hawtio-web/src/main/webapp/app/core/js/hawtio-plugin-loader.js
@@ -45,16 +45,26 @@
       return map;
   };
 
+  hawtioPluginLoader.credentialsRegex = new RegExp(/.*:\/\/([^@]+)@.*/);
+
   /**
    * Parses the username:password from a http basic auth URL, e.g.
    * http://foo:bar@example.com
    */
   hawtioPluginLoader.getCredentials = function(url) {
+/*
+    No Uri class outside of IE right?
+
     var uri = new Uri(url);
     var credentials = uri.userInfo();
-    if (credentials.indexOf(':') > -1) {
-      return credentials.split(':');
-    } 
+*/
+    var m = url.match(hawtioPluginLoader.credentialsRegex);
+    if (m && m.length > 1) {
+      var credentials = m[1];
+      if (credentials && credentials.indexOf(':') > -1) {
+        return credentials.split(':');
+      }
+    }
     return [];
   };
 

diff --git a/hawtio-web/src/test/specs/spec/CoreSpec.js b/hawtio-web/src/test/specs/spec/CoreSpec.js
@@ -69,4 +69,10 @@ describe("Core", function () {
     });
   });
 
+
+  it("extracts credentials from URLs", function () {
+    var creds = hawtioPluginLoader.getCredentials("http://foo:bar@whatnot");
+    expect(creds[0]).toEqual("foo");
+    expect(creds[1]).toEqual("bar");
+  });
 });