From 7b25aecebc1859749b1ce458ba9c295d5c2ed985 Mon Sep 17 00:00:00 2001
From: Jay Quan <a331998513@gmail.com>
Date: Fri, 24 Nov 2023 13:24:00 +0100
Subject: [PATCH] removed headers filter from loopbackApi

---
 src/app/shared/sdk/lb.config.ts               | 20 ++-------------
 .../shared/sdk/services/core/base.service.ts  | 25 +++++--------------
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/app/shared/sdk/lb.config.ts b/src/app/shared/sdk/lb.config.ts
index 9f8cf2b64..10d61ee57 100644
--- a/src/app/shared/sdk/lb.config.ts
+++ b/src/app/shared/sdk/lb.config.ts
@@ -24,8 +24,8 @@ export class LoopBackConfig {
   private static version: string | number = "api/v3";
   private static authPrefix: string = "";
   private static debug: boolean = true;
-  private static filterOn: string = "headers";
-  private static whereOn: string = "headers";
+  private static filterOn: string = "url";
+  private static whereOn: string = "url";
   private static secure: boolean = false;
   private static withCredentials: boolean = false;
 
@@ -65,26 +65,10 @@ export class LoopBackConfig {
     LoopBackConfig.filterOn = "url";
   }
 
-  public static filterOnHeaders(): void {
-    LoopBackConfig.filterOn = "headers";
-  }
-
   public static whereOnUrl(): void {
     LoopBackConfig.whereOn = "url";
   }
 
-  public static whereOnHeaders(): void {
-    LoopBackConfig.whereOn = "headers";
-  }
-
-  public static isHeadersFilteringSet(): boolean {
-    return LoopBackConfig.filterOn === "headers";
-  }
-
-  public static isHeadersWhereSet(): boolean {
-    return LoopBackConfig.whereOn === "headers";
-  }
-
   public static setSecureWebSockets(): void {
     LoopBackConfig.secure = true;
   }
diff --git a/src/app/shared/sdk/services/core/base.service.ts b/src/app/shared/sdk/services/core/base.service.ts
index 5011a6ccc..b4a02583c 100644
--- a/src/app/shared/sdk/services/core/base.service.ts
+++ b/src/app/shared/sdk/services/core/base.service.ts
@@ -124,30 +124,17 @@ export abstract class BaseLoopBackApi {
 
       // Separate filter object from url params and add to search query
       if (urlParams.filter) {
-        if (LoopBackConfig.isHeadersFilteringSet()) {
-          headers = headers.append("filter", JSON.stringify(urlParams.filter));
-        } else {
-          queryString = `?filter=${encodeURIComponent(
-            JSON.stringify(urlParams.filter),
-          )}`;
-        }
+        queryString = `?filter=${encodeURIComponent(
+          JSON.stringify(urlParams.filter),
+        )}`;
         delete urlParams.filter;
       }
 
       // Separate where object from url params and add to search query
       if (urlParams.where) {
-        if (LoopBackConfig.isHeadersWhereSet()) {
-          /**
-          CODE BELOW WILL GENERATE THE FOLLOWING ISSUES:
-          - https://github.com/mean-expert-official/loopback-sdk-builder/issues/356
-          - https://github.com/mean-expert-official/loopback-sdk-builder/issues/328 
-          **/
-          headers = headers.append("where", JSON.stringify(urlParams.where));
-        } else {
-          queryString = `?where=${encodeURIComponent(
-            JSON.stringify(urlParams.where),
-          )}`;
-        }
+        queryString = `?where=${encodeURIComponent(
+          JSON.stringify(urlParams.where),
+        )}`;
         delete urlParams.where;
       }