From 51715158c258a77117173a6c83b87fbd6fc9b5be Mon Sep 17 00:00:00 2001 From: dswbx Date: Tue, 21 Jan 2025 17:10:45 +0100 Subject: [PATCH] fix auth screens' missing config permission, and media URL resolution --- app/package.json | 2 +- app/src/ui/client/BkndProvider.tsx | 6 +++--- app/src/ui/elements/media/Dropzone.tsx | 13 +++++++------ app/src/ui/elements/media/DropzoneContainer.tsx | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/package.json b/app/package.json index e157b58..ebd8f9b 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "type": "module", "sideEffects": false, "bin": "./dist/cli/index.js", - "version": "0.6.0", + "version": "0.6.1", "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, Remix, Astro, Cloudflare, Bun, Node, AWS Lambda & more.", "homepage": "https://bknd.io", "repository": { diff --git a/app/src/ui/client/BkndProvider.tsx b/app/src/ui/client/BkndProvider.tsx index 1dc51e6..1209c0e 100644 --- a/app/src/ui/client/BkndProvider.tsx +++ b/app/src/ui/client/BkndProvider.tsx @@ -57,7 +57,7 @@ export function BkndProvider({ errorShown.current = true; setError(true); - return; + //return; } else if (error) { setError(false); } @@ -106,7 +106,7 @@ export function BkndProvider({ value={{ ...schema, actions, requireSecrets, app, adminOverride, hasSecrets }} key={local_version} > - {error && ( + {/*{error && ( You attempted to load system configuration with secrets without having proper @@ -115,7 +115,7 @@ export function BkndProvider({ - )} + )}*/} {children} diff --git a/app/src/ui/elements/media/Dropzone.tsx b/app/src/ui/elements/media/Dropzone.tsx index 4f6fe20..0846705 100644 --- a/app/src/ui/elements/media/Dropzone.tsx +++ b/app/src/ui/elements/media/Dropzone.tsx @@ -219,19 +219,20 @@ export function Dropzone({ return; } - const { url, headers, method = "POST" } = getUploadInfo(file.body); + const uploadInfo = getUploadInfo(file.body); + console.log("dropzone:uploadInfo", uploadInfo); + const { url, headers, method = "POST" } = uploadInfo; const formData = new FormData(); formData.append("file", file.body); const xhr = new XMLHttpRequest(); - const urlWithParams = new URL(url); + console.log("xhr:url", url); + const searchParams = new URLSearchParams(); if (overwrite) { - urlWithParams.searchParams.append("overwrite", "1"); + searchParams.append("overwrite", "1"); } - console.log("url", urlWithParams.toString()); - //return; - xhr.open(method, urlWithParams.toString(), true); + xhr.open(method, String(url) + "?" + String(searchParams), true); if (headers) { headers.forEach((value, key) => { diff --git a/app/src/ui/elements/media/DropzoneContainer.tsx b/app/src/ui/elements/media/DropzoneContainer.tsx index b9b3a12..adca51d 100644 --- a/app/src/ui/elements/media/DropzoneContainer.tsx +++ b/app/src/ui/elements/media/DropzoneContainer.tsx @@ -29,10 +29,11 @@ export function DropzoneContainer({ ...props }: DropzoneContainerProps) { const id = useId(); - const baseUrl = useBaseUrl(); const api = useApi(); + const baseUrl = api.baseUrl; const invalidate = useInvalidate(); const limit = query?.limit ? query?.limit : props.maxItems ? props.maxItems : 50; + console.log("dropzone:baseUrl", baseUrl); const $q = useEntityQuery( entity_name as "media",