fix(rest/server): passes adequate data object to resolvers depending …

…on method and params
rafamel · Nov 4, 2019 · 90576de · 90576de
1 parent 3f49070
commit 90576de
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/packages/rest/src/server/ServerRouter.ts b/packages/rest/src/server/ServerRouter.ts
@@ -81,19 +81,27 @@ export class ServerRouter {
     // Only passes query on get
     if (method === 'GET') {
       return id
-        ? (data: any, context: any) =>
-            resolve(
+        ? (data: any, context: any) => {
+            return resolve(
               data ? { ...data, ...query, id } : { ...query, id },
               context
-            )
-        : (data: any, context: any) =>
-            resolve(data ? { ...data, ...query, id } : { ...query }, context);
+            );
+          }
+        : (data: any, context: any) => {
+            return resolve(
+              data ? { ...data, ...query } : { ...query },
+              context
+            );
+          };
     }
 
     return id
-      ? (data: any, context: any) =>
-          resolve(data ? { ...data, id } : { id }, context)
-      : resolve;
+      ? (data: any, context: any) => {
+          return resolve(data ? { ...data, id } : { id }, context);
+        }
+      : (data: any, context: any) => {
+          return resolve(data ? { ...data } : {}, context);
+        };
   }
   private categorize(
     route: string,