Matrix-Mirrors/matrix-dimension
1
0
Fork 0
mirror of https://github.com/turt2live/matrix-dimension.git synced 2024-10-01 01:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if widgets are not embeddable

Browse Source
This commit is contained in:
Travis Ralston 2018-04-01 11:23:55 -06:00
parent 981e026f8d
commit 39365fd00e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/dimension/DimensionWidgetService.ts
View File

@ -50,11 +50,11 @@ export class DimensionWidgetService {
}
// Now we need to verify we can actually make the request
await new Promise((resolve, _reject) => {
await new Promise((resolve, reject) => {
request(checkUrl, (err, response) => {
if (err) {
LogService.error("DimensionWidgetService", err);
throw new ApiError(400, "Failed to contact host");
return reject(new ApiError(400, "Failed to contact host"));
}
if (response.statusCode >= 200 && response.statusCode < 300) {
@ -62,11 +62,14 @@ export class DimensionWidgetService {
const xFrameOptions = (response.headers["x-frame-options"] || '').toLowerCase();
if (xFrameOptions === "sameorigin" || xFrameOptions === "deny") {
throw new ApiError(400, "X-Frame-Options prevents embedding");
return reject(new ApiError(400, "X-Frame-Options prevents embedding"));
}
resolve();
} else throw new ApiError(400, "Non-success status code returned");
} else {
LogService.verbose("DimensionWidgetService", response.body);
return reject(new ApiError(400, "Non-success status code returned"));
}
});
});