Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
114a0a9
Bump mocha from 11.6.0 to 11.7.1 in /api/utils/countly-request
dependabot[bot] Jun 25, 2025
1ea3c98
feat: add support for prerelease and build fields in app version parsing
kanwarujjaval Jun 27, 2025
7d80385
feat: include prerelease and build fields in version parsing
kanwarujjaval Jun 27, 2025
eba5fe0
feat: add app version release and build fields to api.js
kanwarujjaval Jun 27, 2025
8c3b539
Merge branch 'master' into feat/prerelease-spread
kanwarujjaval Jun 27, 2025
1d8bd2c
fix: include prerelease versions in semver parsing
kanwarujjaval Jun 27, 2025
b49de7c
Merge branch 'feat/prerelease-spread' of github.com:Countly/countly-s…
kanwarujjaval Jun 27, 2025
21402cb
[core] Rename release to prerelease
widatama Jul 1, 2025
b97b58c
[crashes] Rename release to prerelease
widatama Jul 1, 2025
db31d8e
[core] Update parse app version
widatama Jul 1, 2025
2f05be5
Bump @faker-js/faker from 9.8.0 to 9.9.0 in /ui-tests
dependabot[bot] Jul 2, 2025
bcb4d45
[core] Add tests for parse app version
widatama Jul 3, 2025
8be6e85
Merge branch 'master' into feat/prerelease-spread
kanwarujjaval Jul 3, 2025
2fa8465
[core] Set up default headers for common return methods
widatama Jul 4, 2025
123dca7
Update changelog
widatama Jul 4, 2025
357d353
tenantid fix
coskunaydinoglu Jul 4, 2025
11850c9
Comment out ssl ca config so it is not carried when building docker i…
widatama Jun 23, 2025
f4cab18
Disable certificate check for healthcheck
widatama Jul 1, 2025
f917709
Use script for healthcheck
widatama Jul 4, 2025
3ed7e4a
Use inline healthcheck
widatama Jul 4, 2025
5aa82f7
Merge branch 'master' into feat/prerelease-spread
widatama Jul 7, 2025
03726f2
Merge branch 'master' into res-header
widatama Jul 7, 2025
0b81b04
Merge pull request #6354 from Countly/feat/prerelease-spread
widatama Jul 7, 2025
2bb4a3a
Merge branch 'master' into ssl-support
widatama Jul 7, 2025
e14393f
Merge branch 'master' into res-header
pnrgenc Jul 7, 2025
ba6eceb
Merge pull request #6380 from Countly/res-header
pnrgenc Jul 7, 2025
403888c
Merge branch 'master' into ssl-support
widatama Jul 7, 2025
c4fe69a
Merge pull request #6385 from Countly/ssl-support
widatama Jul 7, 2025
3865dfc
Update CHANGELOG.md
pnrgenc Jul 7, 2025
705742f
Merge branch 'master' into SER-2456-active-directory-tenant-id-is-not…
coskunaydinoglu Jul 7, 2025
160f7ce
Merge pull request #6381 from Countly/SER-2456-active-directory-tenan…
coskunaydinoglu Jul 7, 2025
4fda1d7
Update CHANGELOG.md
pnrgenc Jul 7, 2025
1795e33
[star-rating] Make widget close button always visible on web platform
widatama Jul 7, 2025
e564ef6
Update changelog
widatama Jul 7, 2025
35f7131
Merge branch 'master' into changelog-entry-for-view-user-profiles-button
pnrgenc Jul 7, 2025
825dea8
Merge pull request #6387 from Countly/changelog-entry-for-view-user-p…
pnrgenc Jul 7, 2025
82b8384
Merge branch 'master' into changelog-entry-for-journey
pnrgenc Jul 7, 2025
01fd84a
Merge pull request #6388 from Countly/changelog-entry-for-journey
pnrgenc Jul 7, 2025
20c8c63
Update CHANGELOG.md
pnrgenc Jul 7, 2025
e69f162
Merge branch 'master' into survey-close
widatama Jul 8, 2025
fddc517
Merge pull request #6389 from Countly/survey-close
widatama Jul 8, 2025
c20a9f2
Merge branch 'master' into changelog-entry-4-drill-typo-master
widatama Jul 8, 2025
34e0583
Bump nodemailer from 7.0.3 to 7.0.5
dependabot[bot] Jul 8, 2025
ebad195
Bump supertest from 7.1.1 to 7.1.3
dependabot[bot] Jul 8, 2025
c192980
Merge pull request #6391 from Countly/changelog-entry-4-drill-typo-ma…
pnrgenc Jul 8, 2025
e81b80c
[star-rating] Fix widget close button if there is no custom parameter
widatama Jul 8, 2025
7d1ebd9
fix for handling azure ad callback
coskunaydinoglu Jul 8, 2025
2812cb5
Merge pull request #6396 from Countly/feedback-close
widatama Jul 8, 2025
8747373
Merge branch 'master' into SER-2459-active-directory-azure-ad-callbac…
coskunaydinoglu Jul 8, 2025
7ac3018
Merge pull request #6397 from Countly/SER-2459-active-directory-azure…
coskunaydinoglu Jul 8, 2025
2bdd4a7
Changelog Update for v25.03.9
pnrgenc Jul 8, 2025
5a135a1
Merge pull request #6399 from Countly/changelog-for-v25039
pnrgenc Jul 8, 2025
39d98dc
fix for okta body parser middleware version mismatch
coskunaydinoglu Jul 8, 2025
63c34e8
Merge pull request #6401 from Countly/SER-2460-okta-body-parser-versi…
coskunaydinoglu Jul 9, 2025
1a4cc1d
Changelog Update for v25.03.10
pnrgenc Jul 9, 2025
edb9196
Merge pull request #6405 from Countly/changelog-update-v250310
pnrgenc Jul 9, 2025
20fb9b9
[core] Fix user analytics widget chart
widatama Jul 14, 2025
64fd305
[core] Fix mongo connection url parsing
widatama Jul 15, 2025
11b02a3
[core] Fix mongo connection url parsing
widatama Jul 16, 2025
c75afa5
Update changelog
widatama Jul 16, 2025
174d61f
Update changelog
widatama Jul 16, 2025
60d22ee
Merge pull request #6411 from Countly/mongo-url-parse
widatama Jul 16, 2025
23415ee
Merge branch 'master' into an-widget
widatama Jul 16, 2025
760ed5c
Merge pull request #6410 from Countly/an-widget
widatama Jul 16, 2025
8445928
fix: Delete widgets when a dashboard is removed
pnrgenc Jul 16, 2025
640ab42
fix: adding missing Bluebird import to support Promise.each
pnrgenc Jul 16, 2025
50373d9
fix: Updated some filter conditions to use oid
pnrgenc Jul 17, 2025
67250c9
[crashes] Simplify free session calculation
widatama Jul 13, 2025
1680b0a
[crashes] Update free user calculation
widatama Jul 17, 2025
83bdb62
Update changelog
widatama Jul 17, 2025
5e0ab86
Merge pull request #6422 from Countly/cr-s
widatama Jul 17, 2025
57acb3c
[crashes] Add script for removing auto symbolication setting
widatama Jul 17, 2025
afdf094
Update changelog
widatama Jul 17, 2025
5679fa2
Merge pull request #6424 from Countly/auto-symbol-config
widatama Jul 17, 2025
e5d2787
Merge branch 'master' into update-changeOwner-script
John-Weak Jul 18, 2025
13b08aa
remove enterpriseinfo plugin
John-Weak Jul 18, 2025
699e045
Merge pull request #6418 from Countly/update-changeOwner-script
pnrgenc Jul 18, 2025
37eb371
Improve orphan widget and long_task cleanup logic
pnrgenc Jul 18, 2025
02351d7
Merge branch 'master' into johnWeak-master
widatama Jul 18, 2025
770b5be
removed references of enterpriseinfo
John-Weak Jul 18, 2025
53dfd35
Merge branch 'master' into fix-delete-widgets-when-dashboard-deleted
pnrgenc Jul 21, 2025
c947b78
Merge pull request #6416 from Countly/fix-delete-widgets-when-dashboa…
pnrgenc Jul 21, 2025
c44e1d3
Merge branch 'master' into johnWeak-master
John-Weak Jul 21, 2025
2e9cca6
Merge pull request #6426 from Countly/johnWeak-master
John-Weak Jul 21, 2025
6d9080a
Bump slackapi/slack-github-action in the actions group
dependabot[bot] Jul 21, 2025
d245cbb
[star-rating] Fix close post message
widatama Jul 21, 2025
9a894fb
Bump form-data from 4.0.0 to 4.0.4 in /plugins/hooks
dependabot[bot] Jul 21, 2025
83db4dd
Update changelog
widatama Jul 22, 2025
93c80b0
Bump form-data from 2.5.1 to 2.5.5 in /plugins/push
dependabot[bot] Jul 22, 2025
c96b750
Merge branch 'master' into dependabot/npm_and_yarn/api/utils/countly-…
ar2rsawseen Jul 22, 2025
fdae00c
Merge pull request #6347 from Countly/dependabot/npm_and_yarn/api/uti…
ar2rsawseen Jul 22, 2025
0d4ed4a
Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/faker-js/…
ar2rsawseen Jul 22, 2025
edc5d24
Update changelog
widatama Jul 22, 2025
6a59eb2
Merge pull request #6366 from Countly/dependabot/npm_and_yarn/ui-test…
ar2rsawseen Jul 22, 2025
a13ed5d
Merge branch 'master' into dependabot/npm_and_yarn/nodemailer-7.0.5
ar2rsawseen Jul 22, 2025
f4a403b
Bump chai from 5.2.0 to 5.2.1 in /ui-tests
dependabot[bot] Jul 22, 2025
e3e57da
Merge branch 'master' into journey-meta
John-Weak Jul 22, 2025
97e4bc2
Merge pull request #6393 from Countly/dependabot/npm_and_yarn/nodemai…
ar2rsawseen Jul 22, 2025
1da45a0
Merge branch 'master' into dependabot/npm_and_yarn/supertest-7.1.3
ar2rsawseen Jul 22, 2025
0a61251
Merge pull request #6395 from Countly/dependabot/npm_and_yarn/superte…
ar2rsawseen Jul 22, 2025
0575344
Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/chai-5.2.1
ar2rsawseen Jul 22, 2025
b4d727b
Bump sharp from 0.34.2 to 0.34.3
dependabot[bot] Jul 22, 2025
9530331
Merge branch 'master' into journey-meta
widatama Jul 22, 2025
4cfbcf8
Merge pull request #6402 from Countly/dependabot/npm_and_yarn/ui-test…
ar2rsawseen Jul 22, 2025
24bbdf5
Bump form-data from 4.0.1 to 4.0.4 in /ui-tests
dependabot[bot] Jul 22, 2025
eb82ac1
Merge branch 'master' into dependabot/npm_and_yarn/sharp-0.34.3
ar2rsawseen Jul 22, 2025
f6118b6
Merge pull request #6407 from Countly/dependabot/npm_and_yarn/sharp-0…
ar2rsawseen Jul 22, 2025
22d267a
Merge branch 'master' into dependabot/github_actions/actions-89b4e85e48
ar2rsawseen Jul 22, 2025
79d348e
Merge remote-tracking branch 'origin/master' into feedback-close
gabrieloliveirapinto Jul 22, 2025
ef70b26
Bump express-rate-limit from 7.5.0 to 8.0.1
dependabot[bot] Jul 22, 2025
247ae75
Merge branch 'master' into journey-meta
widatama Jul 22, 2025
a6083a1
Bump puppeteer from 24.10.1 to 24.14.0
dependabot[bot] Jul 22, 2025
db3d368
Merge pull request #6409 from Countly/dependabot/github_actions/actio…
ar2rsawseen Jul 22, 2025
42d5f67
Merge branch 'master' into dependabot/npm_and_yarn/puppeteer-24.14.0
ar2rsawseen Jul 22, 2025
854f777
Merge remote-tracking branch 'origin/master' into feedback-close
gabrieloliveirapinto Jul 22, 2025
3a4b159
Merge pull request #6419 from Countly/dependabot/npm_and_yarn/puppete…
ar2rsawseen Jul 22, 2025
ceab9fe
Merge branch 'master' into dependabot/npm_and_yarn/express-rate-limit…
ar2rsawseen Jul 22, 2025
63d8d60
Merge branch 'master' into journey-meta
ar2rsawseen Jul 22, 2025
06f1cb8
Merge pull request #6420 from Countly/dependabot/npm_and_yarn/express…
ar2rsawseen Jul 22, 2025
29928e9
Merge branch 'master' into journey-meta
ar2rsawseen Jul 22, 2025
867cef2
Bump eslint-plugin-vue from 10.2.0 to 10.3.0
dependabot[bot] Jul 22, 2025
9b522ba
Merge pull request #6435 from Countly/journey-meta
ar2rsawseen Jul 22, 2025
cffe4b3
Merge branch 'master' into dependabot/npm_and_yarn/plugins/hooks/form…
ar2rsawseen Jul 22, 2025
bff5450
Merge branch 'master' into feedback-close
widatama Jul 22, 2025
4e2af29
Merge pull request #6431 from Countly/dependabot/npm_and_yarn/plugins…
ar2rsawseen Jul 22, 2025
4767c0c
Merge branch 'master' into dependabot/npm_and_yarn/plugins/push/form-…
ar2rsawseen Jul 22, 2025
8f90721
Merge branch 'master' into feedback-close
widatama Jul 22, 2025
9473e1e
Merge pull request #6433 from Countly/dependabot/npm_and_yarn/plugins…
ar2rsawseen Jul 22, 2025
ddceeb2
Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/form-data…
ar2rsawseen Jul 22, 2025
aae7f51
Merge pull request #6434 from Countly/dependabot/npm_and_yarn/ui-test…
ar2rsawseen Jul 22, 2025
a7c165b
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-vue-…
ar2rsawseen Jul 22, 2025
7942764
Merge branch 'master' into feedback-close
widatama Jul 22, 2025
5b37493
Merge pull request #6377 from Countly/dependabot/npm_and_yarn/eslint-…
ar2rsawseen Jul 22, 2025
a4d55af
Merge branch 'master' into feedback-close
widatama Jul 22, 2025
ab4bf83
Bump on-headers and express-session
dependabot[bot] Jul 22, 2025
57682e4
Bump form-data from 4.0.3 to 4.0.4
dependabot[bot] Jul 22, 2025
4a99275
Merge pull request #6432 from Countly/feedback-close
gabrieloliveirapinto Jul 22, 2025
03e9677
Merge branch 'master' into dependabot/npm_and_yarn/multi-0acb442647
ar2rsawseen Jul 22, 2025
eaa0b82
Update CHANGELOG.md
Cookiezaurs Jul 22, 2025
3fa85ba
Merge pull request #6425 from Countly/dependabot/npm_and_yarn/multi-0…
ar2rsawseen Jul 22, 2025
d9f9735
Merge branch 'master' into dependabot/npm_and_yarn/form-data-4.0.4
ar2rsawseen Jul 22, 2025
ae45c9f
Merge pull request #6436 from Countly/dependabot/npm_and_yarn/form-da…
ar2rsawseen Jul 22, 2025
92a4788
Merge branch 'master' into Cookiezaurs-patch-8
ar2rsawseen Jul 22, 2025
902139e
Merge pull request #6439 from Countly/Cookiezaurs-patch-8
ar2rsawseen Jul 22, 2025
30ed559
Update CHANGELOG.md
ar2rsawseen Jul 22, 2025
65ae912
Merge branch 'master' into ar2rsawseen-patch-46
ar2rsawseen Jul 22, 2025
8b16004
Merge pull request #6440 from Countly/ar2rsawseen-patch-46
ar2rsawseen Jul 23, 2025
db30fc0
Update CHANGELOG.md
gabrieloliveirapinto Jul 23, 2025
2b1bc51
Update CHANGELOG.md
gabrieloliveirapinto Jul 23, 2025
34069bf
Merge pull request #6449 from Countly/gabrieloliveirapinto-25.03.11-r…
gabrieloliveirapinto Jul 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,6 @@ updates:
- dependencies
versioning-strategy: increase-if-necessary

