Skip to content

Commit ffd219d

Browse files
committed
Merge branch 'QT-356' of github.com:Countly/countly-server into QT-356
2 parents 575b5fa + 16cf1a2 commit ffd219d

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## Version 25.03.XX
2+
Fixes:
3+
- [core] Do not output password in logs on mongodb connection initialisation error
4+
- [core] Hide error details on render error from response
5+
- [dashboards] Do not show error if request is cancelled.
6+
- [dbviewer] Hide api_key from requests
7+
- [events] Do not throw error in UI on returned group data if there is no segmentation set
8+
19
## Version 25.03.28
210
Fixes:
311
- [alerts] Add alert interval validation in the frontend

api/utils/requestProcessor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ const processRequest = (params) => {
392392
options.token = token;
393393
render.renderView(options, function(err3) {
394394
if (err3) {
395-
common.returnMessage(params, 400, 'Error creating screenshot: ' + err3);
395+
common.returnMessage(params, 400, 'Error creating screenshot. Please check logs for more information.');
396396
return false;
397397
}
398398
common.returnOutput(params, {path: common.config.path + "/images/screenshots/" + imageName});

frontend/express/public/core/events/javascripts/countly.details.models.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
},
382382
getSegments: function(context, res) {
383383
var segments = [];
384-
if (res.meta && res.meta.segments.length > 0) {
384+
if (res.meta && res.meta.segments && Array.isArray(res.meta.segments) && res.meta.segments.length > 0) {
385385
segments = res.meta.segments.slice();
386386
context.commit('setHasSegments', true);
387387
}

plugins/dbviewer/frontend/public/javascripts/countly.views.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@
250250
sort = JSON.stringify(this.preparedSortObject);
251251
}
252252
var apiQueryData = {
253-
api_key: countlyGlobal.member.api_key,
254253
app_id: countlyCommon.ACTIVE_APP_ID,
255254
//filename: "DBViewer" + moment().format("DD-MMM-YYYY"), - using passed filename from form
256255
projection: JSON.stringify(this.preparedProjectionFields),
@@ -303,7 +302,7 @@
303302
},
304303
computed: {
305304
dbviewerAPIEndpoint: function() {
306-
var url = '/db?api_key=' + countlyGlobal.member.api_key + '&app_id=' + countlyCommon.ACTIVE_APP_ID + '&dbs=' + this.localDb + '&collection=' + this.localCollection;
305+
var url = '/db?app_id=' + countlyCommon.ACTIVE_APP_ID + '&dbs=' + this.localDb + '&collection=' + this.localCollection;
307306
if (this.queryFilter) {
308307
url += '&filter=' + encodeURIComponent(this.queryFilter);
309308
}

0 commit comments

Comments
 (0)