From 45613a3941c465da00d40bd2b0674b5f3c673162 Mon Sep 17 00:00:00 2001
From: Lucas Araujo <lucraraujo@gmail.com>
Date: Tue, 21 Mar 2017 13:15:43 -0300
Subject: [PATCH] Separate connection parameters. Implements #9

---
 index.html |  5 ++++-
 src/app.js | 24 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 4251362..2cb96d0 100644
--- a/index.html
+++ b/index.html
@@ -15,7 +15,10 @@
             <div class="item address">
                 <div class="ui fluid labeled input">
                     <div class="ui label">amqp://</div>
-                    <input id="usagi-rabbitmq-params" placeholder="user:password@host:port" value="">
+                    <input id="usagi-rabbitmq-host" placeholder="localhost" value="">
+                    <input id="usagi-rabbitmq-port" placeholder="5672" value="">
+                    <input id="usagi-rabbitmq-username" placeholder="guest" value="">
+                    <input id="usagi-rabbitmq-password" placeholder="guest" value="">
                 </div>
             </div>
         </div>
diff --git a/src/app.js b/src/app.js
index 4df3f16..9937868 100644
--- a/src/app.js
+++ b/src/app.js
@@ -97,9 +97,19 @@ function sendRequest(event) {
 
     var error = [];
 
-    if (!$("#usagi-rabbitmq-params").val()) {
-        error.push('Connect params');
+    if (!$("#usagi-rabbitmq-host").val()) {
+        error.push('Connect host');
     }
+    if (!$("#usagi-rabbitmq-port").val()) {
+        error.push('Connect port');
+    }
+    if (!$("#usagi-rabbitmq-username").val()) {
+        error.push('Connect username');
+    }
+    if (!$("#usagi-rabbitmq-password").val()) {
+        error.push('Connect password');
+    }
+
     if (!$("#usagi-request-queue").val()) {
         error.push('Queue name');
     }
@@ -112,14 +122,18 @@ function sendRequest(event) {
         return false;
     }
 
-    var protocol = 'amqp://';
-    var rabbitmq_host = protocol + $("#usagi-rabbitmq-params").val();
+    const protocol = 'amqp://';
+    const rabbitmqHost = $("#usagi-rabbitmq-host").val()
+    const rabbitmqPort = $("#usagi-rabbitmq-port").val()
+    const rabbitmqUsername = $("#usagi-rabbitmq-username").val()
+    const rabbitmqPassword = $("#usagi-rabbitmq-password").val()
+    const connectionParameters = `${protocol}${rabbitmqUsername}:${rabbitmqPassword}@${rabbitmqHost}:${rabbitmqPort}`;
     var queue = $("#usagi-request-queue").val();
     var callback = 'usagi-' + queue + '-callback-' + generateUniqueId();
 
     var amqp = require('amqplib/callback_api');
 
-    amqp.connect(rabbitmq_host, function(err, conn) {
+    amqp.connect(connectionParameters, function(err, conn) {
         if (err) {
             alert(err.message);
             return false;