- package-ecosystem: npm
directory: "/plugins/enterpriseinfo"
schedule:
interval: daily
open-pull-requests-limit: 10
labels:
- dependencies
versioning-strategy: increase-if-necessary

- package-ecosystem: npm
directory: "/plugins/errorlogs"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_notice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
run: echo "$GITHUB_CONTEXT"
- name: Send custom JSON data to Slack workflow
id: slack
uses: slackapi/[email protected].0
uses: slackapi/[email protected].1
with:
# This data can be any valid JSON from a previous step in the GitHub Action
payload: |
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
## Version 25.03.11
Fixes:
- [core] Fix mongo connection url parsing
- [core] Fix user analytics widget chart
- [crashes] Fix free session and free user calculation
- [dashboards] Delete associated widgets and reports when a dashboard is removed
- [star-rating] Fix widget close post message

Enterprise Fixes:
- [crash_symbolication] Remove auto symbolication setting
- [drill] Fix drill meta get filter
- [flows] Null checks on $size when calculating flows.
- [surveys] Fix widget close post message

Dependencies:
- Bump eslint-plugin-vue from 10.2.0 to 10.3.0
- Bump form-data from 4.0.0 to 4.0.4 in /plugins/hooks
- Bump nodemailer from 7.0.3 to 7.0.5
- Bump on-headers and express-session
- Bump puppeteer from 24.10.1 to 24.14.0
- Bump sharp from 0.34.2 to 0.34.3
- Bump supertest from 7.1.1 to 7.1.3

