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.

Merge remote-tracking branch 'origin/main' into fix/secret-manager-request-timeout

Andras Bacsaic46537135642
diff --cc tests/Feature/Security/IntegrationTokenFormTest.php
index b46c6d1364,2344563ca4..4d90de6173
--- a/tests/Feature/Security/IntegrationTokenFormTest.php
+++ b/tests/Feature/Security/IntegrationTokenFormTest.php
@@@ -470,35 -470,20 +470,53 @@@ test('saving a vault token with unchang
->and($savedToken->metadata)->toBe(['base_url' => 'https://example.com:8200', 'namespace' => 'team-a']);
});
+test('changing the vault request timeout keeps the stored token and validates with the new timeout', function () {
+ $timeouts = [];
+ Http::fake(function ($request, array $options) use (&$timeouts) {
+ $timeouts[] = $options['timeout'];
+
+ return Http::response(['data' => []]);
+ });
+ $savedToken = vaultIntegrationToken($this->team);
+
+ Livewire::test(IntegrationTokenEditor::class, ['integration_token_uuid' => $savedToken->uuid])
+ ->set('metadata.timeout', '45')
+ ->call('save')
+ ->assertHasNoErrors()
+ ->assertDispatched('success');
+
+ $savedToken->refresh();
+ expect($timeouts)->toBe([45])
+ ->and($savedToken->token)->toBe('hvs.stored-secret')
+ ->and(IntegrationToken::requestTimeout($savedToken->metadata))->toBe(45);
+});
+
+test('a request timeout outside 1 to 300 seconds is rejected', function (string $timeout) {
+ Http::fake();
+ $savedToken = vaultIntegrationToken($this->team);
+
+ Livewire::test(IntegrationTokenEditor::class, ['integration_token_uuid' => $savedToken->uuid])
+ ->set('metadata.timeout', $timeout)
+ ->call('save')
+ ->assertHasErrors(['metadata.timeout']);
+
+ Http::assertNothingSent();
+})->with(['0', '301', 'abc']);
++
+ test('the token list shows its empty state after the editor deletes the last token', function () {
+ $token = IntegrationToken::query()->create([
+ 'team_id' => $this->team->id,
+ 'provider' => 'cloudflare',
+ 'name' => 'Production DNS',
+ 'token' => 'secret',
+ 'capabilities' => ['dns'],
+ ]);
+ $list = Livewire::test(IntegrationTokens::class)->assertDontSee('No integration tokens');
+
+ Livewire::test(IntegrationTokenEditor::class, ['integration_token_uuid' => $token->uuid])
+ ->call('delete')
+ ->assertDispatched('integration-token-deleted', uuid: $token->uuid);
+
+ $list->dispatch('integration-token-deleted', uuid: $token->uuid)
+ ->assertSee('No integration tokens');
+ });