Skip to content

Commit 980e69b

Browse files
ar2rsawseenar2rsawseen
authored
2 parents 4f30075 + 6820df7 commit 980e69b

23 files changed

+132
-33
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Fixes:
3434

3535
Enterprise fixes:
3636
- [ab-testing] fix json-editor in ab-testing
37+
- [attribution] fix safari redirect issues for custom scheme
3738
- [cohorts] dealing with widgets for the cohort after cohort deletion
3839
- [crash_symbolication] add logs for symbolication server connection test
3940
- [drill] break down by date should break by dates and not seconds

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM phusion/baseimage:0.11
22

3-
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards
3+
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
44
# Enterprise Edition:
5-
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps
5+
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
66

77
ARG COUNTLY_CONFIG_API_MONGODB_HOST=localhost
88
ARG COUNTLY_CONFIG_FRONTEND_MONGODB_HOST=localhost

‎Dockerfile-api

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM node:fermium-bullseye-slim
22

3-
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards
3+
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
44
# Enterprise Edition:
5-
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps
5+
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
66

77
ARG GEOIP=empty
88
EXPOSE 3001

‎Dockerfile-centos-api

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM centos:8
22

3-
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards
3+
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
44
# Enterprise Edition:
5-
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps
5+
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
66

77
ARG GEOIP=empty
88
EXPOSE 3001

‎Dockerfile-centos-frontend

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM centos:8
22

3-
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards
3+
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
44
# Enterprise Edition:
5-
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps
5+
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
66

77
EXPOSE 6001
88
HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:6001/ping || exit 1

‎Dockerfile-core

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM phusion/baseimage:focal-1.2.0
22

3-
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards
3+
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
44
# Enterprise Edition:
5-
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps
5+
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
66

77
ARG COUNTLY_CONFIG_API_MONGODB_HOST=localhost
88
ARG COUNTLY_CONFIG_FRONTEND_MONGODB_HOST=localhost

‎Dockerfile-frontend

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM node:fermium-bullseye-slim
22

3-
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards
3+
ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
44
# Enterprise Edition:
5-
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps
5+
#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
66

77
EXPOSE 6001
88
HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:6001/ping || exit 1

‎bin/upgrade/23.06/scripts/push_drop_indexes.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ pluginManager.dbConnection('countly').then(async(db) => {
77
fields_appusers = fields(platforms, true);
88
console.log(`Dropping indexes for ${apps.length} apps`);
99
for (let app of apps) {
10-
await db.collection(`app_users${app._id}`).dropIndexes(fields_appusers);
10+
for (let field of fields_appusers) {
11+
try {
12+
await db.collection(`app_users${app._id}`).dropIndex(field);
13+
}
14+
catch (e) {
15+
// do nothing
16+
}
17+
}
1118
console.log('Dropped indexes for ', app._id);
1219
}
1320
console.log('Dropping indexes DONE');

‎bin/upgrade/23.06/scripts/upgrade_user_permission_data-manager.js

100644100755
+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ pluginManager.dbConnection().then(async (countlyDb) => {
2727
}
2828
let apps = group.permission[type];
2929
Object.keys(apps).forEach(function (appId) {
30-
if (apps[appId].allowed.data_manager) {
30+
if (!apps[appId].allowed) {
31+
apps[appId].allowed = {};
32+
update[`permission.${type}.${appId}.allowed`] = {};
33+
}
34+
else if (apps[appId].allowed.data_manager) {
3135
update[`permission.${type}.${appId}.allowed.data_manager: Transformations`] = true;
3236
if (type !== 'r') {//since c,u,d means the same thing for data_manager: Redaction
3337
for (let CrudType of ['c','u','d']) {

‎bin/upgrade/23.06/upgrade_db.sh

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ then
2323
if [ "$1" != "combined" ]; then
2424
#upgrade plugins
2525
countly plugin enable license;
26+
countly plugin enable sdk;
2627
nodejs "$DIR/scripts/install_plugins.js"
2728
fi
2829

‎bin/upgrade/23.06/upgrade_fs.sh

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ then
2222

2323
#enable command line
2424
bash "$DIR/scripts/detect.init.sh"
25+
26+
countly plugin enable sdk;
2527

2628
#upgrade plugins
2729
nodejs "$DIR/scripts/install_plugins.js"

‎docker-compose.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ services:
1818
image: 'countly/api:latest'
1919
# Enterprise Edition: image: 'gcr.io/countly-01/api:20.11.2'
2020
environment:
21-
- COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding,consolidate
22-
# Enterprise Edition: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards
21+
- COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
22+
# Enterprise Edition: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,sdk
2323
- COUNTLY_CONFIG__MONGODB_HOST=mongodb
2424
- NODE_OPTIONS="--max-old-space-size=2048"
2525
deploy:
@@ -37,8 +37,8 @@ services:
3737
image: 'countly/frontend:latest'
3838
# Enterprise Edition: image: 'gcr.io/countly-01/frontend:20.11.2'
3939
environment:
40-
- COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,video-intelligence-monetization,alerts,onboarding,consolidate
41-
# Enterprise Edition: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards
40+
- COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager
41+
# Enterprise Edition: - COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,sdk
4242
- COUNTLY_CONFIG__MONGODB_HOST=mongodb
4343
- NODE_OPTIONS="--max-old-space-size=2048"
4444
networks:

‎plugins/dashboards/api/parts/dashboards.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ dashboard.mapWidget = function(widget) {
126126
if (widget.interval === "adaily") {
127127
widget.period = "d" + (widget.selected_span || 7);
128128
}
129-
else if (widget.inerval === "aweekly") {
129+
else if (widget.interval === "aweekly") {
130130
widget.period = "w" + (widget.selected_span || 12);
131131
}
132-
else if (widget.inerval === "amonthly") {
132+
else if (widget.interval === "amonthly") {
133133
widget.period = "m" + (widget.selected_span || 6);
134134
}
135135
}

‎plugins/logger/api/api.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ plugins.setConfigs("logger", {
6363
const requestLoggerConfiguration = getRequestLoggerConfiguration(params);
6464
log.d("Logging config => ", requestLoggerConfiguration);
6565
log.d("Should Log request? => ", shouldLogRequest(requestLoggerConfiguration));
66-
if (params.logging_is_allowed && (shouldLogRequest(requestLoggerConfiguration) || params.app_user.request_logs)) {
66+
if (params.logging_is_allowed && (shouldLogRequest(requestLoggerConfiguration) || (params && params.app_user && params.app_user.request_logs))) {
6767
params.log_processed = true;
6868
var now = new Date().getTime();
6969
var ts = common.initTimeObj(null, params.qstring.timestamp || now).mstimestamp;
@@ -385,4 +385,4 @@ plugins.setConfigs("logger", {
385385
});
386386
}(exported));
387387

388-
module.exports = exported;
388+
module.exports = exported;

‎plugins/plugins.default.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
["mobile","web","desktop","plugins","density","locale","browser","sources","views","logger","systemlogs","errorlogs","populator","reports","crashes","push","star-rating","slipping-away-users","compare","server-stats","dbviewer","times-of-day","compliance-hub","alerts","onboarding","consolidate","remote-config","hooks","dashboards"]
1+
["mobile","web","desktop","plugins","density","locale","browser","sources","views","logger","systemlogs","errorlogs","populator","reports","crashes","push","star-rating","slipping-away-users","compare","server-stats","dbviewer","times-of-day","compliance-hub","alerts","onboarding","consolidate","remote-config","hooks","dashboards","sdk","data-manager"]

0 commit comments

Comments
 (0)