Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(notifications): build api token expiry notification link from the instance url

peaklabs-dev6abbf84520bd
diff --git a/app/Notifications/ApiTokenExpiringNotification.php b/app/Notifications/ApiTokenExpiringNotification.php
index 451dd312a1..40bd3ead0d 100644
--- a/app/Notifications/ApiTokenExpiringNotification.php
+++ b/app/Notifications/ApiTokenExpiringNotification.php
@@ -21,7 +21,7 @@ class ApiTokenExpiringNotification extends CustomEmailNotification
$this->onQueue('high');
$this->tokenName = $token->name;
$this->expiresAt = $token->expires_at?->format('Y-m-d H:i:s') ?? '';
- $this->manageUrl = route('security.api-tokens');
+ $this->manageUrl = base_url().'/security/api-tokens';
}
public function via(object $notifiable): array
diff --git a/tests/Feature/ApiTokenExpirationWarningTest.php b/tests/Feature/ApiTokenExpirationWarningTest.php
index 92c2076077..a6bbffbbc3 100644
--- a/tests/Feature/ApiTokenExpirationWarningTest.php
+++ b/tests/Feature/ApiTokenExpirationWarningTest.php
@@ -1,6 +1,7 @@
<?php
use App\Jobs\ApiTokenExpirationWarningJob;
+use App\Models\InstanceSettings;
use App\Models\PersonalAccessToken;
use App\Models\Team;
use App\Models\User;
@@ -14,6 +15,7 @@ use Illuminate\Support\Facades\Notification;
uses(RefreshDatabase::class);
beforeEach(function () {
+ InstanceSettings::forceCreate(['id' => 0]);
$this->team = Team::factory()->create();
$this->user = User::factory()->create();
$this->team->members()->attach($this->user->id, ['role' => 'owner']);
@@ -137,4 +139,15 @@ describe('ApiTokenExpirationWarningJob', function () {
Notification::assertNothingSent();
expect($token->fresh()->api_token_expiration_warning_sent_at)->toBeNull();
});
+
+ test('manage url uses the instance fqdn when configured', function () {
+ InstanceSettings::query()->update(['fqdn' => 'https://coolify.example.com']);
+ $token = createTokenExpiring($this->user, $this->team, Carbon::now()->addHours(12));
+
+ $notification = new ApiTokenExpiringNotification($token);
+
+ expect($notification->toSlack()->description)
+ ->toContain('https://coolify.example.com/security/api-tokens')
+ ->not->toContain('localhost');
+ });
});