Merge branch '7-dev' into window-object-i-hate-you

Author: Shiranuit

src/protocols/Http.ts

@@ -274,6 +274,14 @@ export default class HttpProtocol extends KuzzleAbstractProtocol {
         payload.headers.authorization = "Bearer " + value;
       } else if (key === "volatile") {
         payload.headers["x-kuzzle-volatile"] = JSON.stringify(value);
+      } else if (key === "index" || key === "collection") {
+        // If we're calling a non-native route that answer to a GET request
+        // we need to add the index and collection (if provided) to the query string
+        if (!staticHttpRoutes[request.controller] && method === "GET") {
+          queryArgs[key] = value;
+        } else {
+          payload[key] = value;
+        }
       } else if (Object.prototype.hasOwnProperty.call(payload, key)) {
         payload[key] = value;
       } else if (value !== undefined && value !== null) {

src/utils/debug.js

@@ -3,19 +3,33 @@ let NODE_DEBUG;
 /* eslint no-undef: 0 */
 
 function shouldDebug() {
-  if (typeof window === "undefined") {
-    // Avoid multiple calls to process.env
-    if (!NODE_DEBUG) {
-      NODE_DEBUG = (process.env.DEBUG || "").includes("kuzzle-sdk");
+  /**
+   * Some framework like react-native or other might emulate the window object
+   * but when on plateforms like iOS / Android, the window.location is undefined.
+   *
+   * So we need to check if window.location is defined before using it otherwise
+   * we will get an error.
+   *
+   * If something went wrong, be sure to return false to avoid any error.
+   */
+  try {
+    if (typeof window === "undefined") {
+      // Avoid multiple calls to process.env
+      if (!NODE_DEBUG) {
+        NODE_DEBUG = (process.env.DEBUG || "").includes("kuzzle-sdk");
+      }
+
+      return NODE_DEBUG;
     }
 
-    return NODE_DEBUG;
+    return (
+      window.debugKuzzleSdk ||
+      (window.location &&
+        new URL(window.location).searchParams.get("debugKuzzleSdk") !== null)
+    );
+  } catch (e) {
+    return false;
   }
-
-  return (
-    window.debugKuzzleSdk ||
-    new URL(window.location).searchParams.get("debugKuzzleSdk") !== null
-  );
 }
 
 /**

test/protocol/Http.test.js

@@ -639,6 +639,33 @@ describe("HTTP networking module", () => {
 
       protocol.send(data);
     });
+
+    it("should add index and collection to the query args if they are defined when using a custom GET route", (done) => {
+      const data = {
+        requestId: "requestId",
+        controller: "foo",
+        action: "bar",
+        index: "index",
+        collection: "collection",
+      };
+
+      protocol._routes = {
+        foo: { bar: { verb: "GET", url: "/foo/bar" } },
+      };
+
+      protocol.on("requestId", () => {
+        should(protocol._sendHttpRequest)
+          .be.calledOnce()
+          .and.be.calledWithMatch({
+            method: "GET",
+            path: "/foo/bar?index=index&collection=collection",
+          });
+
+        done();
+      });
+
+      protocol.send(data);
+    });
   });
 
   describe("#sendHttpRequest NodeJS", () => {