PR comments

rilldata · Oct 25, 2024 · 333ad8a · 333ad8a
1 parent 7bf38fd
commit 333ad8a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/web-admin/src/routes/+layout.ts b/web-admin/src/routes/+layout.ts
@@ -20,37 +20,39 @@ import {
 } from "../features/public-urls/get-project-with-bearer-token.js";
 
 export const load = async ({ params, url }) => {
-  const { organization, project, token } = params;
-  let effectiveToken = token;
+  const { organization, project, token: routeToken } = params;
 
   if (!organization || !project) {
     return {
       projectPermissions: <V1ProjectPermissions>{},
     };
   }
 
+  let searchParamToken: string | undefined;
   if (url.searchParams.has("token")) {
-    effectiveToken = url.searchParams.get("token");
+    searchParamToken = url.searchParams.get("token");
   }
 
+  const token = searchParamToken ?? routeToken;
+
   let queryKey: QueryKey;
   let queryFn: QueryFunction<
     Awaited<ReturnType<typeof adminServiceGetProject>>
   >;
 
-  if (effectiveToken) {
+  if (token) {
     queryKey = getAdminServiceGetProjectWithBearerTokenQueryKey(
       organization,
       project,
-      effectiveToken,
+      token,
       {},
     );
 
     queryFn = ({ signal }) =>
       adminServiceGetProjectWithBearerToken(
         organization,
         project,
-        effectiveToken,
+        token,
         {},
         signal,
       );

diff --git a/web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/reports/[report]/export/+page.svelte
@@ -61,6 +61,7 @@
         </CtaMessage>
       </div>
     {/if}
+    <!-- User accessing with token wont have access to view report. So only show for other rows. -->
     {#if !token}
       <CtaButton
         variant="secondary"