From e76ab03fc8dbf9702d66ca15d8ab765091eb5c43 Mon Sep 17 00:00:00 2001
From: Pranav C <61551451+pranavxc@users.noreply.github.com>
Date: Fri, 25 Jun 2021 19:03:02 +0530
Subject: [PATCH] fix: data in http client webhook, condition correction

* Made data available in http client fields(params, body, headers)
* Fixed condition issue

closes #296, closes #237

Signed-off-by: Pranav C <61551451+pranavxc@users.noreply.github.com>
---
 .../nocodb/src/lib/noco/common/BaseModel.ts   | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/nocodb/src/lib/noco/common/BaseModel.ts b/packages/nocodb/src/lib/noco/common/BaseModel.ts
index 2f3b135188..ca5a9e7376 100644
--- a/packages/nocodb/src/lib/noco/common/BaseModel.ts
+++ b/packages/nocodb/src/lib/noco/common/BaseModel.ts
@@ -102,7 +102,7 @@ class BaseModel<T extends BaseApiBuilder<any>> extends BaseModelSql {
               })
               break;
             case 'URL':
-              this.handleHttpWebHook(hook.notification?.payload)
+              this.handleHttpWebHook(hook.notification?.payload, req, data)
               break;
             default:
               if (this.webhookNotificationAdapters && hook.notification?.type && hook.notification?.type in this.webhookNotificationAdapters) {
@@ -121,26 +121,30 @@ class BaseModel<T extends BaseApiBuilder<any>> extends BaseModelSql {
     }
   }
 
-  private async handleHttpWebHook(apiMeta) {
+  private async handleHttpWebHook(apiMeta, apiReq, data) {
     try {
-      const req = this.axiosRequestMake(apiMeta);
+      const req = this.axiosRequestMake(apiMeta, apiReq, data);
       await require('axios')(req);
     } catch (e) {
       console.log(e)
     }
   }
 
-  private axiosRequestMake(apiMeta) {
+  private axiosRequestMake(apiMeta, apiReq, data) {
     if (apiMeta.body) {
       try {
-        apiMeta.body = JSON.parse(apiMeta.body);
+        apiMeta.body = JSON.parse(apiMeta.body, (_key, value) => {
+          return typeof value === 'string' ? this.parseBody(value, apiReq, data, apiMeta) : value;
+        });
       } catch (e) {
         console.log(e);
       }
     }
     if (apiMeta.auth) {
       try {
-        apiMeta.auth = JSON.parse(apiMeta.auth);
+        apiMeta.auth = JSON.parse(apiMeta.auth, (_key, value) => {
+          return typeof value === 'string' ? this.parseBody(value, apiReq, data, apiMeta) : value;
+        });
       } catch (e) {
         console.log(e);
       }
@@ -149,7 +153,7 @@ class BaseModel<T extends BaseApiBuilder<any>> extends BaseModelSql {
     const req = {
       params: apiMeta.parameters ? apiMeta.parameters.reduce((paramsObj, param) => {
         if (param.name && param.enabled) {
-          paramsObj[param.name] = param.value;
+          paramsObj[param.name] = this.parseBody(param.value, apiReq, data, apiMeta);
         }
         return paramsObj;
       }, {}) : {},
@@ -158,7 +162,7 @@ class BaseModel<T extends BaseApiBuilder<any>> extends BaseModelSql {
       data: apiMeta.body,
       headers: apiMeta.headers ? apiMeta.headers.reduce((headersObj, header) => {
         if (header.name && header.enabled) {
-          headersObj[header.name] = header.value;
+          headersObj[header.name] = this.parseBody(header.value, apiReq, data, apiMeta);
         }
         return headersObj;
       }, {}) : {},
@@ -186,31 +190,32 @@ class BaseModel<T extends BaseApiBuilder<any>> extends BaseModelSql {
 
     const isValid = condition.reduce((valid, con) => {
       let res;
+      const field = this.columnToAlias[con.field] ?? con.field;
       switch (con.op as string) {
         case 'is equal':
-          res = data[con.field] === con.value;
+          res = data[field] === con.value;
           break;
         case 'is not equal':
-          res = data[con.field] !== con.value;
+          res = data[field] !== con.value;
           break;
         case 'is like':
-          res = data[con.field]?.toLowerCase()?.indexOf(con.value?.toLowerCase()) > -1;
+          res = data[field]?.toLowerCase()?.indexOf(con.value?.toLowerCase()) > -1;
           break;
         case 'is not like':
-          res = data[con.field]?.toLowerCase()?.indexOf(con.value?.toLowerCase()) === -1;
+          res = data[field]?.toLowerCase()?.indexOf(con.value?.toLowerCase()) === -1;
           break;
         case 'is empty':
-          res = data[con.field] === '' || data[con.field] === null || data[con.field] === undefined;
+          res = data[field] === '' || data[field] === null || data[field] === undefined;
           break;
         case 'is not empty':
-          res = !(data[con.field] === '' || data[con.field] === null || data[con.field] === undefined);
+          res = !(data[field] === '' || data[field] === null || data[field] === undefined);
           break;
         case 'is null':
           res =
-            res = data[con.field] === null;
+            res = data[field] === null;
           break;
         case 'is not null':
-          res = data[con.field] !== null;
+          res = data[field] !== null;
           break;