Merge branch 'master' into ar2rsawseen/master

ArtursKadikis · web-flow · commit 79f2e81fde31 · 2025-02-27T16:04:38.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ Fixes:
 - [languages] Calculated  total users percentage correctly
 - [countly-edge] Add import from Countly Edge Server
 
+Features:
+- [hooks] Support sending header information for HTTP actions
+
+Enterprise fixes:
+- [ab-testing] Mismatching user counts between ab-testing and user profiles
+
 ## Version 24.05.24
 Enterprise fixes:
 - [ldap] Fixed issues that would lead to configuration options not being picked up
diff --git a/plugins/hooks/api/api.js b/plugins/hooks/api/api.js
@@ -234,6 +234,7 @@ const CheckEffectProperties = function(effect) {
     if (effect) {
         if (effect.type === "HTTPEffect") {
             rules.url = { 'required': true, 'type': 'URL', 'regex': '^(?!.*(?:localhost|127\\.0\\.0\\.1|\\[::1\\])).*(?:https?|ftp):\\/\\/(?:[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)+|\\[(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}\\])(?::\\d{1,5})?(?:\\/\\S*)?$' };
+            rules.headers = { 'required': false, 'type': 'Object' };
         }
     }
     return rules;
diff --git a/plugins/hooks/api/parts/effects/http.js b/plugins/hooks/api/parts/effects/http.js
@@ -41,19 +41,23 @@ class HTTPEffect {
     async run(options) {
         const logs = [];
         const {effect, params, rule, effectStep, _originalInput} = options;
-        const {method, url, requestData} = effect.configuration;
+        const {method, url, requestData, headers} = effect.configuration;
         try {
             const parsedURL = utils.parseStringTemplate(url, params);
             const parsedRequestData = utils.parseStringTemplate(requestData, params, method);
             log.d("[hook http effect ]", parsedURL, parsedRequestData, method);
 
             // todo: assemble params for request;
             // const params = {}
-
+            const requestHeaders = headers || {};
             const methodOption = method && method.toLowerCase() || "get";
             switch (methodOption) {
             case 'get':
-                await request.get({uri: parsedURL + "?" + parsedRequestData, timeout: this._timeout}, function(e, r, body) {
+                await request.get({
+                    uri: parsedURL + "?" + parsedRequestData,
+                    timeout: this._timeout,
+                    headers: requestHeaders
+                }, function(e, r, body) {
                     log.d("[http get effect]", e, body);
                     if (e) {
                         logs.push(`Error: ${e.message}`);
@@ -91,6 +95,7 @@ class HTTPEffect {
                         uri: parsedURL,
                         json: parsedJSON,
                         timeout: this._timeout,
+                        headers: requestHeaders
                     },
                     function(e, r, body) {
                         log.d("[httpeffects]", e, body, rule);
diff --git a/plugins/hooks/frontend/public/javascripts/countly.views.js b/plugins/hooks/frontend/public/javascripts/countly.views.js
@@ -143,6 +143,7 @@
         data: function() {
             return {
                 methodOptions: [{label: 'GET', value: 'get'}, {label: 'POST', value: 'post'}],
+                headers: []
             };
         },
         props: {
@@ -152,10 +153,40 @@
         },
         mounted: function() {
             this.value.requestData = _.unescape(this.value.requestData);
+            // Initialize headers from saved configuration
+            if (this.value.headers) {
+                this.headers = Object.entries(this.value.headers).map(([key, value]) => ({key, value}));
+            }
         },
         methods: {
             textChange: function(event) {
                 this.value.requestData = _.unescape(event.currentTarget.value);
+            },
+            addHeader: function() {
+                this.headers.push({key: '', value: ''});
+                this.updateHeaders();
+            },
+            removeHeader: function(index) {
+                this.headers.splice(index, 1);
+                this.updateHeaders();
+            },
+            updateHeaders: function() {
+                // Convert headers array to object format and update value
+                const headerObj = {};
+                this.headers.forEach(h => {
+                    if (h.key && h.value) {
+                        headerObj[h.key] = h.value;
+                    }
+                });
+                this.value.headers = headerObj;
+            }
+        },
+        watch: {
+            headers: {
+                deep: true,
+                handler: function() {
+                    this.updateHeaders();
+                }
             }
         }
     });
diff --git a/plugins/hooks/frontend/public/localization/hooks.properties b/plugins/hooks/frontend/public/localization/hooks.properties
@@ -46,7 +46,7 @@ configs.help.hooks-timeWindowForRequestLimit=The time window for the request lim
 hooks.InternalEventTrigger = Internal Actions
 hooks.trigger-api-endpoint-uri= API Endpoint 
 hooks.trigger-introduction = Introduction
-hooks.trigger-api-endpoint-intro-content = <span>Send a GET request with query string parameter “payload” as a JSON string to the below URL:</span><br/><span class="url"> {0}</span>
+hooks.trigger-api-endpoint-intro-content = <span>Send a GET request with query string parameter "payload" as a JSON string to the below URL:</span><br/><span class="url"> {0}</span>
 hooks.APIEndPointTrigger = API Endpoint 
 hooks.internal-event-selector-title = Internal Actions
 hooks.internal-event-selector-placeholder = Please select an internal action
@@ -118,7 +118,7 @@ hooks.remove-action = Remove action
 hooks.send-email =  Email addresses to send the data to
 hooks.http-intro = Query string (for GET) or request body (for POST)
 hooks.trigger-via = Trigger Type 
-hooks.api-trigger-intro = Send a GET request with query string parameter “payload” as a JSON string
+hooks.api-trigger-intro = Send a GET request with query string parameter "payload" as a JSON string
 hooks.copy-url = Copy URL
 hooks.incoming-data = Data to trigger this hook 
 hooks.filter-rule = USE FILTERING RULE 
@@ -143,4 +143,11 @@ hooks.actions-tips = Select the actions the hook will do upon being triggered. Y
 hooks.application-tips = The app(s) for which you want to create a hook.
 hooks.trigger-count-tips = Number of times the hook has been triggered.
 hooks.trigger-action-tips = Identifies the trigger for the hook, and the actions that show the method through which data will be sent.
-hooks.trigger-save-failed = Hook could not be saved.
+hooks.trigger-save-failed = Hook could not be saved.
+
+# HTTP Headers related texts
+hooks.http-headers = HTTP Headers
+hooks.add-http-header = Add HTTP Header
+hooks.remove-http-header = Remove Header
+hooks.header-key = Header Key
+hooks.header-value = Header Value
diff --git a/plugins/hooks/frontend/public/stylesheets/vue-main.scss b/plugins/hooks/frontend/public/stylesheets/vue-main.scss
@@ -283,4 +283,22 @@
     cursor:pointer;
     font-size: 12px;
     font-weight: 500;
+}
+
+
+.hooks-http-headers {
+    &__validation {
+        display: contents;
+    }
+
+    &__remove-button {
+        color: #D23F00;
+        font-size: 16px;
+        font-weight: 500;
+        cursor: pointer;
+    }
+
+    &__remove-button:hover {
+        background-color: transparent;
+    }
 }
diff --git a/plugins/hooks/frontend/public/templates/vue-effects.html b/plugins/hooks/frontend/public/templates/vue-effects.html
@@ -95,5 +95,45 @@
         </validation-provider>
     </div>
     
+    <!-- HTTP Headers Section -->
+    <div class="cly-vue-drawer-step__section">
+        <div class="text-medium text-heading">
+            {{i18n('hooks.http-headers')}}
+        </div>
+        <div v-for="(header, index) in headers" :key="index" class="hooks-http-headers bu-mb-2">
+            <div class="bu-is-flex bu-is-align-items-center">
+                <validation-provider name="action-http-header-key" rules="required" class="hooks-http-headers__validation">
+                    <el-input 
+                        :placeholder="i18n('hooks.header-key')" 
+                        class="bu-mr-2" 
+                        style="width:40%;"
+                        v-model="header.key">
+                    </el-input>
+                </validation-provider>
+                <validation-provider name="action-http-header-value" rules="required" class="hooks-http-headers__validation">
+                    <el-input 
+                        :placeholder="i18n('hooks.header-value')" 
+                        class="bu-mr-2" 
+                        style="width:40%; flex:1"
+                        v-model="header.value">
+                    </el-input>
+                </validation-provider>
+                <el-button
+                    @click="removeHeader(index)"
+                    class="hooks-http-headers__remove-button color-red-100"
+                    type="text"
+                >
+                    <i class="cly-io cly-io-trash"></i>
+                </el-button>
+            </div>
+        </div>
+        <el-button 
+            @click="addHeader" 
+            class="hooks-http-headers__add-button bg-light-blue-100 color-blue-100 bu-mt-2"
+            type="text" 
+        >
+            + {{i18n('hooks.add-http-header')}}
+        </el-button>
+    </div>
 </div>
 </script>

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ const CheckEffectProperties = function(effect) {`
`234`	`234`	`if (effect) {`
`235`	`235`	`if (effect.type === "HTTPEffect") {`
`236`	`236`	`rules.url = { 'required': true, 'type': 'URL', 'regex': '^(?!.(?:localhost\|127\\.0\\.0\\.1\|\\[::1\\])).(?:https?\|ftp):\\/\\/(?:[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)+\|\\[(?:[a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}\\])(?::\\d{1,5})?(?:\\/\\S*)?$' };`
	`237`	`+ rules.headers = { 'required': false, 'type': 'Object' };`
`237`	`238`	`}`
`238`	`239`	`}`
`239`	`240`	`return rules;`