Reduced complexity of module.exports

fvdm · Mar 25, 2016 · f1a478b · f1a478b
1 parent 49072d3
commit f1a478b
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/geoip2ws.js b/geoip2ws.js
@@ -130,23 +130,23 @@ function doLookup (serviceName, ip, callback) {
  */
 
 module.exports = function moduleExports (userId, licenseKey, service, requestTimeout) {
+  var key;
+
   if (userId instanceof Object) {
-    service = userId.service || api.service;
-    requestTimeout = userId.requestTimeout || api.requestTimeout;
-    api.endpoint = userId.endpoint || api.endpoint;
-    licenseKey = userId.licenseKey || null;
-    userId = userId.userId || null;
-  }
+    for (key in userId) {
+      api [key] = userId [key];
+    }
 
-  api.userId = userId;
-  api.licenseKey = licenseKey;
+    return doLookup;
+  }
 
   if (typeof service === 'number') {
     api.requestTimeout = service;
-  } else {
-    api.service = service || api.service;
-    api.requestTimeout = requestTimeout || api.requestTimeout;
+    return doLookup;
   }
 
+  api.service = service || api.service;
+  api.requestTimeout = requestTimeout || api.requestTimeout;
+
   return doLookup;
 };