Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Fix shared links export (#5172)

Karl-Aksel Puulmann0dbd27918143
diff --git a/assets/js/dashboard/api.ts b/assets/js/dashboard/api.ts
index 86256b12a9..3a22b36348 100644
--- a/assets/js/dashboard/api.ts
+++ b/assets/js/dashboard/api.ts
@@ -15,9 +15,7 @@ export class ApiError extends Error {
}
}
-export function serializeUrlParams(
- params: Record<string, string | boolean | number>
-) {
+function serializeUrlParams(params: Record<string, string | boolean | number>) {
const str: string[] = []
/* eslint-disable-next-line no-prototype-builtins */
for (const p in params)
@@ -39,7 +37,7 @@ export function cancelAll() {
export function queryToSearchParams(
query: DashboardQuery,
extraQuery: unknown[] = []
-) {
+): string {
const queryObj: Record<string, string> = {}
if (query.period) {
queryObj.period = query.period
@@ -71,9 +69,14 @@ export function queryToSearchParams(
queryObj.match_day_of_week = String(query.match_day_of_week)
}
+ const sharedLinkParams = getSharedLinkSearchParams()
+ if (sharedLinkParams.auth) {
+ queryObj.auth = sharedLinkParams.auth
+ }
+
Object.assign(queryObj, ...extraQuery)
- return queryObj
+ return serializeUrlParams(queryObj)
}
function getHeaders(): Record<string, string> {
@@ -98,13 +101,9 @@ export async function get(
query?: DashboardQuery,
...extraQueryParams: unknown[]
) {
- const sharedLinkParams = getSharedLinkSearchParams()
-
const queryString = query
- ? serializeUrlParams(
- queryToSearchParams(query, [...extraQueryParams, sharedLinkParams])
- )
- : serializeUrlParams(sharedLinkParams)
+ ? queryToSearchParams(query, [...extraQueryParams])
+ : serializeUrlParams(getSharedLinkSearchParams())
const response = await fetch(queryString ? `${url}?${queryString}` : url, {
signal: abortController.signal,
diff --git a/assets/js/dashboard/stats/graph/stats-export.js b/assets/js/dashboard/stats/graph/stats-export.js
index 8fd1442ff4..2094bf512d 100644
--- a/assets/js/dashboard/stats/graph/stats-export.js
+++ b/assets/js/dashboard/stats/graph/stats-export.js
@@ -34,7 +34,7 @@ export default function StatsExport() {
function renderExportLink() {
const interval = getCurrentInterval(site, query)
- const queryParams = api.serializeUrlParams(api.queryToSearchParams(query, [{ interval, comparison: undefined }]))
+ const queryParams = api.queryToSearchParams(query, [{ interval, comparison: undefined }])
const endpoint = `/${encodeURIComponent(site.domain)}/export?${queryParams}`
return (