starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-13 16:23:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Andras Bacsai
2026-10-16 00:27:17 +02:00
parent ef0108e8aa d712afbc04
commit 1f08c62564
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Feature/ProfileAvatarTest.php
+4 -2
View File
@@ -100,7 +100,7 @@ it('loads an S3 profile picture from the configured CDN', function () {
expect(profile_avatar_url($user))->toBe("https://avatars.example.com/media/avatars/1/avatar.jpg?v={$user->updated_at->timestamp}");
});
it('loads an S3 profile picture directly from S3 when the CDN is not configured', function () {
it('falls back to the authenticated proxy route for an S3 profile picture when the CDN is not configured', function () {
Team::factory()->create(['id' => 0]);
$storage = S3Storage::query()->create([
'team_id' => 0,
@@ -118,7 +118,9 @@ it('loads an S3 profile picture directly from S3 when the CDN is not configured'
'avatar_s3_storage_id' => $storage->id,
]);
expect(profile_avatar_url($user))->toBe("https://s3.example.com/avatars/avatars/1/avatar.jpg?v={$user->updated_at->timestamp}");
// Direct S3-compatible endpoints (e.g. Cloudflare R2) require authenticated requests,
// so without a CDN the browser must use the app's authenticated proxy route.
expect(profile_avatar_url($user))->toBe(route('profile.avatar', ['v' => $user->updated_at->timestamp]));
});
it('does not use an unrelated S3 storage URL for a profile picture', function () {
tests/Feature/ProjectIconTest.php
+7 -2
View File
@@ -129,7 +129,7 @@ it('loads an S3 project icon from the configured CDN', function () {
->assertViewHas('projectsJs', fn (array $projects): bool => $projects[0]['iconUrl'] === "https://avatars.example.com/media/project-icons/{$this->project->uuid}/icon.jpg?v={$this->project->updated_at->timestamp}");
});
it('loads an S3 project icon directly from S3 when the CDN is not configured', function () {
it('falls back to the authenticated proxy route for an S3 project icon when the CDN is not configured', function () {
Team::factory()->create(['id' => 0]);
$storage = S3Storage::query()->create([
'team_id' => 0,
@@ -147,7 +147,12 @@ it('loads an S3 project icon directly from S3 when the CDN is not configured', f
'icon_s3_storage_id' => $storage->id,
])->save();
expect(project_icon_url($this->project))->toBe("https://s3.example.com/avatars/project-icons/{$this->project->uuid}/icon.jpg?v={$this->project->updated_at->timestamp}");
// Direct S3-compatible endpoints (e.g. Cloudflare R2) require authenticated requests,
// so without a CDN the browser must use the app's authenticated proxy route.
expect(project_icon_url($this->project))->toBe(route('project.icon', [
'project_uuid' => $this->project->uuid,
'v' => $this->project->updated_at->timestamp,
]));
});
it('does not use an unusable S3 storage URL for a project icon', function () {