Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@contentstack/core",
"version": "1.1.1",
"version": "1.1.2",
"type": "commonjs",
"main": "./dist/cjs/src/index.js",
"types": "./dist/cjs/src/index.d.ts",
Expand Down
16 changes: 8 additions & 8 deletions src/lib/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ export async function getData(instance: AxiosInstance, url: string, data?: any)
instance.defaults.headers.preview_token = livePreviewParams.preview_token;
instance.defaults.headers.live_preview = livePreviewParams.live_preview;
}

if (livePreviewParams.enable && livePreviewParams.live_preview && livePreviewParams.live_preview !== 'init') {
if (livePreviewParams.enable) {
// adds protocol so host is replaced and not appended
if (livePreviewParams.host.split(0, 8) === 'https://') {
instance.defaults.baseURL = livePreviewParams.host;
} else {
instance.defaults.baseURL = 'https://' + livePreviewParams.host;
if (livePreviewParams.live_preview && livePreviewParams.live_preview !== 'init') {
if (!livePreviewParams.host) {
throw new Error('Host is required for live preview');
}
instance.defaults.baseURL = livePreviewParams.host.startsWith('https://') ? '' : 'https://' + livePreviewParams.host;
}
}
}
Expand All @@ -30,7 +30,7 @@ export async function getData(instance: AxiosInstance, url: string, data?: any)
} else {
throw Error(JSON.stringify(response));
}
} catch (err) {
throw Error(JSON.stringify(err));
} catch (err: any) {
throw new Error(`${err.message || JSON.stringify(err)}`);
}
}
12 changes: 12 additions & 0 deletions test/request.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,16 @@ describe('Request tests', () => {

await expect(getData(client, url)).rejects.toThrowError(errorMessage);
});

it('should throw error when host is required for live preview', async () => {
const client = httpClient({});
const url = '/your-api-endpoint';
client.stackConfig = {
live_preview: {
enable: true,
preview_token: 'someToken',
},
};
await expect(getData(client, url, {})).rejects.toThrowError('Host is required for live preview');
});
});