diff options
| author | Tim-Hinnerk Heuer <tim@innocraft.com> | 2021-08-13 11:21:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 11:21:57 +0300 |
| commit | 397badec453c021473baaf5f6c84211536c7f71e (patch) | |
| tree | 9d62b08fc28ebb251ad09546ed487816fecaba5c /plugins/Live | |
| parent | 9d436c49ec32c9529bf3009bca46f0ed18a1c3d9 (diff) | |
add token_auth to overlay requests where necessary (#17851)
* add token_auth to overlay requests where necessary #17640
* ensure all links on overlay page work as expected both, with token_auth and when logged in #17640
* DRY force_api_session=1 and token_auth parameters in broadcast.js and correct in other code for convenience #17640
* polish logic for overlay with token_auth and change minimal logic in client side while validating token_auth in View::shouldPropagateTokenAuthInAjaxRequests() #17640
* use 'string' as string parameter #17640
* simplify token_auth check #17640
* revert git submodule to 4.x-dev version #17640
* return $tokenAuth string (truthy) only, simplify condition, ensure & is prepended to token_auth url param #17640
* revert submodule change
* Update core/View.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Live')
| -rw-r--r-- | plugins/Live/javascripts/SegmentedVisitorLog.js | 1 | ||||
| -rw-r--r-- | plugins/Live/javascripts/visitorProfile.js | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/Live/javascripts/SegmentedVisitorLog.js b/plugins/Live/javascripts/SegmentedVisitorLog.js index 48bbb289cf..65d0121edc 100644 --- a/plugins/Live/javascripts/SegmentedVisitorLog.js +++ b/plugins/Live/javascripts/SegmentedVisitorLog.js @@ -135,6 +135,7 @@ var SegmentedVisitorLog = function() { var ajaxRequest = new ajaxHelper(); ajaxRequest.addParams(requestParams, 'get'); + ajaxRequest.withTokenInUrl(); ajaxRequest.setCallback(callback); ajaxRequest.setFormat('html'); ajaxRequest.send(); diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js index 2fdf092dfb..6f743221d4 100644 --- a/plugins/Live/javascripts/visitorProfile.js +++ b/plugins/Live/javascripts/visitorProfile.js @@ -156,7 +156,10 @@ $element.on('mousedown', '.visitor-profile-export', function (e) { var url = $(this).attr('href'); if (url.indexOf('&token_auth=') == -1) { - $(this).attr('href', url + '&force_api_session=1&token_auth=' + piwik.token_auth); + if (!piwik.broadcast.isWidgetizeRequestWithoutSession()) { + url += '&force_api_session=1'; + } + $(this).attr('href', url + '&token_auth=' + piwik.token_auth); } }); |