better integration and fix graphql proxy to REST plugin

MAIF · May 24, 2024 · 7cb5416 · 7cb5416
1 parent 21428f9
commit 7cb5416
Show file tree

Hide file tree

Showing 6 changed files with 291 additions and 222 deletions.
diff --git a/otoroshi/app/next/plugins/graphql.scala b/otoroshi/app/next/plugins/graphql.scala
@@ -100,7 +100,7 @@ object GraphQLQueryConfig {
       "query"           -> o.query,
       "timeout"         -> o.timeout,
       "response_path"   -> o.responsePath.map(JsString.apply).getOrElse(JsNull).asValue,
-      "response_filter" -> o.responsePath.map(JsString.apply).getOrElse(JsNull).asValue
+      "response_filter" -> o.responseFilter.map(JsString.apply).getOrElse(JsNull).asValue
     )
   }
 }
@@ -1164,7 +1164,10 @@ class GraphQLBackend extends NgBackendCall {
                   builder = customBuilder,
                   initialData = config.initialData.map(_.as[JsObject]).getOrElse(JsObject.empty),
                   maxDepth = config.maxDepth,
-                  variables = (jsonBody \ "variables").asOpt[JsValue].getOrElse(Json.obj()).as[JsObject]
+                  variables = (jsonBody \ "variables").asOpt[JsValue]
+                    .getOrElse(Json.obj())
+                    .asOpt[JsObject]
+                    .getOrElse(Json.obj())
                 )
               case None        => jsonResponse(400, Json.obj("error" -> "query field missing")).future
             }