Fix issues with query parameters

Author: Damian Martinez Gelabert

dist/scripts/api-console.js

@@ -2397,18 +2397,16 @@
         }
       }
 
-      o.baseUrl = options.uri;
+      o.baseUrl = options.url;
 
       if (!RAML.Utils.isEmpty(queryParams)) {
-        var separator = (options.uri.match('\\?') ? '&' : '?');
+        var separator = (options.url.match('\\?') ? '&' : '?');
 
-        o.baseUrl = options.uri + separator;
-        o.uri = options.uri + separator + jQuery.param(queryParams, true);
+        o.baseUrl = options.url + separator;
         o.url = options.url + separator + jQuery.param(queryParams, true);
       }
 
       if (!RAML.Settings.disableProxy && RAML.Settings.proxy) {
-        o.uri = RAML.Settings.proxy + o.uri;
         o.url = RAML.Settings.proxy + o.url;
       }
 
@@ -5260,8 +5258,8 @@ angular.module('ramlConsoleApp').run(['$templateCache', function($templateCache)
     "              <div class=\"raml-console-sidebar-request-metadata\" ng-class=\"{'raml-console-is-active':showRequestMetadata}\">\n" +
     "\n" +
     "                <div class=\"raml-console-sidebar-row\">\n" +
-    "                  <div ng-if=\"requestOptions.uri\">\n" +
-    "                    <h3 class=\"raml-console-sidebar-response-head raml-console-sidebar-response-head-pre\">Request URI</h3>\n" +
+    "                  <div ng-if=\"requestOptions.url\">\n" +
+    "                    <h3 class=\"raml-console-sidebar-response-head raml-console-sidebar-response-head-pre\">Request URL</h3>\n" +
     "                    <div class=\"raml-console-sidebar-response-item\">\n" +
     "                      <p class=\"raml-console-sidebar-response-metadata raml-console-sidebar-request-url\">{{requestOptions.baseUrl}}<span ng-repeat=\"(key, value) in parameters\"><span ng-hide=\"$first\">&amp;</span><b>{{key}}</b>=<i>{{value[0]}}</i></span>\n" +
     "                      </p>\n" +

src/app/directives/sidebar.tpl.html

@@ -115,8 +115,8 @@ <h3 class="raml-console-sidebar-head raml-console-sidebar-head-expand">
               <div class="raml-console-sidebar-request-metadata" ng-class="{'raml-console-is-active':showRequestMetadata}">
 
                 <div class="raml-console-sidebar-row">
-                  <div ng-if="requestOptions.uri">
-                    <h3 class="raml-console-sidebar-response-head raml-console-sidebar-response-head-pre">Request URI</h3>
+                  <div ng-if="requestOptions.url">
+                    <h3 class="raml-console-sidebar-response-head raml-console-sidebar-response-head-pre">Request URL</h3>
                     <div class="raml-console-sidebar-response-item">
                       <p class="raml-console-sidebar-response-metadata raml-console-sidebar-request-url">{{requestOptions.baseUrl}}<span ng-repeat="(key, value) in parameters"><span ng-hide="$first">&amp;</span><b>{{key}}</b>=<i>{{value[0]}}</i></span>
                       </p>

src/common/client/request.js

@@ -86,18 +86,16 @@
         }
       }
 
-      o.baseUrl = options.uri;
+      o.baseUrl = options.url;
 
       if (!RAML.Utils.isEmpty(queryParams)) {
-        var separator = (options.uri.match('\\?') ? '&' : '?');
+        var separator = (options.url.match('\\?') ? '&' : '?');
 
-        o.baseUrl = options.uri + separator;
-        o.uri = options.uri + separator + jQuery.param(queryParams, true);
+        o.baseUrl = options.url + separator;
         o.url = options.url + separator + jQuery.param(queryParams, true);
       }
 
       if (!RAML.Settings.disableProxy && RAML.Settings.proxy) {
-        o.uri = RAML.Settings.proxy + o.uri;
         o.url = RAML.Settings.proxy + o.url;
       }