diff --git a/app/init/constants.php b/app/init/constants.php index 62d9f16853..451580a359 100644 --- a/app/init/constants.php +++ b/app/init/constants.php @@ -4,6 +4,7 @@ use Appwrite\Platform\Modules\Compute\Specification; const APP_NAME = 'Appwrite'; const APP_DOMAIN = 'appwrite.io'; +const APP_DOMAIN_SITES_SUFFIX = 'appwrite.network'; // Default suffix for Appwrite sites domains const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address const APP_EMAIL_SECURITY = ''; // Default security email address const APP_EMAIL_LOGO_URL = 'https://cloud.appwrite.io/images/mails/logo.png'; diff --git a/src/Appwrite/Network/Validator/AppwriteDomain.php b/src/Appwrite/Network/Validator/AppwriteDomain.php index ad719c7120..f14d1ab987 100644 --- a/src/Appwrite/Network/Validator/AppwriteDomain.php +++ b/src/Appwrite/Network/Validator/AppwriteDomain.php @@ -20,7 +20,7 @@ class AppwriteDomain extends Validator public function __construct() { - $this->suffix = System::getEnv('_APP_DOMAIN_SITES', 'appwrite.network'); + $this->suffix = System::getEnv('_APP_DOMAIN_SITES', APP_DOMAIN_SITES_SUFFIX); } /** diff --git a/tests/unit/Network/Validators/AppwriteDomainTest.php b/tests/unit/Network/Validators/AppwriteDomainTest.php index b9ddd8052f..8a93d4bbbe 100644 --- a/tests/unit/Network/Validators/AppwriteDomainTest.php +++ b/tests/unit/Network/Validators/AppwriteDomainTest.php @@ -23,7 +23,7 @@ class AppwriteDomainTest extends TestCase { // Get the actual configured suffix from environment (in Docker it's sites.localhost) // But test both the environment value and the default value - $envSuffix = \Utopia\System\System::getEnv('_APP_DOMAIN_SITES', 'appwrite.network'); + $envSuffix = \Utopia\System\System::getEnv('_APP_DOMAIN_SITES', APP_DOMAIN_SITES_SUFFIX); // Valid one-level subdomains with environment suffix $this->assertEquals(true, $this->validator->isValid('api.' . $envSuffix)); @@ -138,8 +138,8 @@ class AppwriteDomainTest extends TestCase $description = $this->validator->getDescription(); $this->assertIsString($description); - // Get the environment suffix to check it's in the description - $envSuffix = \Utopia\System\System::getEnv('_APP_DOMAIN_SITES', 'appwrite.network'); + // Get the environment suffix to check it's in the description + $envSuffix = \Utopia\System\System::getEnv('_APP_DOMAIN_SITES', APP_DOMAIN_SITES_SUFFIX); $this->assertStringContainsString($envSuffix, $description); $this->assertStringContainsString('one-level subdomain', $description); }