Safetydance is not browser compat

This commit is contained in:
Johannes Zellner
2023-04-16 19:06:14 +02:00
parent 05065fca0e
commit f0f3525b3e
7 changed files with 40 additions and 38 deletions
+14 -7
View File
@@ -1,6 +1,5 @@
import superagent from 'superagent';
import safe from 'safetydance';
import { sanitize } from 'pankow/utils';
export function createDirectoryModel(origin, accessToken, api) {
@@ -8,9 +7,15 @@ export function createDirectoryModel(origin, accessToken, api) {
return {
name: 'DirectoryModel',
async listFiles(path) {
const [error, result] = await safe(superagent.get(`${origin}/api/v1/${api}/files/${path}`).query({ access_token: accessToken }));
if (error) {
console.error('Failed to list files', error);
let error, result;
try {
result = await superagent.get(`${origin}/api/v1/${api}/files/${path}`).query({ access_token: accessToken });
} catch (e) {
error = e;
}
if (error || result.statusCode !== 200) {
console.error('Failed to list files', error || result.statusCode);
return [];
}
@@ -18,7 +23,7 @@ export function createDirectoryModel(origin, accessToken, api) {
result.body.entries.forEach(item => {
// if we have an image, attach previewUrl
if (item.mimeType.indexOf('image/') === 0) {
item.previewUrl = `${origin}/api/v1/${api}/files/${encodeURIComponent(path + '/' + item.fileName)}?access_token=${accessToken}`
item.previewUrl = `${origin}/api/v1/${api}/files/${encodeURIComponent(path + '/' + item.fileName)}?access_token=${accessToken}`;
}
item.folderPath = path;
@@ -59,8 +64,10 @@ export function createDirectoryModel(origin, accessToken, api) {
.field('overwrite', 'true');
},
async getFile(path) {
const [error, result] = await safe(fetch(`${origin}/api/v1/${api}/files/${path}?access_token=${accessToken}`));
if (error) {
let result;
try {
result = await fetch(`${origin}/api/v1/${api}/files/${path}?access_token=${accessToken}`);
} catch (error) {
console.error('Failed to get file', error);
return null;
}