A full-featured CRM built with React, shadcn/ui, and Supabase.
Log out on expired session in global search
fzaninottoc3471629cd6e
diff --git a/src/components/atomic-crm/providers/supabase/dataProvider.test.ts b/src/components/atomic-crm/providers/supabase/dataProvider.test.tsnew file mode 100644index 00000000..044ca9ce--- /dev/null+++ b/src/components/atomic-crm/providers/supabase/dataProvider.test.ts@@ -0,0 +1,26 @@+import { describe, expect, it, vi } from "vitest";++import { getDataProvider } from "./dataProvider";++const rpc = vi.fn();++vi.mock("./supabase", () => ({+ getSupabaseClient: () => ({ rpc }),+}));++vi.stubEnv("VITE_SUPABASE_URL", "http://localhost:54321");+vi.stubEnv("VITE_SB_PUBLISHABLE_KEY", "test-key");++describe("globalSearch", () => {+ it("rejects with the HTTP status so an expired session logs out", async () => {+ rpc.mockResolvedValue({+ data: null,+ error: { code: "PGRST303", message: "JWT expired" },+ status: 401,+ });++ await expect(+ getDataProvider().globalSearch("acme", ["companies"], 10),+ ).rejects.toMatchObject({ status: 401 });+ });+});diff --git a/src/components/atomic-crm/providers/supabase/dataProvider.ts b/src/components/atomic-crm/providers/supabase/dataProvider.tsindex cf0fc2e4..bf54e71a 100644--- a/src/components/atomic-crm/providers/supabase/dataProvider.ts+++ b/src/components/atomic-crm/providers/supabase/dataProvider.ts@@ -1,5 +1,6 @@import { supabaseDataProvider } from "ra-supabase-core";import {+ HttpError,withLifecycleCallbacks,type DataProvider,type GetListParams,@@ -240,14 +241,14 @@ const getDataProviderWithCustomMethods = () => {resources: readonly SearchResourceName[],maxResults: number,): Promise<SearchResult[]> {- const { data, error } = await getSupabaseClient().rpc("global_search", {- query,- resources,- max_results: maxResults,- });+ const { data, error, status } = await getSupabaseClient().rpc(+ "global_search",+ { query, resources, max_results: maxResults },+ );if (error) {console.error("global_search.error", error);- throw new Error("Failed to search");+ // the status lets authProvider.checkError log out an expired session+ throw new HttpError("Failed to search", status, error);}return data ?? [];},diff --git a/src/components/atomic-crm/search/GlobalSearchButton.tsx b/src/components/atomic-crm/search/GlobalSearchButton.tsxindex 977c8a31..1521e078 100644--- a/src/components/atomic-crm/search/GlobalSearchButton.tsx+++ b/src/components/atomic-crm/search/GlobalSearchButton.tsx@@ -175,7 +175,8 @@ const useGlobalSearch = (});return {- results: isEnabled ? (data ?? []) : [],+ // on an expired session, ra-core logs out and resolves with { data: {} }+ results: isEnabled && Array.isArray(data) ? data : [],isPending: isEnabled && isPending,error,};