Issue #133: Create auth fields in js when needed.

mk23 · Nov 16, 2016 · c0706a5 · c0706a5
1 parent 5257a25
commit c0706a5
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 20 deletions.
diff --git a/src/main/resources/assets/index.html b/src/main/resources/assets/index.html
@@ -39,13 +39,11 @@ <h3 class="modal-title">Endpoint Authentication</h3>
                                 <span class="input-group-addon">
                                     <span class="glyphicon glyphicon-user"></span>
                                 </span>
-                                <input id="endpoint-user" class="form-control" type="text" placeholder="username">
                             </div>
                             <div class="input-group">
                                 <span class="input-group-addon">
                                     <span class="glyphicon glyphicon-lock"></span>
                                 </span>
-                                <input id="endpoint-pass" class="form-control" type="password" placeholder="password">
                             </div>
                             <button class="btn btn-default" type="submit">
                                 <span class="glyphicon glyphicon-log-in"></span>

diff --git a/src/main/resources/assets/js/jmxproxy.js b/src/main/resources/assets/js/jmxproxy.js
@@ -755,27 +755,48 @@ var endpointHostClass = function(prefix, host) {
         checkHost();
     };
 
+    var setupAuth = function(jqXHR) {
+        if (jqXHR.status == 401) {
+            $('#endpoint-auth').modal();
+            $('#endpoint-creds .input-group:nth(0)')
+            .find('input')
+                .remove()
+                .end()
+            .append(
+                $('<input/>')
+                .addClass('form-control')
+                .attr({
+                    id: 'endpoint-user',
+                    type: 'text',
+                    placeholder: 'username',
+                })
+            );
+            $('#endpoint-creds .input-group:nth(1)')
+            .find('input')
+                .remove()
+                .end()
+            .append(
+                $('<input/>')
+                .addClass('form-control')
+                .attr({
+                    id: 'endpoint-pass',
+                    type: 'password',
+                    placeholder: 'password',
+                })
+            );
+            $('#endpoint-user').focus();
+        } else if (jqXHR.status == 404) {
+            displayError('Selected endpoint is unavailable.');
+        }
+    };
+
     var fetchData = function(item, callback) {
         if (creds != null) {
             $.post(prefix+'/jmxproxy/'+host+item, creds, callback)
-            .fail(function(jqXHR) {
-                if (jqXHR.status == 401) {
-                    $('#endpoint-auth').modal();
-                    $('#endpoint-user').focus();
-                } else if (jqXHR.status == 404) {
-                    displayError('Selected endpoint is unavailable.');
-                }
-            });
+            .fail(setupAuth);
         } else {
             $.getJSON(prefix+'/jmxproxy/'+host+item, callback)
-            .fail(function(jqXHR) {
-                if (jqXHR.status == 401) {
-                    $('#endpoint-auth').modal();
-                    $('#endpoint-user').focus();
-                } else if (jqXHR.status == 404) {
-                    displayError('Selected endpoint is unavailable.');
-                }
-            });
+            .fail(setupAuth);
         }
     };
 
@@ -851,7 +872,6 @@ $(document).ready(function() {
                 $('#endpoint-combo button').prop('disabled', true);
             }
         } else if (!$(this).data('changing')) {
-            console.log($(this).data('changing'));
             endpointHost = endpointHostClass(prefix, data.text);
             $('#endpoint-combo').data('changing', false);
         }
@@ -873,7 +893,6 @@ $(document).ready(function() {
         $('#endpoint-combo').data('changing', $(this).val() != '');
     })
     .blur(function(e) {
-        console.log('hi');
         $('#endpoint-combo').data('changing', false);
     });