Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Hinnerk Heuer <tim@innocraft.com>2021-08-13 11:21:57 +0300
committerGitHub <noreply@github.com>2021-08-13 11:21:57 +0300
commit397badec453c021473baaf5f6c84211536c7f71e (patch)
tree9d62b08fc28ebb251ad09546ed487816fecaba5c /plugins/Annotations
parent9d436c49ec32c9529bf3009bca46f0ed18a1c3d9 (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/Annotations')
-rw-r--r--plugins/Annotations/javascripts/annotations.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index f833045740..2a19f81ed5 100644
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -112,6 +112,7 @@
var ajaxRequest = new ajaxHelper();
ajaxRequest.addParams(ajaxParams, 'get');
+ ajaxRequest.withTokenInUrl();
ajaxRequest.setFormat('html');
ajaxRequest.setCallback(callback);
ajaxRequest.send();