## Version 25.03.10
Enterprise Fixes:
- [okta] Fix body parser middleware version mismatch causing OKTA authentication break

## Version 25.03.9
Features:
- [core] Added support for prerelease and build fields in app version parsing

Fixes:
- [core] Set up default headers for common return methods
- [star-rating] Fix widget close button

Enterprise Fixes:
- [active_directory] Fix for reading azure application tenant id from config
- [active_directory] Fix for handling azure ad callback properly when request body empty
- [drill] Disabling the view user profiles button on drill for queries going to the report manager
- [drill] Fixed typo issue while getting segment values in drill widgets
- [journeys] Fixed the issue where events added in Journey couldn't have their visibility updated in Data Manager plugin
- [surveys] Fix widget close button

## Version 25.03.8
Fixes:
- [core] Fix adding llm observability to cly-event-select component
Expand Down
7 changes: 6 additions & 1 deletion Dockerfile-api
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,vi

ARG GEOIP=empty
EXPOSE 3001
HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:3001/o/ping || exit 1
HEALTHCHECK --start-period=400s CMD bash -c '\
if [ "$COUNTLY_CONFIG_API_API_SSL_ENABLED" = "true" ] || [ "$COUNTLY_CONFIG_API_API_SSL_ENABLED" = "\"true\"" ]; then \
curl -k --fail https://localhost:3001/o/ping || exit 1; \
else \
curl --fail http://localhost:3001/o/ping || exit 1; \
fi'

