Skip to content

Commit

Permalink
Fix request middleware for ConnectionService (#6148)
Browse files Browse the repository at this point in the history
  • Loading branch information
jamakase authored Sep 16, 2021
1 parent cba0e33 commit 39e77f3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
14 changes: 11 additions & 3 deletions airbyte-webapp/src/hooks/services/useConnectionHook.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ import { SyncSchema } from "core/domain/catalog";
import { SourceDefinition } from "core/resources/SourceDefinition";
import { Source } from "core/resources/Source";
import { Routes } from "pages/routes";
import useRouter from "../useRouter";
import { Destination } from "core/resources/Destination";
import useWorkspace from "./useWorkspace";
import { Operation } from "core/domain/connection/operation";
import { equal } from "utils/objects";
import { useAnalytics } from "hooks/useAnalytics";
import useRouter from "hooks/useRouter";
import { useGetService } from "core/servicesProvider";
import { RequestMiddleware } from "core/request/RequestMiddleware";

import { equal } from "utils/objects";

export type ValuesProps = {
schedule: ScheduleProperties | null;
Expand Down Expand Up @@ -65,8 +68,13 @@ type UpdateStateConnection = {

function useConnectionService(): ConnectionService {
const config = useConfig();
const middlewares = useGetService<RequestMiddleware[]>(
"DefaultRequestMiddlewares"
);

return useMemo(() => new ConnectionService(config.apiUrl), [config]);
return useMemo(() => new ConnectionService(config.apiUrl, middlewares), [
config,
]);
}

export const useConnectionLoad = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ import { useGetService } from "core/servicesProvider";
* This hook is responsible for registering RequestMiddlewares used in BaseRequest
*/
export const useDefaultRequestMiddlewares = (): RequestMiddleware[] => {
return useGetService("DefaultRequestMiddlewares");
return useGetService<RequestMiddleware[]>("DefaultRequestMiddlewares");
};

0 comments on commit 39e77f3

Please sign in to comment.