Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

move preview domain under platform for future customizability

Browse Source
This commit is contained in:
Matej Bačo
2026-01-30 13:23:37 +01:00
parent d3974776be
commit edceb3e0db
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/platform.php
+1
View File
@@ -23,4 +23,5 @@ return [
'privacyUrl' => APP_EMAIL_PRIVACY_URL,
'websiteUrl' => 'https://' . APP_DOMAIN,
'emailSenderName' => APP_EMAIL_PLATFORM_NAME,
'sitePreviewDomain' => System::getEnv('_APP_DOMAIN_SITES', ''),
];
app/controllers/api/vcs.php
+1 -1
View File
@@ -341,7 +341,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
$projectId = $project->getId();
// Deployment preview
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['sitePreviewDomain'];
$domain = ID::unique() . "." . $sitesDomain;
$ruleId = md5($domain);
$previewRuleId = $ruleId;
src/Appwrite/Platform/Modules/Compute/Base.php
+2 -2
View File
@@ -144,7 +144,7 @@ class Base extends Action
return $deployment;
}
public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, Authorization $authorization, string $referenceType = 'branch', string $reference = ''): Document
public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, Authorization $authorization, string $referenceType = 'branch', string $reference = '', array $platform): Document
{
$deploymentId = ID::unique();
$providerInstallationId = $installation->getAttribute('providerInstallationId', '');
@@ -235,7 +235,7 @@ class Base extends Action
->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
$dbForProject->updateDocument('sites', $site->getId(), $site);
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['sitePreviewDomain'];
$domain = ID::unique() . "." . $sitesDomain;
// TODO: (@Meldiron) Remove after 1.7.x migration
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+1 -1
View File
@@ -1037,7 +1037,7 @@ class Builds extends Action
// VCS branch
$branchName = $deployment->getAttribute('providerBranch');
if (!empty($branchName)) {
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['sitePreviewDomain'];
$branchPrefix = substr($branchName, 0, 16);
if (strlen($branchName) > 16) {
$remainingChars = substr($branchName, 16);
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php
+5 -3
View File
@@ -88,6 +88,7 @@ class Create extends Action
->inject('queueForBuilds')
->inject('plan')
->inject('authorization')
->inject('platform')
->callback($this->action(...));
}
@@ -108,7 +109,8 @@ class Create extends Action
Device $deviceForLocal,
Build $queueForBuilds,
array $plan,
Authorization $authorization
Authorization $authorization,
array $platform,
) {
$activate = \strval($activate) === 'true' || \strval($activate) === '1';
@@ -272,7 +274,7 @@ class Create extends Action
->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
$dbForProject->updateDocument('sites', $site->getId(), $site);
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['siteDomain'];
$domain = ID::unique() . "." . $sitesDomain;
// TODO: (@Meldiron) Remove after 1.7.x migration
@@ -342,7 +344,7 @@ class Create extends Action
->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
$dbForProject->updateDocument('sites', $site->getId(), $site);
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['siteDomain'];
$domain = ID::unique() . "." . $sitesDomain;
$ruleId = md5($domain);
$authorization->skip(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
+4 -2
View File
@@ -66,6 +66,7 @@ class Create extends Action
->inject('queueForBuilds')
->inject('deviceForSites')
->inject('authorization')
->inject('platform')
->callback($this->action(...));
}
@@ -80,7 +81,8 @@ class Create extends Action
Event $queueForEvents,
Build $queueForBuilds,
Device $deviceForSites,
Authorization $authorization
Authorization $authorization,
array $platform
) {
$site = $dbForProject->getDocument('sites', $siteId);
@@ -143,7 +145,7 @@ class Create extends Action
$dbForProject->updateDocument('sites', $site->getId(), $site);
// Preview deployments for sites
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['sitePreviewDomain'];
$domain = ID::unique() . "." . $sitesDomain;
// TODO: (@Meldiron) Remove after 1.7.x migration
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
+5 -2
View File
@@ -80,6 +80,7 @@ class Create extends Base
->inject('queueForBuilds')
->inject('gitHub')
->inject('authorization')
->inject('platform')
->callback($this->action(...));
}
@@ -99,7 +100,8 @@ class Create extends Base
Event $queueForEvents,
Build $queueForBuilds,
GitHub $github,
Authorization $authorization
Authorization $authorization,
array $platform
) {
$site = $dbForProject->getDocument('sites', $siteId);
@@ -133,6 +135,7 @@ class Create extends Base
github: $github,
activate: $activate,
authorization: $authorization,
platform: $platform
);
$queueForEvents
@@ -186,7 +189,7 @@ class Create extends Base
->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
$dbForProject->updateDocument('sites', $site->getId(), $site);
$sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
$sitesDomain = $platform['sitePreviewDomain'];
$domain = ID::unique() . "." . $sitesDomain;
// TODO: (@Meldiron) Remove after 1.7.x migration
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Vcs/Create.php
+5 -2
View File
@@ -74,6 +74,7 @@ class Create extends Base
->inject('queueForBuilds')
->inject('gitHub')
->inject('authorization')
->inject('platform')
->callback($this->action(...));
}
@@ -90,7 +91,8 @@ class Create extends Base
Event $queueForEvents,
Build $queueForBuilds,
GitHub $github,
Authorization $authorization
Authorization $authorization,
array $platform
) {
$site = $dbForProject->getDocument('sites', $siteId);
@@ -115,7 +117,8 @@ class Create extends Base
activate: $activate,
authorization: $authorization,
reference: $reference,
referenceType: $type
referenceType: $type,
platform: $platform
);
$queueForEvents