Skip to content

Commit bcd3cb6

Browse files
Mary HippMary Hipp
Mary Hipp
authored and
Mary Hipp
committed
use BASE and TOKEN from OpenAPI if they are set
1 parent 22c337b commit bcd3cb6

File tree

1 file changed

+27
-1
lines changed

1 file changed

+27
-1
lines changed

invokeai/frontend/web/src/services/apiSlice.ts

+27-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import {
2+
BaseQueryFn,
3+
FetchArgs,
4+
FetchBaseQueryError,
25
TagDescription,
36
createApi,
47
fetchBaseQuery,
@@ -18,6 +21,7 @@ import { BaseModelType } from './api/models/BaseModelType';
1821
import { ModelType } from './api/models/ModelType';
1922
import { ModelsList } from './api/models/ModelsList';
2023
import { keyBy } from 'lodash-es';
24+
import { OpenAPI } from './api/core/OpenAPI';
2125

2226
type ListBoardsArg = { offset: number; limit: number };
2327
type UpdateBoardArg = { board_id: string; changes: BoardChanges };
@@ -41,8 +45,30 @@ const modelsAdapter = createEntityAdapter<ModelConfig>({
4145
const getModelId = ({ base_model, type, name }: ModelConfig) =>
4246
`${base_model}/${type}/${name}`;
4347

48+
const dynamicBaseQuery: BaseQueryFn<
49+
string | FetchArgs,
50+
unknown,
51+
FetchBaseQueryError
52+
> = async (args, api, extraOptions) => {
53+
let baseUrl = '/api/v1';
54+
if (OpenAPI.BASE) {
55+
baseUrl = OpenAPI.BASE;
56+
}
57+
58+
const rawBaseQuery = fetchBaseQuery({
59+
baseUrl: `${baseUrl}/api/v1`,
60+
prepareHeaders: (headers, { getState }) => {
61+
if (OpenAPI.TOKEN)
62+
headers.set('Authorization', `Bearer ${OpenAPI.TOKEN}`);
63+
return headers;
64+
},
65+
});
66+
67+
return rawBaseQuery(args, api, extraOptions);
68+
};
69+
4470
export const api = createApi({
45-
baseQuery: fetchBaseQuery({ baseUrl: 'http://localhost:5173/api/v1/' }),
71+
baseQuery: dynamicBaseQuery,
4672
reducerPath: 'api',
4773
tagTypes,
4874
endpoints: (build) => ({

0 commit comments

Comments
 (0)