github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing file upload to Supabase (#22293)

Browse Source 
Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
This commit is contained in:
Hannes Küttner
2024-04-29 01:44:59 +02:00
committed by GitHub
parent 0e19bcede3
commit 0d7441e7a3
3 changed files with 67 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/green-sloths-sparkle.md Normal file
View File

@@ -0,0 +1,5 @@
---
'@directus/storage-driver-supabase': patch
---
Fixed file upload error for Supabase Storage servers hosted behind a Cloudflare Cache

111
packages/storage-driver-supabase/src/index.test.ts
View File

@@ -333,70 +333,69 @@ describe('#read', () => {
});
});
describe('#head', () => {
test('Returns object headers', async () => {
vi.mocked(fetch).mockReturnValue({
status: 200,
headers: { 'content-length': sample.file.size, 'last-modified': sample.file.modified },
} as unknown as Promise<Response>);
const result = await driver.head(sample.path.input);
expect(result).toStrictEqual({ 'content-length': sample.file.size, 'last-modified': sample.file.modified });
});
test('Ensures input is passed to getAuthenticatedUrl', async () => {
vi.mocked(fetch).mockReturnValue({
status: 200,
headers: { 'content-length': sample.file.size, 'last-modified': sample.file.modified },
} as unknown as Promise<Response>);
driver['getAuthenticatedUrl'] = vi.fn();
await driver.head(sample.path.input);
expect(driver['getAuthenticatedUrl']).toHaveBeenCalledWith(sample.path.input);
});
test('Throws an error when a status >= 400 is sent', async () => {
vi.mocked(fetch).mockReturnValue({
status: 400,
headers: { 'content-length': sample.file.size, 'last-modified': sample.file.modified },
} as unknown as Promise<Response>);
expect(driver.head(sample.path.input)).rejects.toThrowError(new Error(`File not found`));
});
});
describe('#stat', () => {
test('Returns size/modified from returned send data', async () => {
vi.mocked(fetch).mockReturnValue({
status: 200,
headers: {
get(key: any) {
if (key === 'content-length') {
return sample.file.size;
} else if (key === 'last-modified') {
return sample.file.modified;
}
test('Returns the size/modified from metadata', async () => {
driver['bucket'] = {
list: vi.fn().mockReturnValue({
data: [{ metadata: { contentLength: sample.file.size, lastModified: sample.file.modified } }],
error: null,
}),
} as any;
return null;
},
},
} as unknown as Promise<Response>);
const stat = await driver.stat(sample.path.input);
const result = await driver.stat(sample.path.input);
expect(result).toStrictEqual({
expect(stat).toEqual({
size: sample.file.size,
modified: sample.file.modified,
});
expect(driver['bucket'].list).toHaveBeenCalledWith('', {
limit: 1,
search: sample.path.input,
});
});
test('Throws an error when a status >= 400 is sent', async () => {
vi.mocked(fetch).mockReturnValue({
status: 400,
} as unknown as Promise<Response>);
test('Uses the configured root directory', async () => {
driver['config'].root = 'root';
driver['bucket'] = {
list: vi.fn().mockReturnValue({
data: [{ metadata: { contentLength: sample.file.size, lastModified: sample.file.modified } }],
error: null,
}),
} as any;
const stat = await driver.stat(sample.path.input);
expect(stat).toEqual({
size: sample.file.size,
modified: sample.file.modified,
});
expect(driver['bucket'].list).toHaveBeenCalledWith('root', {
limit: 1,
search: sample.path.input,
});
});
test('Throws an error no file is returned by list', async () => {
driver['bucket'] = {
list: vi.fn().mockReturnValue({
data: [],
error: null,
}),
} as any;
expect(driver.stat(sample.path.input)).rejects.toThrowError(new Error(`File not found`));
});
test('Throws an error if storage error is returned', async () => {
driver['bucket'] = {
list: vi.fn().mockReturnValue({
data: null,
error: true,
}),
} as any;
expect(driver.stat(sample.path.input)).rejects.toThrowError(new Error(`File not found`));
});

22
packages/storage-driver-supabase/src/index.ts
View File

@@ -88,27 +88,19 @@ export class DriverSupabase implements Driver {
return Readable.fromWeb(response.body);
}
async head(filepath: string) {
const response = await fetch(this.getAuthenticatedUrl(filepath), {
method: 'HEAD',
headers: {
Authorization: `Bearer ${this.config.serviceRole}`,
},
async stat(filepath: string) {
const { data, error } = await this.bucket.list(this.config.root, {
search: filepath,
limit: 1,
});
if (response.status >= 400) {
if (error || data.length === 0) {
throw new Error('File not found');
}
return response.headers;
}
async stat(filepath: string) {
const headers = await this.head(filepath);
return {
size: parseInt(headers.get('content-length') || ''),
modified: new Date(headers.get('last-modified') || ''),
size: data[0]?.metadata['contentLength'] ?? 0,
modified: new Date(data[0]?.metadata['lastModified'] || null),
};
}