From cd908ae1b2d17bc73ae323f20f32828af46748bd Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Tue, 20 Jul 2021 18:53:24 -0400
Subject: [PATCH] feat: parse and run REST request params

* package-lock.json:
---
 helpers/network.ts            |  5 +++++
 helpers/utils/EffectiveURL.ts | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/helpers/network.ts b/helpers/network.ts
index 7952e3ecf..4d15f6a88 100644
--- a/helpers/network.ts
+++ b/helpers/network.ts
@@ -60,12 +60,17 @@ export function createRESTNetworkRequestStream(
     return Object.assign(acc, { [key]: value })
   }, {})
 
+  const params = req.effectiveFinalParams.reduce((acc, { key, value }) => {
+    return Object.assign(acc, { [key]: value })
+  }, {})
+
   const timeStart = Date.now()
 
   runAppropriateStrategy({
     method: req.method as any,
     url: req.effectiveFinalURL,
     headers,
+    params,
   })
     .then((res: any) => {
       const timeEnd = Date.now()
diff --git a/helpers/utils/EffectiveURL.ts b/helpers/utils/EffectiveURL.ts
index f7eb29ed6..f7afa2910 100644
--- a/helpers/utils/EffectiveURL.ts
+++ b/helpers/utils/EffectiveURL.ts
@@ -11,6 +11,7 @@ export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
    */
   effectiveFinalURL: string
   effectiveFinalHeaders: { key: string; value: string }[]
+  effectiveFinalParams: { key: string; value: string }[]
 }
 
 /**
@@ -24,7 +25,7 @@ export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
 export function getEffectiveRESTRequest(
   request: HoppRESTRequest,
   _environment: Environment
-) {
+): EffectiveHoppRESTRequest {
   // TODO: Change this
   return {
     ...request,
@@ -34,6 +35,11 @@ export function getEffectiveRESTRequest(
         x.key !== "" && // Remove empty keys
         x.active // Only active
     ),
+    effectiveFinalParams: request.params.filter(
+      (x) =>
+        x.key !== "" && // Remove empty keys
+        x.active // Only active
+    ),
   }
 }
 
@@ -51,8 +57,6 @@ export function getEffectiveRESTRequestStream(
   environment$: Observable<Environment>
 ): Observable<EffectiveHoppRESTRequest> {
   return combineLatest([request$, environment$]).pipe(
-    map(([request, env]) => {
-      return getEffectiveRESTRequest(request, env)
-    })
+    map(([request, env]) => getEffectiveRESTRequest(request, env))
   )
 }