Skip to content

Commit 3050c05

Browse files
committed
- Changed BASE to string | Resolver<string> to support Multitenancy
1 parent b2a68c7 commit 3050c05

File tree

7 files changed

+8412
-8
lines changed

7 files changed

+8412
-8
lines changed

src/templates/core/OpenAPI.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
66
type Headers = Record<string, string>;
77

88
export type OpenAPIConfig = {
9-
BASE: string;
9+
BASE?: string | Resolver<string>;
1010
VERSION: string;
1111
WITH_CREDENTIALS: boolean;
1212
CREDENTIALS: 'include' | 'omit' | 'same-origin';

src/templates/core/axios/request.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ import type { OpenAPIConfig } from './OpenAPI';
7272
export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
7373
return new CancelablePromise(async (resolve, reject, onCancel) => {
7474
try {
75-
const url = getUrl(config, options);
75+
const url = await getUrl(config, options);
7676
const formData = getFormData(options);
7777
const body = getRequestBody(options);
7878
const headers = await getHeaders(config, options, formData);

src/templates/core/fetch/request.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import type { OpenAPIConfig } from './OpenAPI';
6565
export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
6666
return new CancelablePromise(async (resolve, reject, onCancel) => {
6767
try {
68-
const url = getUrl(config, options);
68+
const url = await getUrl(config, options);
6969
const formData = getFormData(options);
7070
const body = getRequestBody(options);
7171
const headers = await getHeaders(config, options);

src/templates/core/functions/getUrl.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
1+
const getUrl = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<string> => {
22
const encoder = config.ENCODE_PATH || encodeURI;
3-
3+
const base = await resolve(options, config.BASE);
44
const path = options.url
55
.replace('{api-version}', config.VERSION)
66
.replace(/{(.*?)}/g, (substring: string, group: string) => {
@@ -10,7 +10,7 @@ const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
1010
return substring;
1111
});
1212

13-
const url = `${config.BASE}${path}`;
13+
const url = `${base}${path}`;
1414
if (options.query) {
1515
return `${url}${getQueryString(options.query)}`;
1616
}

src/templates/core/node/request.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ import type { OpenAPIConfig } from './OpenAPI';
7070
export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
7171
return new CancelablePromise(async (resolve, reject, onCancel) => {
7272
try {
73-
const url = getUrl(config, options);
73+
const url = await getUrl(config, options);
7474
const formData = getFormData(options);
7575
const body = getRequestBody(options);
7676
const headers = await getHeaders(config, options);

src/templates/core/xhr/request.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import type { OpenAPIConfig } from './OpenAPI';
6868
export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
6969
return new CancelablePromise(async (resolve, reject, onCancel) => {
7070
try {
71-
const url = getUrl(config, options);
71+
const url = await getUrl(config, options);
7272
const formData = getFormData(options);
7373
const body = getRequestBody(options);
7474
const headers = await getHeaders(config, options);

0 commit comments

Comments
 (0)