USER root

Expand Down
7 changes: 6 additions & 1 deletion Dockerfile-centos-api
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,vi

ARG GEOIP=empty
EXPOSE 3001
HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:3001/o/ping || exit 1
HEALTHCHECK --start-period=400s CMD bash -c '\
if [ "$COUNTLY_CONFIG_API_API_SSL_ENABLED" = "true" ] || [ "$COUNTLY_CONFIG_API_API_SSL_ENABLED" = "\"true\"" ]; then \
curl -k --fail https://localhost:3001/o/ping || exit 1; \
else \
curl --fail http://localhost:3001/o/ping || exit 1; \
fi'

USER root

Expand Down
7 changes: 6 additions & 1 deletion Dockerfile-centos-frontend
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,vi
#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,guides,journey_engine,content

EXPOSE 6001
HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:6001/ping || exit 1
HEALTHCHECK --start-period=400s CMD bash -c '\
if [ "$COUNTLY_CONFIG_FRONTEND_WEB_SSL_ENABLED" = "true" ] || [ "$COUNTLY_CONFIG_FRONTEND_WEB_SSL_ENABLED" = "\"true\"" ]; then \
curl -k --fail https://localhost:6001/ping || exit 1; \
else \
curl --fail http://localhost:6001/ping || exit 1; \
fi'

