Pass sitekey and settings as a parameter

Author: anttiai

src/apifetch.js

@@ -6,7 +6,7 @@ require('isomorphic-fetch');
 /**
  * Fetch search results of search suggestions from the Addsearch API
  */
-var executeApiFetch = function(type, keyword, cb) {
+var executeApiFetch = function(sitekey, type, keyword, settings, cb) {
 
   const RESPONSE_BAD_REQUEST = 400;
   const RESPONSE_SERVER_ERROR = 500;
@@ -26,8 +26,17 @@ var executeApiFetch = function(type, keyword, cb) {
   // Escape
   kw = encodeURIComponent(kw);
 
+  // Construct query string from settings
+  var qs = '';
+  if (type === 'search') {
+    if (settings.lang) {
+      qs = qs + '&lang=' + settings.lang;
+    }
+  }
+
+
   // Execute API call
-  fetch('https://api.addsearch.com/v1/' + type + '/' + (this ? this.sitekey : null) + '?term=' + kw)
+  fetch('https://api.addsearch.com/v1/' + type + '/' + sitekey + '?term=' + kw + qs)
     .then(function(response) {
       return response.json();
     }).then(function(json) {

test/apifetch.js

@@ -10,7 +10,7 @@ describe('apifetch', function() {
       fetchMock.get('*', { response: 200 });
       const expect = {response: 200};
 
-      apifetch('search', 'keyword', (res) => {
+      apifetch('sitekey', 'search', 'keyword', {}, (res) => {
         assert.deepEqual(res, expect);
       });
     });
@@ -20,7 +20,7 @@ describe('apifetch', function() {
       fetchMock.get('*', 'foo');
       const expect = 400;
 
-      apifetch('ping', 'keyword', (res) => {
+      apifetch('sitekey', 'ping', 'keyword', {}, (res) => {
         assert.equal(res.error.response, expect);
       });
     });