@malloy-publisher/sdk 0.0.59 → 0.0.60

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/sdk",
    "description": "Malloy Publisher SDK",
-   "version": "0.0.59",
+   "version": "0.0.60",
    "type": "module",
    "main": "dist/index.cjs.js",
    "module": "dist/index.es.js",

package/src/components/MutableNotebook/MutableNotebook.tsx

@@ -29,6 +29,7 @@ import { useNotebookStorage } from "./NotebookStorageProvider";
 
 import * as Malloy from "@malloydata/malloy-interfaces";
 import { ModelPicker } from "./ModelPicker";
+import { getAxiosConfig } from "../../hooks";
 
 const modelsApi = new ModelsApi(new Configuration());
 
@@ -52,7 +53,7 @@ export default function MutableNotebook({
 }: MutableNotebookProps) {
    const navigate = useRouterClickHandler();
    const { projectName, packageName, versionId } = usePackage();
-   const { server, accessToken } = useServer();
+   const { server, getAccessToken } = useServer();
    const { notebookStorage, userContext } = useNotebookStorage();
    if (!projectName || !packageName) {
       throw new Error(
@@ -81,13 +82,6 @@ export default function MutableNotebook({
    );
    const [menuIndex, setMenuIndex] = React.useState<number | null>(null);
    const menuOpen = Boolean(menuAnchorEl);
-   const handleMenuClick = (
-      event: React.MouseEvent<HTMLButtonElement>,
-      index: number,
-   ) => {
-      setMenuAnchorEl(event.currentTarget);
-      setMenuIndex(index);
-   };
    const handleMenuClose = () => {
       setMenuAnchorEl(null);
       setMenuIndex(null);
@@ -147,10 +141,13 @@ export default function MutableNotebook({
                console.log("Fetching model from Publisher", model);
                promises.push(
                   modelsApi
-                     .getModel(projectName, packageName, model, versionId, {
-                        baseURL: server,
-                        withCredentials: !accessToken,
-                     })
+                     .getModel(
+                        projectName,
+                        packageName,
+                        model,
+                        versionId,
+                        await getAxiosConfig(server, getAccessToken),
+                     )
                      .then((data) => ({
                         modelPath: model,
                         sourceInfos: data.data.sourceInfos.map((source) =>
@@ -175,7 +172,15 @@ export default function MutableNotebook({
       };
 
       fetchModels();
-   }, [accessToken, notebookData, packageName, projectName, server, versionId]);
+   }, [
+      // Note this cannot depend on sourceAndPaths because it will cause an infinite loop.
+      getAccessToken,
+      notebookData,
+      packageName,
+      projectName,
+      server,
+      versionId,
+   ]);
 
    React.useEffect(() => {
       if (!notebookPath) {

package/src/components/ServerProvider.tsx

@@ -2,25 +2,25 @@ import React, { createContext, useContext, ReactNode } from "react";
 
 export interface ServerContextValue {
    server: string;
-   accessToken?: string;
+   getAccessToken?: () => Promise<string>;
 }
 
 const ServerContext = createContext<ServerContextValue | undefined>(undefined);
 
 export interface ServerProviderProps {
    server?: string;
-   accessToken?: string;
+   getAccessToken?: () => Promise<string>;
    children: ReactNode;
 }
 
 export const ServerProvider: React.FC<ServerProviderProps> = ({
    server = `${window.location.protocol}//${window.location.host}/api/v0`,
-   accessToken,
+   getAccessToken,
    children,
 }) => {
    const value: ServerContextValue = {
       server,
-      accessToken,
+      getAccessToken,
    };
 
    return (

package/src/hooks/index.ts

@@ -0,0 +1 @@
+export { getAxiosConfig } from "./useQueryWithApiError";

package/src/hooks/useQueryWithApiError.ts

@@ -25,25 +25,32 @@ const globalQueryClient = new QueryClient({
    },
 });
 
-export function useQueryWithApiError<TData = unknown, TError = ApiError>(
-   options: Omit<UseQueryOptions<TData, TError>, "throwOnError" | "retry"> & {
-      queryFn: (config: RawAxiosRequestConfig) => Promise<TData>;
-   },
-): UseQueryResult<TData, TError> {
-   const { server, accessToken } = useServer();
-   const config = {
+export const getAxiosConfig = async (
+   server: string,
+   getAccessToken: () => Promise<string>,
+): Promise<RawAxiosRequestConfig> => {
+   const accessToken = getAccessToken ? await getAccessToken() : undefined;
+   return {
       baseURL: server,
       withCredentials: !accessToken,
       headers: {
          Authorization: accessToken && `Bearer ${accessToken}`,
       },
    } as RawAxiosRequestConfig;
+};
+export function useQueryWithApiError<TData = unknown, TError = ApiError>(
+   options: Omit<UseQueryOptions<TData, TError>, "throwOnError" | "retry"> & {
+      queryFn: (config: RawAxiosRequestConfig) => Promise<TData>;
+   },
+): UseQueryResult<TData, TError> {
+   const { server, getAccessToken } = useServer();
    const enhancedOptions: UseQueryOptions<TData, TError> = {
       ...options,
       // Add in the server to the query key so that we can have a per-server caches.
       queryKey: [...options.queryKey, server],
       queryFn: async () => {
          try {
+            const config = await getAxiosConfig(server, getAccessToken);
             return await options.queryFn(config);
          } catch (err) {
             // Standardized error handling for axios errors
@@ -90,18 +97,12 @@ export function useMutationWithApiError<
       ) => Promise<TData>;
    },
 ): UseMutationResult<TData, TError, TVariables> {
-   const { server, accessToken } = useServer();
-   const config = {
-      baseURL: server,
-      withCredentials: !accessToken,
-      headers: {
-         Authorization: accessToken && `Bearer ${accessToken}`,
-      },
-   } as RawAxiosRequestConfig;
+   const { server, getAccessToken } = useServer();
    const enhancedOptions: UseMutationOptions<TData, TError, TVariables> = {
       ...options,
       mutationFn: async (variables: TVariables) => {
          try {
+            const config = await getAxiosConfig(server, getAccessToken);
             return await options.mutationFn(variables, config);
          } catch (err) {
             // Standardized error handling for axios errors