USER root

Expand Down
8 changes: 7 additions & 1 deletion Dockerfile-frontend
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,vi
#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,guides,journey_engine,content

EXPOSE 6001
HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:6001/ping || exit 1
HEALTHCHECK --start-period=400s CMD bash -c '\
if [ "$COUNTLY_CONFIG_FRONTEND_WEB_SSL_ENABLED" = "true" ] || [ "$COUNTLY_CONFIG_FRONTEND_WEB_SSL_ENABLED" = "\"true\"" ]; then \
curl -k --fail https://localhost:6001/ping || exit 1; \
else \
curl --fail http://localhost:6001/ping || exit 1; \
fi'

USER root

Expand All @@ -19,6 +24,7 @@ ENV COUNTLY_CONTAINER="frontend" \

WORKDIR /opt/countly
COPY . .

# install required dependencies which slim image doesn't have
RUN apt-get update && \
apt-get install -y iputils-ping net-tools telnet apt-transport-https procps curl wget git make gcc g++ unzip xz-utils
Expand Down
2 changes: 1 addition & 1 deletion api/config.sample.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ var countlyConfig = {
enabled: false,
key: "/path/to/ssl/private.key",
cert: "/path/to/ssl/certificate.crt",
ca: "/path/to/ssl/ca_bundle.crt" // Optional: for client certificate verification
// ca: "/path/to/ssl/ca_bundle.crt" // Optional: for client certificate verification, uncomment to activate
}
},
/**
Expand Down
10 changes: 10 additions & 0 deletions api/parts/data/usage.js
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,16 @@ plugins.register("/sdk/user_properties", async function(ob) {
userProps.av_major = versionComponents.major;
userProps.av_minor = versionComponents.minor;
userProps.av_patch = versionComponents.patch;
userProps.av_prerel = versionComponents.prerelease;
userProps.av_build = versionComponents.build;
}
else {
log.w("Invalid app version format: %s", params.qstring.metrics._app_version);
userProps.av_major = null;
userProps.av_minor = null;
userProps.av_patch = null;
userProps.av_rel = null;
userProps.av_build = null;
}
}
}
Expand Down
47 changes: 33 additions & 14 deletions api/utils/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ function escape_html_entities(key, value, more) {
common.getJSON = getJSON;

common.log = logger;
const log = logger('api:utils:common');

common.dbMap = {
'events': 'e',
Expand Down Expand Up @@ -1307,16 +1308,23 @@ common.returnRaw = function(params, returnCode, body, heads) {
}
return;
}
const defaultHeaders = {};
//set provided in configuration headers
var headers = {};
let headers = {};
if (heads) {
for (var i in heads) {
headers[i] = heads[i];
}
}
if (params && params.res && params.res.writeHead && !params.blockResponses) {
if (!params.res.finished) {
params.res.writeHead(returnCode, headers);
try {
params.res.writeHead(returnCode, headers);
}
catch (err) {
log.e(`Error writing header in 'returnRaw' ${err}`);
params.res.writeHead(returnCode, defaultHeaders);
}
if (body) {
params.res.write(body);
}
Expand Down Expand Up @@ -1347,9 +1355,10 @@ common.returnMessage = function(params, returnCode, message, heads, noResult = f
return;
}
//set provided in configuration headers
var headers = {
const defaultHeaders = {
'Content-Type': 'application/json; charset=utf-8'
};
let headers = { ...defaultHeaders };
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n/g, "\n").split("\n");
var parts;
for (let i = 0; i < add_headers.length; i++) {
Expand All @@ -1373,7 +1382,13 @@ common.returnMessage = function(params, returnCode, message, heads, noResult = f
}
if (params && params.res && params.res.writeHead && !params.blockResponses) {
if (!params.res.finished) {
params.res.writeHead(returnCode, headers);
try {
params.res.writeHead(returnCode, headers);
}
catch (err) {
log.e(`Error writing header in 'returnMessage' ${err}`);
params.res.writeHead(returnCode, defaultHeaders);
}
if (params.qstring.callback) {
params.res.write(params.qstring.callback + '(' + JSON.stringify({result: message}, escape_html_entities) + ')');
}
Expand Down Expand Up @@ -1415,9 +1430,10 @@ common.returnOutput = function(params, output, noescape, heads) {
return;
}
//set provided in configuration headers
var headers = {
const defaultHeaders = {
'Content-Type': 'application/json; charset=utf-8'
};
let headers = { ...defaultHeaders };
var add_headers = (plugins.getConfig("security").api_additional_headers || "").replace(/\r\n|\r|\n/g, "\n").split("\n");
var parts;
for (let i = 0; i < add_headers.length; i++) {
Expand All @@ -1442,7 +1458,13 @@ common.returnOutput = function(params, output, noescape, heads) {
}
if (params && params.res && params.res.writeHead && !params.blockResponses) {
if (!params.res.finished) {
params.res.writeHead(200, headers);
try {
params.res.writeHead(200, headers);
}
catch (err) {
log.e(`Error writing header in 'returnMessage' ${err}`);
params.res.writeHead(200, defaultHeaders);
}
if (params.qstring.callback) {
params.res.write(params.qstring.callback + '(' + JSON.stringify(output, escape) + ')');
}
Expand Down Expand Up @@ -2069,19 +2091,16 @@ common.parseAppVersion = function(version) {
version = String(version);
}

// Ensure version has at least one decimal point
if (version.indexOf('.') === -1) {
version += '.0';
}

const parsedVersion = semver.valid(semver.coerce(version));
if (parsedVersion) {
const versionObj = semver.parse(parsedVersion);
const isValid = semver.valid(semver.coerce(version, {includePrerelease: true}));
if (isValid) {
const versionObj = semver.parse(semver.coerce(version, {includePrerelease: true}));
if (versionObj) {
return {
major: versionObj.major,
minor: versionObj.minor,
patch: versionObj.patch,
prerelease: versionObj.prerelease,
build: versionObj.build,
original: version,
success: true
};
Expand Down
6 changes: 3 additions & 3 deletions api/utils/countly-request/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/docker/k8s/countly-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
timeoutSeconds: 30
env:
- name: COUNTLY_PLUGINS
value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
value: "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,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
# Countly Enterprise: value: "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,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
- name: COUNTLY_CONFIG_API_FILESTORAGE
value: "gridfs"
Expand Down
2 changes: 1 addition & 1 deletion bin/docker/k8s/countly-frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
timeoutSeconds: 30
env:
- name: COUNTLY_PLUGINS
value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
value: "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,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
# Countly Enterprise: value: "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,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
- name: COUNTLY_CONFIG_API_FILESTORAGE
value: "gridfs"
Expand Down
2 changes: 1 addition & 1 deletion bin/docker/k8s/ingestion/countly-ingestion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
timeoutSeconds: 30
env:
- name: COUNTLY_PLUGINS
value: "mobile,web,desktop,plugins,density,locale,browser,sources,views,enterpriseinfo,logger,systemlogs,errorlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
value: "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,assistant,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards"
# Countly Enterprise: value: "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,errorlogs,populator,reports,crashes,push,geo,block,restrict,users,star-rating,slipping-away-users,compare,server-stats,assistant,dbviewer,crash_symbolication,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps"
- name: COUNTLY_CONFIG_API_FILESTORAGE
value: "gridfs"
Expand Down
Loading
Loading