Merge pull request #7 from adamkaplan/master

Support for non-standard ports and cleaner unsecure auth
mashery · Oct 18, 2011 · f2796a6 · f2796a6
2 parents 04d86bc + 5e9f9d4
commit f2796a6
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/app.js b/app.js
@@ -298,14 +298,19 @@ function processRequest(req, res, next) {
         }
     }
 
+    var baseHostInfo = apiConfig.baseURL.split(':');
+    var baseHostUrl = baseHostInfo[0],
+        baseHostPort = (baseHostInfo.length > 1) ? baseHostInfo[1] : "";
+
     var paramString = query.stringify(params),
-        privateReqURL = apiConfig.protocol + '://' + apiConfig.baseURL + apiConfig.privatePath + methodURL + '?' + paramString;
+        privateReqURL = apiConfig.protocol + '://' + apiConfig.baseURL + apiConfig.privatePath + methodURL + ((paramString.length > 0) ? '?' + paramString : ""),
         options = {
             headers: {},
             protocol: apiConfig.protocol,
-            host: apiConfig.baseURL,
+            host: baseHostUrl,
+            port: baseHostPort,
             method: httpMethod,
-            path: apiConfig.publicPath + methodURL + '?' + paramString
+            path: apiConfig.publicPath + methodURL + ((paramString.length > 0) ? '?' + paramString : "")
         };
 
     if (apiConfig.oauth) {
@@ -455,7 +460,7 @@ function processRequest(req, res, next) {
         console.log('Unsecured Call');
 
         // Add API Key to params, if any.
-        if (apiKey != '') {
+        if (apiKey != '' && apiKey != 'undefined' && apiKey != undefined) {
             options.path += '&' + apiConfig.keyParam + '=' + apiKey;
         }