mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #12887 from appwrite/feat-vibes-console-compat
Reintroduce vibes console (appwrite/new) with legacy console URL compatibility
This commit is contained in:
11 files changed
+138
-34
No files matched your search
@@ -6,9 +6,8 @@ When bumping a patch version (e.g., `1.9.0` -> `1.9.1`), follow this checklist.
|
||||
|
||||
### Bump console image
|
||||
|
||||
Update the console Docker image tag in both files:
|
||||
- [ ] `docker-compose.yml` -- update `image: appwrite/console:X.Y.Z`
|
||||
- [ ] `app/views/install/compose.phtml` -- update `image: <?php echo $organization; ?>/console:X.Y.Z`
|
||||
Update the console Docker image tag:
|
||||
- [ ] `docker-compose.yml` -- update `image: appwrite/new:X.Y.Z` (the `appwrite-console` service)
|
||||
|
||||
### Bump Appwrite version
|
||||
|
||||
|
||||
@@ -28,3 +28,4 @@ docker-compose.web-installer.yml
|
||||
.env.web-installer
|
||||
docker-compose.web-installer.yml.**.backup
|
||||
tests/playwright/screenshots
|
||||
.playwright-mcp/
|
||||
@@ -223,6 +223,15 @@ return [
|
||||
'question' => '',
|
||||
'filter' => ''
|
||||
],
|
||||
[
|
||||
'name' => '_APP_CONSOLE_URL_SCHEME',
|
||||
'description' => 'Console URL scheme used when the backend generates links to the console (OAuth callbacks, emails, error page CTAs, VCS comments). Set to \'root\' for the new console served at the root path (appwrite/new), or \'legacy\' for the older console served under the /console path prefix. The default value is \'legacy\'.',
|
||||
'introduction' => '2.0.0',
|
||||
'default' => 'legacy',
|
||||
'required' => false,
|
||||
'question' => '',
|
||||
'filter' => ''
|
||||
],
|
||||
[
|
||||
'name' => '_APP_CONSOLE_HOSTNAMES',
|
||||
'description' => 'This option allows you to add additional hostnames to your Appwrite console. This option is very useful for allowing access to the console project from additional domains. To enable it, pass a list of allowed hostnames separated by a comma.',
|
||||
|
||||
@@ -76,8 +76,10 @@ use Utopia\Validator\Range;
|
||||
use Utopia\Validator\Text;
|
||||
use Utopia\Validator\WhiteList;
|
||||
|
||||
$oauthDefaultSuccess = '/console/auth/oauth2/success';
|
||||
$oauthDefaultFailure = '/console/auth/oauth2/failure';
|
||||
$legacyConsolePaths = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root';
|
||||
|
||||
$oauthDefaultSuccess = $legacyConsolePaths ? '/console/auth/oauth2/success' : '/auth/oauth2/success';
|
||||
$oauthDefaultFailure = $legacyConsolePaths ? '/console/auth/oauth2/failure' : '/auth/oauth2/failure';
|
||||
|
||||
$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, GeoRecord $geoRecord, Event $queueForEvents, Bus $bus, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
|
||||
|
||||
@@ -2250,7 +2252,7 @@ Http::post('/v1/account/tokens/magic-url')
|
||||
->inject('proofForPassword')
|
||||
->inject('platform')
|
||||
->inject('authorization')
|
||||
->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, MailPublisher $publisherForMails, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
|
||||
->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, MailPublisher $publisherForMails, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) use ($legacyConsolePaths) {
|
||||
if (empty(System::getEnv('_APP_SMTP_HOST'))) {
|
||||
throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
|
||||
}
|
||||
@@ -2396,7 +2398,9 @@ Http::post('/v1/account/tokens/magic-url')
|
||||
} elseif ($protocol === 'http' && $port !== '80') {
|
||||
$callbackBase .= ':' . $port;
|
||||
}
|
||||
$url = $callbackBase . '/console/auth/magic-url';
|
||||
$url = $legacyConsolePaths
|
||||
? "{$callbackBase}/console/auth/magic-url"
|
||||
: "{$callbackBase}/auth/magic-url";
|
||||
}
|
||||
|
||||
$url = Template::parseURL($url);
|
||||
|
||||
+22
-10
@@ -125,7 +125,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
if (\str_ends_with($host, $denyDomain)) {
|
||||
$exception = new AppwriteException(AppwriteException::RULE_NOT_FOUND, 'This domain is not connected to any Appwrite resources. Visit domains tab under function/site settings to configure it.', view: $errorView);
|
||||
|
||||
$exception->addCTA('Start with this domain', $url . '/console');
|
||||
$exception->addCTA('Start with this domain', System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root' ? "{$url}/console" : $url);
|
||||
throw $exception;
|
||||
}
|
||||
}
|
||||
@@ -200,7 +200,11 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
$resourceId = $rule->getAttribute('deploymentResourceId', '');
|
||||
$type = ($resourceType === 'site') ? 'sites' : 'functions';
|
||||
$exception = new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, view: $errorView);
|
||||
$exception->addCTA('View deployments', $url . '/console/project-' . $project->getAttribute('region', 'default') . '-' . $projectId . '/' . $type . '/' . $resourceType . '-' . $resourceId);
|
||||
$region = $project->getAttribute('region', 'default');
|
||||
$ctaUrl = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root'
|
||||
? "/console/project-{$region}-{$projectId}/{$type}/{$resourceType}-{$resourceId}"
|
||||
: "/projects/{$projectId}/{$type}/{$resourceId}";
|
||||
$exception->addCTA('View deployments', $url . $ctaUrl);
|
||||
throw $exception;
|
||||
}
|
||||
|
||||
@@ -289,7 +293,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
$response
|
||||
->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
|
||||
->addHeader('Pragma', 'no-cache')
|
||||
->redirect($url . '/console/auth/preview?'
|
||||
->redirect($url . (System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root' ? '/console/auth/preview?' : '/auth/preview?')
|
||||
. \http_build_query([
|
||||
'projectId' => $projectId,
|
||||
'origin' => $protocol . '://' . $host,
|
||||
@@ -347,23 +351,27 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
if (!$allowAnyStatus && $deployment->getAttribute('status') !== 'ready') {
|
||||
$status = $deployment->getAttribute('status');
|
||||
$region = $project->getAttribute('region', 'default');
|
||||
$legacyConsolePaths = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root';
|
||||
$siteUrl = $legacyConsolePaths
|
||||
? "/console/project-{$region}-{$project->getId()}/sites/site-{$resource->getId()}"
|
||||
: "/projects/{$project->getId()}/sites/{$resource->getId()}";
|
||||
$deploymentUrl = $legacyConsolePaths
|
||||
? "{$siteUrl}/deployments/deployment-{$deployment->getId()}"
|
||||
: "{$siteUrl}/deployments/{$deployment->getId()}";
|
||||
|
||||
switch ($status) {
|
||||
case 'failed':
|
||||
$exception = new AppwriteException(AppwriteException::BUILD_FAILED, view: $errorView);
|
||||
$ctaUrl = '/console/project-' . $region . '-' . $project->getId() . '/sites/site-' . $resource->getId() . '/deployments/deployment-' . $deployment->getId();
|
||||
$exception->addCTA('View logs', $url . $ctaUrl);
|
||||
$exception->addCTA('View logs', $url . $deploymentUrl);
|
||||
break;
|
||||
case 'canceled':
|
||||
$exception = new AppwriteException(AppwriteException::BUILD_CANCELED, view: $errorView);
|
||||
$ctaUrl = '/console/project-' . $region . '-' . $project->getId() . '/sites/site-' . $resource->getId() . '/deployments';
|
||||
$exception->addCTA('View deployments', $url . $ctaUrl);
|
||||
$exception->addCTA('View deployments', $url . $siteUrl . '/deployments');
|
||||
break;
|
||||
default:
|
||||
$exception = new AppwriteException(AppwriteException::BUILD_NOT_READY, view: $errorView);
|
||||
$ctaUrl = '/console/project-' . $region . '-' . $project->getId() . '/sites/site-' . $resource->getId() . '/deployments/deployment-' . $deployment->getId();
|
||||
$exception->addCTA('Reload', '/');
|
||||
$exception->addCTA('View logs', $url . $ctaUrl);
|
||||
$exception->addCTA('View logs', $url . $deploymentUrl);
|
||||
break;
|
||||
}
|
||||
throw $exception;
|
||||
@@ -373,7 +381,11 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
|
||||
$permissions = $resource->getAttribute('execute');
|
||||
if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
|
||||
$exception = new AppwriteException(AppwriteException::FUNCTION_EXECUTE_PERMISSION_MISSING, view: $errorView);
|
||||
$exception->addCTA('View settings', $url . '/console/project-' . $project->getAttribute('region', 'default') . '-' . $project->getId() . '/functions/function-' . $resource->getId() . '/settings');
|
||||
$region = $project->getAttribute('region', 'default');
|
||||
$ctaUrl = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root'
|
||||
? "/console/project-{$region}-{$project->getId()}/functions/function-{$resource->getId()}/settings"
|
||||
: "/projects/{$project->getId()}/functions/{$resource->getId()}/settings";
|
||||
$exception->addCTA('View settings', $url . $ctaUrl);
|
||||
throw $exception;
|
||||
}
|
||||
}
|
||||
|
||||
+9
-4
@@ -104,6 +104,7 @@ services:
|
||||
- _APP_NOTIFICATIONS_TRACKING_SECRET
|
||||
- _APP_DOMAIN
|
||||
- _APP_CONSOLE_DOMAIN
|
||||
- _APP_CONSOLE_URL_SCHEME=root
|
||||
- _APP_CONSOLE_TRUSTED_PROJECTS
|
||||
- _APP_DOMAIN_TARGET_CNAME
|
||||
- _APP_DOMAIN_TARGET_AAAA
|
||||
@@ -224,20 +225,22 @@ services:
|
||||
max-file: "5"
|
||||
max-size: 10m
|
||||
container_name: appwrite-console
|
||||
image: appwrite/console:8.7.11
|
||||
image: appwrite/new:0.3.24
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- appwrite
|
||||
environment:
|
||||
- VITE_CONSOLE_PROFILE=self-hosted
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.constraint-label-stack=appwrite
|
||||
- traefik.docker.network=appwrite
|
||||
- traefik.http.services.appwrite_console.loadbalancer.server.port=80
|
||||
- traefik.http.services.appwrite_console.loadbalancer.server.port=3000
|
||||
- traefik.http.routers.appwrite_console_http.entrypoints=appwrite_web
|
||||
- traefik.http.routers.appwrite_console_http.rule=PathPrefix(`/console`)
|
||||
- traefik.http.routers.appwrite_console_http.rule=(Host(`${_APP_DOMAIN:-localhost}`) || Host(`${_APP_CONSOLE_DOMAIN:-localhost}`)) && !PathPrefix(`/v1`) && !PathPrefix(`/.well-known`) && !HeaderRegexp(`x-appwrite-hostname`, `.+`)
|
||||
- traefik.http.routers.appwrite_console_http.service=appwrite_console
|
||||
- traefik.http.routers.appwrite_console_https.entrypoints=appwrite_websecure
|
||||
- traefik.http.routers.appwrite_console_https.rule=PathPrefix(`/console`)
|
||||
- traefik.http.routers.appwrite_console_https.rule=(Host(`${_APP_DOMAIN:-localhost}`) || Host(`${_APP_CONSOLE_DOMAIN:-localhost}`)) && !PathPrefix(`/v1`) && !PathPrefix(`/.well-known`) && !HeaderRegexp(`x-appwrite-hostname`, `.+`)
|
||||
- traefik.http.routers.appwrite_console_https.service=appwrite_console
|
||||
- traefik.http.routers.appwrite_console_https.tls=true
|
||||
appwrite-realtime:
|
||||
@@ -332,6 +335,7 @@ services:
|
||||
- _APP_LOGGING_CONFIG
|
||||
- _APP_WEBHOOK_MAX_FAILED_ATTEMPTS
|
||||
- _APP_DATABASE_SHARED_TABLES
|
||||
- _APP_CONSOLE_URL_SCHEME=root
|
||||
appwrite-worker-deletes:
|
||||
entrypoint: worker-deletes
|
||||
logging:
|
||||
@@ -500,6 +504,7 @@ services:
|
||||
- _APP_OPTIONS_ROUTER_FORCE_HTTPS
|
||||
- _APP_DOMAIN
|
||||
- _APP_CONSOLE_DOMAIN
|
||||
- _APP_CONSOLE_URL_SCHEME=root
|
||||
- _APP_CONSOLE_TRUSTED_PROJECTS
|
||||
- _APP_STORAGE_DEVICE
|
||||
- _APP_STORAGE_S3_ACCESS_KEY
|
||||
|
||||
@@ -304,7 +304,9 @@ class Webhooks extends Action
|
||||
$template->setParam('{{url}}', $webhook->getAttribute('url'));
|
||||
$template->setParam('{{error}}', 'The server returned ' . $statusCode . ' status code');
|
||||
$template->setParam('{{host}}', $protocol . '://' . $consoleHostname);
|
||||
$template->setParam('{{path}}', "/console/project-$region-$projectId/settings/webhooks/$webhookId");
|
||||
$template->setParam('{{path}}', System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root'
|
||||
? "/console/project-{$region}-{$projectId}/settings/webhooks/{$webhookId}"
|
||||
: "/projects/{$projectId}/settings/webhooks");
|
||||
$template->setParam('{{attempts}}', $attempts);
|
||||
|
||||
$publisherForNotifications->enqueue(new NotificationMessage(
|
||||
|
||||
@@ -161,7 +161,10 @@ class Comment
|
||||
};
|
||||
|
||||
if ($site['action']['type'] === 'logs') {
|
||||
$action = '[View Logs](' . $protocol . '://' . $hostname . '/console/project-' . $site['region'] . '-' . $projectId . '/sites/site-' . $siteId . '/deployments/deployment-' . $site['deploymentId'] . ')';
|
||||
$logsUrl = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root'
|
||||
? "{$protocol}://{$hostname}/console/project-{$site['region']}-{$projectId}/sites/site-{$siteId}/deployments/deployment-{$site['deploymentId']}"
|
||||
: "{$protocol}://{$hostname}/projects/{$projectId}/sites/{$siteId}/deployments/{$site['deploymentId']}";
|
||||
$action = "[View Logs]({$logsUrl})";
|
||||
} else {
|
||||
$action = '[Authorize](' . $site['action']['url'] . ')';
|
||||
}
|
||||
@@ -209,7 +212,10 @@ class Comment
|
||||
};
|
||||
|
||||
if ($function['action']['type'] === 'logs') {
|
||||
$action = '[View Logs](' . $protocol . '://' . $hostname . '/console/project-' . $function['region'] . '-' . $projectId . '/functions/function-' . $functionId . '/deployment-' . $function['deploymentId'] . ')';
|
||||
$logsUrl = System::getEnv('_APP_CONSOLE_URL_SCHEME', 'legacy') !== 'root'
|
||||
? "{$protocol}://{$hostname}/console/project-{$function['region']}-{$projectId}/functions/function-{$functionId}/deployment-{$function['deploymentId']}"
|
||||
: "{$protocol}://{$hostname}/projects/{$projectId}/functions/{$functionId}/deployments/{$function['deploymentId']}";
|
||||
$action = "[View Logs]({$logsUrl})";
|
||||
} else {
|
||||
$action = '[Authorize](' . $function['action']['url'] . ')';
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ final class HTTPTest extends Scope
|
||||
/**
|
||||
* Test for SUCCESS
|
||||
*/
|
||||
$this->client->setEndpoint('http://localhost');
|
||||
$response = $this->client->call(Client::METHOD_OPTIONS, '/', \array_merge([
|
||||
'origin' => 'http://localhost',
|
||||
'content-type' => 'application/json',
|
||||
@@ -51,6 +52,7 @@ final class HTTPTest extends Scope
|
||||
/**
|
||||
* Test for SUCCESS
|
||||
*/
|
||||
$this->client->setEndpoint('http://localhost');
|
||||
$response = $this->client->call(Client::METHOD_GET, '/humans.txt', \array_merge([
|
||||
'origin' => 'http://localhost',
|
||||
]));
|
||||
@@ -64,6 +66,7 @@ final class HTTPTest extends Scope
|
||||
/**
|
||||
* Test for SUCCESS
|
||||
*/
|
||||
$this->client->setEndpoint('http://localhost');
|
||||
$response = $this->client->call(Client::METHOD_GET, '/robots.txt', \array_merge([
|
||||
'origin' => 'http://localhost',
|
||||
]));
|
||||
@@ -77,6 +80,7 @@ final class HTTPTest extends Scope
|
||||
/**
|
||||
* Test for SUCCESS
|
||||
*/
|
||||
$this->client->setEndpoint('http://localhost');
|
||||
$response = $this->client->call(Client::METHOD_GET, '/.well-known/acme-challenge/8DdIKX257k6Dih5s_saeVMpTnjPJdKO5Ase0OCiJrIg');
|
||||
|
||||
// 'Unknown path', but validation passed
|
||||
@@ -87,8 +91,8 @@ final class HTTPTest extends Scope
|
||||
*/
|
||||
$response = $this->client->call(Client::METHOD_GET, '/.well-known/acme-challenge/../../../../../../../etc/passwd');
|
||||
|
||||
// 'Unknown path', but validation passed
|
||||
$this->assertEquals(404, $response['headers']['status-code']);
|
||||
// 'Invalid challenge token', traversal rejected by validation
|
||||
$this->assertEquals(400, $response['headers']['status-code']);
|
||||
}
|
||||
|
||||
public function testVersions()
|
||||
@@ -96,6 +100,7 @@ final class HTTPTest extends Scope
|
||||
/**
|
||||
* Test without header
|
||||
*/
|
||||
$this->client->setEndpoint('http://localhost');
|
||||
$response = $this->client->call(Client::METHOD_GET, '/versions', \array_merge([
|
||||
'content-type' => 'application/json',
|
||||
], $this->getHeaders()));
|
||||
@@ -172,11 +177,23 @@ final class HTTPTest extends Scope
|
||||
/**
|
||||
* Test for SUCCESS
|
||||
*/
|
||||
$this->client->setEndpoint('http://localhost');
|
||||
|
||||
$endpoint = '/invite?membershipId=123&userId=asdf';
|
||||
|
||||
$response = $this->client->call(Client::METHOD_GET, $endpoint);
|
||||
$response = $this->client->call(Client::METHOD_GET, $endpoint, [], [], true, false);
|
||||
|
||||
$this->assertEquals('/console' . $endpoint, $response['headers']['location']);
|
||||
}
|
||||
|
||||
public function testConsoleServed()
|
||||
{
|
||||
/**
|
||||
* Test for SUCCESS
|
||||
*/
|
||||
$response = $this->client->call(Client::METHOD_GET, '/');
|
||||
|
||||
$this->assertEquals(200, $response['headers']['status-code']);
|
||||
$this->assertStringContainsString('text/html', (string) $response['headers']['content-type']);
|
||||
}
|
||||
}
|
||||
@@ -2229,7 +2229,7 @@ final class SitesCustomServerTest extends Scope
|
||||
$proxyClient->setEndpoint('http://' . $deploymentDomain);
|
||||
$response = $proxyClient->call(Client::METHOD_GET, '/', followRedirects: false);
|
||||
$this->assertEquals(301, $response['headers']['status-code']);
|
||||
$this->assertStringContainsString('/console/auth/preview', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('/auth/preview', (string) $response['headers']['location']);
|
||||
|
||||
$jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 0);
|
||||
$apiKey = $jwtObj->encode([
|
||||
@@ -2561,7 +2561,7 @@ final class SitesCustomServerTest extends Scope
|
||||
|
||||
$response = $proxyClient->call(Client::METHOD_GET, '/contact', followRedirects: false);
|
||||
$this->assertEquals(301, $response['headers']['status-code']);
|
||||
$this->assertStringContainsString('/console/auth/preview', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('/auth/preview', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('projectId=' . $this->getProject()['$id'], (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('origin=', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('path=%2Fcontact', (string) $response['headers']['location']);
|
||||
@@ -2624,7 +2624,7 @@ final class SitesCustomServerTest extends Scope
|
||||
'cookie' => 'a_jwt_console=' . $jwt['body']['jwt']
|
||||
], followRedirects: false);
|
||||
$this->assertEquals(301, $response['headers']['status-code']);
|
||||
$this->assertStringContainsString('/console/auth/preview', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('/auth/preview', (string) $response['headers']['location']);
|
||||
|
||||
// Failure: User missing
|
||||
$cookie = 'a_session_console=' .$this->getRoot()['session'];
|
||||
@@ -2659,7 +2659,7 @@ final class SitesCustomServerTest extends Scope
|
||||
'cookie' => 'a_jwt_console=' . $jwt['body']['jwt']
|
||||
], followRedirects: false);
|
||||
$this->assertEquals(301, $response['headers']['status-code']);
|
||||
$this->assertStringContainsString('/console/auth/preview', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('/auth/preview', (string) $response['headers']['location']);
|
||||
|
||||
// Failure: Membership missing
|
||||
$email = \uniqid() . 'newuser@appwrite.io';
|
||||
@@ -2699,7 +2699,7 @@ final class SitesCustomServerTest extends Scope
|
||||
'cookie' => 'a_jwt_console=' . $jwt['body']['jwt']
|
||||
], followRedirects: false);
|
||||
$this->assertEquals(301, $response['headers']['status-code']);
|
||||
$this->assertStringContainsString('/console/auth/preview', (string) $response['headers']['location']);
|
||||
$this->assertStringContainsString('/auth/preview', (string) $response['headers']['location']);
|
||||
|
||||
$this->cleanupSite($siteId);
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ final class WebhooksTest extends TestCase
|
||||
$publisherForNotifications = new NotificationPublisher($publisher, new Queue('v1-notifications'));
|
||||
$worker = new Webhooks();
|
||||
|
||||
$worker->sendAlert(
|
||||
$this->withConsoleUrlScheme('legacy', fn () => $worker->sendAlert(
|
||||
attempts: 10,
|
||||
statusCode: 500,
|
||||
webhook: new Document([
|
||||
@@ -51,7 +51,7 @@ final class WebhooksTest extends TestCase
|
||||
dbForPlatform: $database,
|
||||
publisherForNotifications: $publisherForNotifications,
|
||||
plan: []
|
||||
);
|
||||
));
|
||||
|
||||
$events = $publisher->getEvents('v1-notifications');
|
||||
|
||||
@@ -96,6 +96,43 @@ final class WebhooksTest extends TestCase
|
||||
], $payload['recipients'][1]);
|
||||
}
|
||||
|
||||
public function testSendAlertUsesRootConsolePathsWhenConfigured(): void
|
||||
{
|
||||
$database = $this->createPlatformDatabase();
|
||||
$this->seedOwnerUser($database);
|
||||
|
||||
$publisher = new MockPublisher();
|
||||
$publisherForNotifications = new NotificationPublisher($publisher, new Queue('v1-notifications'));
|
||||
$worker = new Webhooks();
|
||||
|
||||
$this->withConsoleUrlScheme('root', fn () => $worker->sendAlert(
|
||||
attempts: 10,
|
||||
statusCode: 500,
|
||||
webhook: new Document([
|
||||
'$id' => 'webhook-1',
|
||||
'$updatedAt' => '2026-01-01T00:00:00.000+00:00',
|
||||
'name' => 'Payments',
|
||||
'url' => 'https://example.test/webhook',
|
||||
]),
|
||||
project: new Document([
|
||||
'$id' => 'project-1',
|
||||
'$sequence' => 'project-internal-1',
|
||||
'name' => 'Production',
|
||||
'teamInternalId' => 'team-internal-1',
|
||||
'region' => 'fra',
|
||||
]),
|
||||
dbForPlatform: $database,
|
||||
publisherForNotifications: $publisherForNotifications,
|
||||
plan: []
|
||||
));
|
||||
|
||||
$events = $publisher->getEvents('v1-notifications');
|
||||
|
||||
$this->assertCount(1, $events);
|
||||
$this->assertStringContainsString('/projects/project-1/settings/webhooks', (string) $events[0]['body']);
|
||||
$this->assertStringNotContainsString('/console/', (string) $events[0]['body']);
|
||||
}
|
||||
|
||||
public function testSendAlertPersonalizesBodyPerOwner(): void
|
||||
{
|
||||
$database = $this->createPlatformDatabase();
|
||||
@@ -223,6 +260,18 @@ final class WebhooksTest extends TestCase
|
||||
yield 'invalid roles' => [null, false];
|
||||
}
|
||||
|
||||
private function withConsoleUrlScheme(string $scheme, callable $callback): void
|
||||
{
|
||||
$original = \getenv('_APP_CONSOLE_URL_SCHEME');
|
||||
\putenv("_APP_CONSOLE_URL_SCHEME={$scheme}");
|
||||
|
||||
try {
|
||||
$callback();
|
||||
} finally {
|
||||
\putenv($original === false ? '_APP_CONSOLE_URL_SCHEME' : "_APP_CONSOLE_URL_SCHEME={$original}");
|
||||
}
|
||||
}
|
||||
|
||||
private function createPlatformDatabase(): Database
|
||||
{
|
||||
$authorization = new Authorization();
|
||||
|
||||
Reference in new issue
Block a user